feat(fish): improve alias to use abbreviations

Author: shricodev

roles/fish/files/conf.d/00-load-order.fish

@@ -0,0 +1,16 @@
+# Load order configuration for Fish shell
+# This file ensures proper loading sequence of functions
+
+# Load critical functions first
+for file in $__fish_config_dir/functions/load_first/*.fish
+    if test -f $file
+        source $file
+    end
+end
+
+# Load utility functions last (after everything else is initialized)
+for file in $__fish_config_dir/functions/load_last/*.fish
+    if test -f $file
+        source $file
+    end
+end

roles/fish/files/conf.d/abbreviations.fish

@@ -0,0 +1,58 @@
+# Fish abbreviations - faster than aliases
+# These expand when you press space or enter
+
+# Navigation abbreviations
+abbr -a .. 'cd ..'
+abbr -a ... 'cd ../..'
+abbr -a .3 'cd ../../..'
+abbr -a .4 'cd ../../../..'
+abbr -a .5 'cd ../../../../..'
+
+# Directory operations
+abbr -a --position anywhere --set-cursor='%' cdl 'cd % && ls'
+
+# File operations
+abbr -a ll 'eza -lg --color=always --icons --group-directories-first'
+abbr -a la 'eza -a --color=always --git-ignore --group-directories-first'
+abbr -a lt1 'eza -aT --color=always --git-ignore --level=1 --group-directories-first'
+abbr -a lt2 'eza -aT --color=always --git-ignore --level=2 --group-directories-first'
+abbr -a lt3 'eza -aT --color=always --git-ignore --level=3 --group-directories-first'
+abbr -a llg 'eza --tree --level=2 --long -g --icons --git'
+abbr -a l. 'eza -a | grep -E "^\."'
+
+# Editor abbreviations
+abbr -a nv nvim
+abbr -a vi nvim
+abbr -a vim nvim
+abbr -a v nvim
+
+# System abbreviations
+abbr -a cl reset
+abbr -a clear reset
+abbr -a ping 'ping -c 10'
+abbr -a df 'df -h'
+abbr -a free 'free -m'
+abbr -a wget 'wget -c'
+abbr -a hf 'history | fzf'
+
+# Git abbreviations
+abbr -a lg lazygit
+abbr -a gl 'git log --oneline'
+abbr -a glp 'git log --pretty=format:"%C(yellow)%h%Creset - %C(green)%an%Creset, %ar : %s"'
+abbr -a glt 'git log --graph --oneline --all --decorate'
+
+# Shell switching
+abbr -a tobash 'sudo chsh $USER -s /bin/bash && echo "Now log out."'
+abbr -a tozsh 'sudo chsh $USER -s /bin/zsh && echo "Now log out."'
+abbr -a tofish 'sudo chsh $USER -s /bin/fish && echo "Now log out."'
+
+# Utilities
+abbr -a yz yazi
+abbr -a :q exit
+abbr -a day 'date +"%Y-%m-%d %A"'
+abbr -a wtr 'curl wttr.in'
+abbr -a ist 'curl -s "https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest.py" | python3 -'
+abbr -a tt 'tmux new-session -A -s'
+
+# Special abbreviations with cursor positioning
+abbr -a --position anywhere --set-cursor='%' -- L '% | less'

roles/fish/files/conf.d/fzf.fish

@@ -0,0 +1,15 @@
+# FZF Configuration
+# Optimized FZF settings for better performance and usability
+
+# Basic FZF options - layout=reverse makes the prompt at the top
+set -gx FZF_DEFAULT_OPTS "--height=65% --layout=reverse --bind ctrl-u:preview-page-up,ctrl-d:preview-page-down"
+
+# Default command for file listing - uses fd for better performance
+set -gx FZF_DEFAULT_COMMAND "fd --hidden --strip-cwd-prefix --exclude .git"
+set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
+
+# Preview options for CTRL-T (file search)
+set -gx FZF_CTRL_T_OPTS "--preview 'bat --color=always --style=numbers --line-range=:500 {}' --preview-window=right:noborder"
+
+# Preview options for ALT-C (directory search)
+set -gx FZF_ALT_C_OPTS "--preview 'eza --tree --icons --color=always {} | head -n 200' --preview-window=right:noborder"

roles/fish/files/conf.d/npm-package-managers.fish

@@ -0,0 +1,15 @@
+# Package Manager Path Configuration
+# Centralized path management for various package managers
+
+# Bun
+if test -d "$HOME/.bun"
+    set -gx BUN_INSTALL "$HOME/.bun"
+    fish_add_path "$BUN_INSTALL/bin"
+end
+
+# pnpm
+set -l pnpm_home "$HOME/.local/share/pnpm"
+if test -d $pnpm_home
+    set -gx PNPM_HOME $pnpm_home
+    fish_add_path "$PNPM_HOME"
+end

roles/fish/files/conf.d/ruff.env.fish

@@ -1,2 +1 @@
-
 source "$HOME/.cargo/env.fish"

roles/fish/files/conf.d/ssh.fish

@@ -0,0 +1,26 @@
+# SSH Configuration
+# Automated SSH agent setup and key management
+
+# Function to add SSH keys automatically
+function _add_ssh_keys
+    # Array of SSH keys to load (add your keys here)
+    set ssh_keys \
+        "$HOME/.ssh/gh_login_shricodev" \
+        "$HOME/.ssh/homelab-vm_key.pem"
+
+    for key in $ssh_keys
+        if test -f $key
+            ssh-add $key >/dev/null 2>&1
+        end
+    end
+end
+
+# Setup SSH agent if not already running
+if not set -q SSH_AUTH_SOCK
+    eval (ssh-agent -c) >/dev/null 2>&1
+end
+
+# Add SSH keys if SSH agent is running
+if set -q SSH_AUTH_SOCK
+    _add_ssh_keys
+end

roles/fish/files/config.fish

@@ -1,38 +1,34 @@
 # My fish config. Not much to see here; just some pretty standard stuff.
 
-### ADDING TO THE PATH
-# First line removes the path; second line sets it.  Without the first line,
-# your path gets massive and fish becomes very slow.
-set -e fish_user_paths
-set -U fish_user_paths $HOME/.bin $HOME/.local/bin $HOME/local/bin $HOME/.config/emacs/bin $HOME/Applications /var/lib/flatpak/exports/bin/ $HOME/go/bin $HOME/.fzf/bin $fish_user_paths
-
-#Remove fish vi mode indication in the prompt
+fish_add_path \
+    "$HOME/.bin" \
+    "$HOME/.local/bin" \
+    "$HOME/local/bin" \
+    "$HOME/.config/emacs/bin" \
+    "$HOME/Applications" \
+    "/var/lib/flatpak/exports/bin" \
+    "$HOME/go/bin" \
+    "$HOME/.fzf/bin"
+
+# Remove fish vi mode indication in the prompt
 function fish_mode_prompt; end
 
-# init starship quickly
-starship init fish | source
+# init starship quickly (only in interactive mode)
+if status is-interactive
+    starship init fish | source
+end
 
-set fish_greeting # Suppress fish's intro message
+# Suppress fish's intro message
+set fish_greeting
 
 # use the default terminal color
-set TERM xterm-256color # Sets the terminal type
+set TERM xterm-256color
 
 set -gx BAT_THEME "tokyonight_night"
 
-# -- layout=reverse makes the prompt at the top instead of at the bottom
-set -gx FZF_DEFAULT_OPTS "--height=65% --layout=reverse --bind ctrl-u:preview-page-up,ctrl-d:preview-page-down"
-
-# Use this command to list files in the fzf window when simply run the 'fzf' command.
-# Make sure to use the CTRL-T and ALT-C to its fullest.
-set -gx FZF_DEFAULT_COMMAND "fd --hidden --strip-cwd-prefix --exclude .git"
-set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
-
-set -gx FZF_CTRL_T_OPTS "--preview 'bat --color=always --style=numbers --line-range=:500 {}' --preview-window=right:noborder"
-set -gx FZF_ALT_C_OPTS "--preview 'eza --tree --icons --color=always {} | head -n 200' --preview-window=right:noborder"
-
 fish_config theme choose "Rosé Pine"
 
-#set up NEOVIM as a default editor.
+# set up NEOVIM as a default editor.
 set -gx EDITOR nvim
 set -gx GIT_EDITOR nvim
 
@@ -42,140 +38,37 @@ set -g fish_cursor_insert block
 set -g fish_cursor_replace block
 set -g fish_cursor_visual block
 
-#Setup SSH running. (mostly for git push)
-if not set -q SSH_AUTH_SOCK
-  # Redirecting the error or the output to the /dev/null
-    eval (ssh-agent -c) > /dev/null 2>&1
-end
-
-# If we are in this line, the ssh-agent should always be set up and running.
-# Add our private key to the ssh-agent
-# Redirecting the error or the output to the /dev/null
-ssh-add ~/.ssh/gh_login_shricodev > /dev/null 2>&1
-
-#This is the private key for my homelab vm on azure
-# ssh-add ~/.ssh/homelab-vm_key.pem > /dev/null 2>&1
-
 # Open tmux as default when the shell starts
-# Attach to or create the base session
-if not set -q TMUX
+# Only attach if we're in an interactive session to avoid breaking scripts
+if not set -q TMUX; and status is-interactive
   set -g TMUX tmux new-session -d -s mainline
   eval $TMUX
   tmux attach-session -d -t mainline
 end
 
-
-### ALIASES ###
-# navigation
-alias ..='cd ..'
-alias ...='cd ../..'
-alias .3='cd ../../..'
-alias .4='cd ../../../..'
-alias .5='cd ../../../../..'
-
-alias ping="ping -c 10"
-
-alias cat='bat --style=plain --paging=never'
-
-alias nv='nvim'
-alias vi='nvim'
-alias vim='nvim'
-alias v='nvim'
-
-alias cl='reset'
-# Make the `clear` command work as Ctrl - l as by default `clear` command clears
-# the screen completely
-alias clear='reset'
-alias clearraw='command clear'
-
-# Changing "ls" to "eza"
-alias ls='eza -alg --color=always --icons --group-directories-first' # my preferred listing
-#alias to use when you need to access the raw ls command
-alias lsraw='command ls'
-
-alias ll='eza -lg --color=always --icons --group-directories-first'
-
-alias la='eza -a --color=always --git-ignore --group-directories-first' # all files and dirs
-alias lt1='eza -aT --color=always --git-ignore --level=1 --group-directories-first'
-alias lt2='eza -aT --color=always --git-ignore --level=2 --group-directories-first'
-alias lt3='eza -aT --color=always --git-ignore --level=3 --group-directories-first'
-
-alias llg="eza --tree --level=2 --long -g --icons --git"
-
-# Show only the dotfiles
-alias l.='eza -a | grep -E "^\."'
-
-# Colorize grep output (good for log files)
-alias grep='grep --color=auto'
-
-# adding flags
-alias df='df -h' # human-readable sizes
-alias free='free -m' # show sizes in MB
-
-# Fuzzily find history
-alias hf='history | fzf'
-
-# Continue from where the download got interrupted if it happens. 
-# Without -c flag, wget will start downloading the file from scratch if the operation fails due to some 
-# network issues.
-alias wget="wget -c"
-
-alias lg="lazygit"
-
-# switch between shells
-# The shell path is hard coded for now since adding $(which <shell>) would result in warning in the terminal
-# if the shell is not installed.
-alias tobash="sudo chsh $USER -s /bin/bash && echo 'Now log out.'"
-alias tozsh="sudo chsh $USER -s /bin/zsh && echo 'Now log out.'"
-alias tofish="sudo chsh $USER -s /bin/fish && echo 'Now log out.'"
-
-# Safety nets
-# do not delete / or prompt if deleting more than 3 files at a time 
+# keep as alias since it's the base ls command replacement
+alias ls='eza -alg --color=always --icons --group-directories-first'
 alias rm='rm -I --preserve-root'
- 
-# confirmation
-alias mv='mv -i'
 alias cp='cp -i'
+alias mv='mv -i'
 alias ln='ln -i'
- 
-# Parenting changing perms on /
 alias chown='chown --preserve-root'
 alias chmod='chmod --preserve-root'
 alias chgrp='chgrp --preserve-root'
 
-# git aliases
-alias gl='git log --oneline'
-alias glp='git log --pretty=format:"%C(yellow)%h%Creset - %C(green)%an%Creset, %ar : %s"' 
-alias glt='git log --graph --oneline --all --decorate'
-
-# Yazi file manager
-alias yz='yazi'
-
-alias :q="exit"
-
-alias day="date +'%Y-%m-%d %A'"
-
-# Weather in current location
-alias wtr="curl wttr.in"
-
-# Do the internet speed test
-alias ist="curl -s 'https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest.py' | python3 -"
+# some raw aliases
+alias lsraw='command ls'
+alias clearraw='command clear'
 
-abbr -a --position anywhere --set-cursor='%' -- L '% | less'
+# colorize grep output (good for log files) - keep as global setting
+alias grep='grep --color=auto'
 
-# bun
-set --export BUN_INSTALL "$HOME/.bun"
-set --export PATH $BUN_INSTALL/bin $PATH
+bind \cd delete-char  # don't exit on accidental Ctrl-D
+bind \cd\cd\cd delete-or-exit  # exit on the third one
 
-# pnpm
-set -gx PNPM_HOME "/home/shricodev/.local/share/pnpm"
-if not string match -q -- $PNPM_HOME $PATH
-  set -gx PATH "$PNPM_HOME" $PATH
+# initialize zoxide only in interactive mode
+if status is-interactive
+    zoxide init fish | source
 end
 
-bind \cd delete-char  # Don't exit on accidental Ctrl-D
-bind \cd\cd\cd delete-or-exit  # Exit on the third one
-
-zoxide init fish | source
-
 # toilet "shricodev" -F border -F rainbow -f pagga

roles/fish/files/fish_variables

@@ -52,4 +52,4 @@ SETUVAR fish_pager_color_selected_background:\x2d\x2dreverse
 SETUVAR fish_pager_color_selected_completion:\x1d
 SETUVAR fish_pager_color_selected_description:\x1d
 SETUVAR fish_pager_color_selected_prefix:\x1d
-SETUVAR fish_user_paths:/home/shricodev/\x2ebin\x1e/home/shricodev/\x2elocal/bin\x1e/home/shricodev/local/bin\x1e/home/shricodev/\x2econfig/emacs/bin\x1e/home/shricodev/Applications\x1e/var/lib/flatpak/exports/bin/\x1e/home/shricodev/go/bin\x1e/home/shricodev/\x2efzf/bin
+SETUVAR fish_user_paths:/var/lib/flatpak/exports/bin\x1e/home/shricodev/\x2ebin\x1e/home/shricodev/\x2elocal/bin\x1e/home/shricodev/local/bin\x1e/home/shricodev/\x2econfig/emacs/bin\x1e/home/shricodev/Applications\x1e/var/lib/flatpak/exports/bin/\x1e/home/shricodev/go/bin\x1e/home/shricodev/\x2efzf/bin