From c7fd3198516f8cb9214e5e5c590eb950828b8bf3 Mon Sep 17 00:00:00 2001
From: Steve Beaulac <steve@beaulac.me>
Date: Thu, 16 Jul 2026 09:15:50 -0400
Subject: [PATCH] refactor(config/fish): guard aliases with command -q, clean
 up stale config

---
 config/fish/config.fish | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 4bf98c6..9875c9b 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -17,9 +17,6 @@ if status is-interactive
 
     set -gx npm_config_prefix "$HOME/.local"
 
-    # fish_config theme choose "kanagawa"
-    # fish_config theme choose "Dracula"
-
     if command -q mise
        /usr/bin/mise activate fish | source
     end
@@ -34,9 +31,6 @@ if status is-interactive
 
     if command -q fzf
        /usr/bin/fzf --fish | source
-       alias zk="nvim \$(fzf --walker=file --walker-root=/home/sjb/Documents/nca-notes/ --preview 'bat --color=always -n --line-range :500 {}')"
-       #set -gx FZF_CTRL_T_OPTS  "--preview 'bat --color=always -n --line-range :500 {}'"
-       #set -gx FZF_ALT_C_OPTS "--preview 'eza --icons=always --color=always {} | head -200'"
     end
     command -q nmcli && alias nmlist "nmcli device wifi list"
 
@@ -54,7 +48,15 @@ if status is-interactive
     command -q xdg-open && alias o "xdg-open"
     command -q lazygit && alias lg lazygit
 
-    command -q nvim && set -gx EDITOR nvim
+    if command -q nvim 
+        set -gx EDITOR nvim
+    end
+
+    if command -q v 
+        alias oo="cd ~/Documents/nca-notes/"
+        alias on="v +Obsidian new"
+        alias os="v +Obsidian search"
+    end 
 
     command -q jj && alias rev "jj log -G -T 'commit_id.short(8)'"
 
@@ -73,13 +75,18 @@ if status is-interactive
     end
 
     # Commands to run in interactive sessions can go here
-    alias ll="exa -l -g --icons"
-    alias ls="exa -al --color=always --group-directories-first"
-    alias oo="cd ~/Documents/nca-notes/"
-    alias on="v +Obsidian new"
-    alias os="v +Obsidian search"
-    alias cat="bat"
-    alias g=git
+    if command -q eza
+        alias ll="eza -l -g --icons"
+        alias ls="eza -al --color=always --group-directories-first"
+    end
+
+    if command -q bat
+        alias cat="bat"
+    end
+
+    if command -q git
+        alias g=git
+    end
 
     set -gx VISUAL $EDITOR