diff --git a/fish/dot-config/fish/conf.d/doas.fish b/fish/dot-config/fish/conf.d/doas.fish deleted file mode 100644 index e7fca0e..0000000 --- a/fish/dot-config/fish/conf.d/doas.fish +++ /dev/null @@ -1,3 +0,0 @@ -if test (command -v doas) - abbr sudo doas -end diff --git a/fish/dot-config/fish/conf.d/starship.fish b/fish/dot-config/fish/conf.d/starship.fish deleted file mode 100644 index 756a7e6..0000000 --- a/fish/dot-config/fish/conf.d/starship.fish +++ /dev/null @@ -1,3 +0,0 @@ -if test (command -v starship) - starship init fish | source -end diff --git a/fish/dot-config/fish/conf.d/zoxide.fish b/fish/dot-config/fish/conf.d/zoxide.fish deleted file mode 100644 index 3bf8ac6..0000000 --- a/fish/dot-config/fish/conf.d/zoxide.fish +++ /dev/null @@ -1,3 +0,0 @@ -if test (command -v zoxide) - zoxide init fish | source -end diff --git a/fish/dot-config/fish/config.fish b/fish/dot-config/fish/config.fish index feba05c..2d5e8a7 100644 --- a/fish/dot-config/fish/config.fish +++ b/fish/dot-config/fish/config.fish @@ -2,8 +2,8 @@ set -U fish_greeting alias exa="exa --group-directories-first" alias newkey="gpg-connect-agent \"scd serialno\" \"learn --force\" /bye" -[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh" -[ "$TERM_PROGRAM" = "WezTerm" ] && alias ssh="wezterm ssh" +test "$TERM" = "xterm-kitty" && alias ssh="kitty +kitten ssh" +test "$TERM_PROGRAM" = "WezTerm" && alias ssh="wezterm ssh" abbr vim nvim abbr ls exa abbr ll exa -lh @@ -13,6 +13,7 @@ abbr gc git commit abbr gap git add -p abbr gps git push abbr gpl git pull +test doas && abbr sudo doas # Keybinds bind -k nul 'forward-char' @@ -21,3 +22,7 @@ bind -k nul 'forward-char' set -x -g RUSTUP_HOME $XDG_DATA_HOME/rustup set -x -g CARGO_HOME $XDG_DATA_HOME/cargo set -x -g PATH $CARGO_HOME/bin $RUSTUP_HOME/bin $HOME/.local/bin $PATH + +test fnm && fnm env | source +test starship && starship init fish | source +test zoxide && zoxide init fish | source