From 0d0cc60003791e411e431d4666d30716b2661cff Mon Sep 17 00:00:00 2001
From: Steve Beaulac <steve@beaulac.me>
Date: Fri, 24 Apr 2026 20:42:39 -0400
Subject: [PATCH] feat(fish): update config.fish with new aliases and functions

---
 config/fish/config.fish | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 2277902..a09f339 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -19,14 +19,6 @@ if status is-interactive
 
     # fish_config theme choose "kanagawa"
     # fish_config theme choose "Dracula"
-    # 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="nvim +Obsidian new"
-    alias os="nvim +Obsidian search"
-    alias cat="bat"
-    alias g=git
 
     command -qv nmcli && alias nmlist "nmcli device wifi list"
     command -qv tree && alias tree "tree -L 3 -a -I '.git' --charset X "
@@ -40,10 +32,16 @@ if status is-interactive
 
     command -qv lazygit && alias lg lazygit
 
-    command -qv vi && alias v vi && set -gx EDITOR vi
-    command -qv vim && alias vi vim && alias v vim && set -gx EDITOR vim
-    command -qv nvim && alias vim nvim && alias vi nvim && alias v nvim && set -gx EDITOR nvim
-    command -qv nvim && alias mini "NVIM_APPNAME=mini.nvim nvim"
+    if command -qv nvim;
+        if ! command -qv ~/.local/bin/v;
+            alias v nvim
+        end
+        alias vim v
+        alias vi v
+        alias mini "NVIM_APPNAME=mini.nvim nvim"
+    end 
+    command -qv vim && alias vi vim && alias v vim
+    set -gx EDITOR vim
 
     command -qv jj && alias rev "jj log -G -T 'commit_id.short(8)'"
 
@@ -57,6 +55,15 @@ if status is-interactive
         alias oc "opencode"
     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
+
     set -gx VISUAL $EDITOR
 
     if test -x /usr/bin/mise;