diff options
| -rw-r--r-- | fish/conf.d/env.fish | 3 | ||||
| -rw-r--r-- | fish/config.fish | 8 | ||||
| -rw-r--r-- | fish/functions/n.fish | 37 | ||||
| -rw-r--r-- | fish/functions/nvim.fish | 1 | ||||
| -rw-r--r-- | fish/functions/ssh.fish | 1 |
5 files changed, 48 insertions, 2 deletions
diff --git a/fish/conf.d/env.fish b/fish/conf.d/env.fish index f078271..bf70dee 100644 --- a/fish/conf.d/env.fish +++ b/fish/conf.d/env.fish @@ -1,3 +1,6 @@ set --global --export EDITOR vim set --global --export VISUAL vim + +set --global --export GRIM_DEFAULT_DIR "$HOME/Imagens/screenshots/" + fish_add_path "$HOME/.local/bin" diff --git a/fish/config.fish b/fish/config.fish index 60fdc97..334102b 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -3,7 +3,7 @@ status is-login; and begin end status is-interactive; and begin - fish_config theme choose modus_vivendi + fish_config theme choose catppuccin-frappe # Interactive shell initialisation set --global hydro_color_pwd yellow @@ -26,7 +26,7 @@ status is-interactive; and begin end if functions --query fzf_configure_bindings - fzf_configure_bindings --directory=\ct --variables=\ev + fzf_configure_bindings --directory=\ct --variables=\e\cv end if command --query any-nix-shell @@ -40,4 +40,8 @@ status is-interactive; and begin if command --query direnv direnv hook fish | source end + + if command --query nnn + bind --user alt-n "n" + end end diff --git a/fish/functions/n.fish b/fish/functions/n.fish new file mode 100644 index 0000000..407361e --- /dev/null +++ b/fish/functions/n.fish @@ -0,0 +1,37 @@ +function n --wraps=nnn --description 'support nnn quit and change directory' + # Block nesting of nnn in subshells + if test -n "$NNNLVL" -a "$NNNLVL" -ge 1 + echo "nnn is already running" + return + end + + # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set) + # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to + # see. To cd on quit only on ^G, remove the "-x" from both lines below, + # without changing the paths. + if test -n "$XDG_CONFIG_HOME" + set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd" + else + set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd" + end + + # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn + # stty start undef + # stty stop undef + # stty lwrap undef + # stty lnext undef + + # The command function allows one to alias this function to `nnn` without + # making an infinitely recursive alias + command nnn $argv + + if test -e "$NNN_TMPFILE" + # nnn writes POSIX shell syntax, whose quoting differs from fish. + # NUL separation preserves paths containing (or ending in) newlines. + set -l lastdir (command sh -c '. "$1" && printf "%s\000" "$PWD"' sh "$NNN_TMPFILE" | string split0) + if set -q lastdir[1] + cd -- "$lastdir" + end + rm -- "$NNN_TMPFILE" >/dev/null + end +end diff --git a/fish/functions/nvim.fish b/fish/functions/nvim.fish index efbd5e6..6a81033 100644 --- a/fish/functions/nvim.fish +++ b/fish/functions/nvim.fish @@ -2,6 +2,7 @@ function nvim --wraps nvim --description 'open a new nvim instance or connect to # if `nvr` is not installed, nevermind. just run `nvim` if ! command --query nvr command nvim $argv + return end if test ! -S /tmp/nvimsocket diff --git a/fish/functions/ssh.fish b/fish/functions/ssh.fish index 36f4315..b83fda8 100644 --- a/fish/functions/ssh.fish +++ b/fish/functions/ssh.fish @@ -1,6 +1,7 @@ function ssh --description 'ssh(1) wrapper for convenience when using kitty' if test $TERM = "xterm-kitty" command kitten ssh $argv + return end command ssh $argv |
