diff --git a/private_dot_config/private_fish/functions/n.fish b/private_dot_config/private_fish/functions/n.fish new file mode 100644 index 0000000..a8c3dc4 --- /dev/null +++ b/private_dot_config/private_fish/functions/n.fish @@ -0,0 +1,36 @@ +# Rename this file to match the name of the function +# e.g. ~/.config/fish/functions/n.fish +# or, add the lines to the 'config.fish' file. + +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 + source $NNN_TMPFILE + rm $NNN_TMPFILE + end +end diff --git a/run_onchange_before_install_main_deps.sh.tmpl b/run_onchange_before_install_main_deps.sh.tmpl index ae4f968..6717331 100644 --- a/run_onchange_before_install_main_deps.sh.tmpl +++ b/run_onchange_before_install_main_deps.sh.tmpl @@ -1,6 +1,6 @@ #!/usr/bin/env bash BASE_PACKAGES="gnupg curl wget git gcc" -ACT_PACKAGES="ripgrep unzip htop fzf bat gawk" +ACT_PACKAGES="ripgrep unzip htop fzf bat gawk jq nnn tmux mc nethogs ngrep mtr" USER=$(whoami) Green='\033[0;32m' # Green NC='\033[0m' # No Color @@ -116,19 +116,19 @@ $Green########################################################################## sleep 3 {{ if eq .chezmoi.os "darwin" -}} - brew install -q fish neovim $ACT_PACKAGES atuin jump fd sk + brew install -q fish neovim $ACT_PACKAGES atuin jump fd sk dust lazygit {{ else if eq .chezmoi.osRelease.id "fedora" -}} sudo dnf install neovim fish $ACT_PACKAGES fd-find skim -y - nix-env -iA nixpkgs.atuin nixpkgs.jump + nix-env -iA nixpkgs.atuin nixpkgs.jump nixpkgs.du-dust nixpkgs.lazygit {{ else if eq .chezmoi.osRelease.id "arch" -}} - sudo pacman -Sy --noconfirm neovim fish atuin $ACT_PACKAGES fd skim - nix-env -iA nixpkgs.jump + sudo pacman -Sy --noconfirm neovim fish atuin $ACT_PACKAGES fd skim lazygit + nix-env -iA nixpkgs.jump nixpkgs.du-dust {{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}} sudo apt install fish $ACT_PACKAGES -y - nix-env -iA nixpkgs.neovim nixpkgs.jump nixpkgs.skim + nix-env -iA nixpkgs.neovim nixpkgs.jump nixpkgs.skim nixpkgs.du-dust nixpkgs.lazygit if ! fish -c atuin &>/dev/null then bash <(curl https://raw.githubusercontent.com/ellie/atuin/main/install.sh)