Cleanup, add Wireguard
parent
e93afae2ad
commit
87e552f1c5
|
@ -1,3 +1,4 @@
|
||||||
result
|
result
|
||||||
|
result-*
|
||||||
*.secret.*
|
*.secret.*
|
||||||
.nvimlog
|
.nvimlog
|
|
@ -45,6 +45,7 @@ in
|
||||||
Bitwarden = 1352778147;
|
Bitwarden = 1352778147;
|
||||||
Spark = 1176895641;
|
Spark = 1176895641;
|
||||||
# UTM = 1538878817;
|
# UTM = 1538878817;
|
||||||
|
Wireguard = 1451685025;
|
||||||
Xcode = 497799835;
|
Xcode = 497799835;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -31,20 +31,6 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
nix-direnv.enable = true;
|
nix-direnv.enable = true;
|
||||||
};
|
};
|
||||||
# Firefox
|
|
||||||
# https://rycee.gitlab.io/home-manager/options.html#opt-programs.firefox.enable
|
|
||||||
# firefox = {
|
|
||||||
# enable = true;
|
|
||||||
# package = pkgs.firefox;
|
|
||||||
# };
|
|
||||||
# Htop
|
|
||||||
# https://rycee.gitlab.io/home-manager/options.html#opt-programs.htop.enable
|
|
||||||
htop = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
show_program_path = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
# See `./shells.nix` for more on how this is used.
|
# See `./shells.nix` for more on how this is used.
|
||||||
fish = {
|
fish = {
|
||||||
functions = {
|
functions = {
|
||||||
|
@ -78,7 +64,6 @@
|
||||||
du-dust # fancy version of `du`
|
du-dust # fancy version of `du`
|
||||||
exa # fancy version of `ls`
|
exa # fancy version of `ls`
|
||||||
fd # fancy version of `find`
|
fd # fancy version of `find`
|
||||||
htop # fancy version of `top`
|
|
||||||
# httpie # fancy version of `curl`
|
# httpie # fancy version of `curl`
|
||||||
hyperfine # benchmarking tool
|
hyperfine # benchmarking tool
|
||||||
mosh # wrapper for `ssh` that better at not dropping connections
|
mosh # wrapper for `ssh` that better at not dropping connections
|
||||||
|
|
|
@ -130,6 +130,19 @@
|
||||||
'';
|
'';
|
||||||
onVariable = "term_background";
|
onVariable = "term_background";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
init-shell-colors.body = ''
|
||||||
|
set -g fish_color_quote cyan # color of commands
|
||||||
|
set -g fish_color_redirection brmagenta # color of IO redirections
|
||||||
|
set -g fish_color_end blue # color of process separators like ';' and '&'
|
||||||
|
set -g fish_color_error red # color of potential errors
|
||||||
|
set -g fish_color_match --reverse # color of highlighted matching parenthesis
|
||||||
|
set -g fish_color_search_match --background=yellow
|
||||||
|
set -g fish_color_selection --reverse # color of selected text (vi mode)
|
||||||
|
set -g fish_color_operator green # color of parameter expansion operators like '*' and '~'
|
||||||
|
set -g fish_color_escape red # color of character escapes like '\n' and and '\x70'
|
||||||
|
set -g fish_color_cancel red # color of the '^C' indicator on a canceled command
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
|
@ -141,16 +154,11 @@
|
||||||
nixConfigDir = "${config.home.homeDirectory}/dotfiles.nix";
|
nixConfigDir = "${config.home.homeDirectory}/dotfiles.nix";
|
||||||
in
|
in
|
||||||
with pkgs; {
|
with pkgs; {
|
||||||
# My additions
|
|
||||||
code = "codium";
|
|
||||||
|
|
||||||
# OG
|
|
||||||
# Nix related
|
# Nix related
|
||||||
drb = "pushd ${nixConfigDir}/; darwin-rebuild build --flake ${nixConfigDir}/; popd";
|
drb = "pushd ${nixConfigDir}/; darwin-rebuild build --flake ${nixConfigDir}/; popd";
|
||||||
drs = "pushd ${nixConfigDir}/; darwin-rebuild switch --flake ${nixConfigDir}/; popd";
|
drs = "pushd ${nixConfigDir}/; darwin-rebuild switch --flake ${nixConfigDir}/; popd";
|
||||||
drc = "codium ${nixConfigDir}";
|
drc = "codium ${nixConfigDir}";
|
||||||
drv = "vim ${nixConfigDir}";
|
drv = "vim ${nixConfigDir}";
|
||||||
cdr = "cd ${nixConfigDir}";
|
|
||||||
flakeup = "nix flake update ${nixConfigDir}/";
|
flakeup = "nix flake update ${nixConfigDir}/";
|
||||||
nb = "nix build";
|
nb = "nix build";
|
||||||
nd = "nix develop";
|
nd = "nix develop";
|
||||||
|
@ -171,6 +179,11 @@
|
||||||
ps = "${procs}/bin/procs";
|
ps = "${procs}/bin/procs";
|
||||||
tb = "toggle-background";
|
tb = "toggle-background";
|
||||||
sb = "set-background-to-macOS";
|
sb = "set-background-to-macOS";
|
||||||
|
code = "codium";
|
||||||
|
http = "xh";
|
||||||
|
https = "xhs";
|
||||||
|
top = "btm";
|
||||||
|
htop = "btm";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Configuration that should be above `loginShellInit` and `interactiveShellInit`.
|
# Configuration that should be above `loginShellInit` and `interactiveShellInit`.
|
||||||
|
@ -190,16 +203,7 @@
|
||||||
# they are triggered when the relevent event happens or variable changes.
|
# they are triggered when the relevent event happens or variable changes.
|
||||||
set-shell-colors
|
set-shell-colors
|
||||||
# Set Fish colors that aren't dependent the `$term_background`.
|
# Set Fish colors that aren't dependent the `$term_background`.
|
||||||
set -g fish_color_quote cyan # color of commands
|
init-shell-colors
|
||||||
set -g fish_color_redirection brmagenta # color of IO redirections
|
|
||||||
set -g fish_color_end blue # color of process separators like ';' and '&'
|
|
||||||
set -g fish_color_error red # color of potential errors
|
|
||||||
set -g fish_color_match --reverse # color of highlighted matching parenthesis
|
|
||||||
set -g fish_color_search_match --background=yellow
|
|
||||||
set -g fish_color_selection --reverse # color of selected text (vi mode)
|
|
||||||
set -g fish_color_operator green # color of parameter expansion operators like '*' and '~'
|
|
||||||
set -g fish_color_escape red # color of character escapes like '\n' and and '\x70'
|
|
||||||
set -g fish_color_cancel red # color of the '^C' indicator on a canceled command
|
|
||||||
'';
|
'';
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue