Tiny fixes, add mullvadvpn

work
mat ess 2022-02-05 16:53:35 -05:00
parent 5e51d850e7
commit 4842d9c8fc
3 changed files with 14 additions and 19 deletions

View File

@ -58,6 +58,7 @@ in
"knockknock" "knockknock"
"lagrange" "lagrange"
"lulu" "lulu"
"mullvadvpn"
"rectangle" "rectangle"
"signal" "signal"
"steam" "steam"
@ -70,5 +71,5 @@ in
# For cli packages that aren't currently available for macOS in `nixpkgs`.Packages should be # For cli packages that aren't currently available for macOS in `nixpkgs`.Packages should be
# installed in `../home/default.nix` whenever possible. # installed in `../home/default.nix` whenever possible.
homebrew.brews = [ "unison-language" ]; homebrew.brews = [ "fzf" "unison-language" ];
} }

View File

@ -26,17 +26,16 @@
# Configuration for `nixpkgs` # Configuration for `nixpkgs`
nixpkgsConfig = { nixpkgsConfig = {
config = { allowUnfree = true; }; config = { allowUnfree = true; };
# overlays = attrValues self.overlays; overlays = attrValues self.overlays;
overlays = attrValues self.overlays ++ singleton ( # overlays = attrValues self.overlays ++ singleton (
# Sub in x86 version of packages that don't build on Apple Silicon yet # # Sub in x86 version of packages that don't build on Apple Silicon yet
final: prev: (optionalAttrs (prev.stdenv.system == "aarch64-darwin") { # final: prev: (optionalAttrs (prev.stdenv.system == "aarch64-darwin") {
inherit (final.pkgs-x86) # inherit (final.pkgs-x86)
# idris2 # idris2
# nix-index # nix-index
# purescript; # purescript;
niv; # })
}) # );
);
}; };
# Shared home-manager configs # Shared home-manager configs

View File

@ -17,7 +17,7 @@
# fancy shell history # fancy shell history
# https://rycee.gitlab.io/home-manager/options.html#opt-programs.atuin.enable # https://rycee.gitlab.io/home-manager/options.html#opt-programs.atuin.enable
atuin = { atuin = {
enable = true; enable = false;
settings = { }; settings = { };
}; };
# a nicer cat # a nicer cat
@ -58,11 +58,6 @@
}; };
}; };
interactiveShellInit = '' interactiveShellInit = ''
# Init atuin
atuin init fish | source
bind -M insert -k up _atuin_search
bind -M insert \eOA _atuin_search
bind -M insert \e\[A _atuin_search
# Set `bat` colors based on value of `$term_backdround` when shell starts up. # Set `bat` colors based on value of `$term_backdround` when shell starts up.
set-bat-colors set-bat-colors
''; '';
@ -83,7 +78,7 @@
fd # fancy version of `find` fd # fancy version of `find`
htop # fancy version of `top` htop # fancy version of `top`
hyperfine # benchmarking tool hyperfine # benchmarking tool
mosh # wrapper for `ssh` that better and not dropping connections mosh # wrapper for `ssh` that better at not dropping connections
pijul # alternative to `git` pijul # alternative to `git`
procs # fancy version of `ps` procs # fancy version of `ps`
ripgrep # better version of `grep` ripgrep # better version of `grep`