chs: re-add drifted files

dot_agents/dot_skill-lock.json

dot_config/fish/conf.d/00-path.fish

@@ -7,7 +7,6 @@ fish_add_path $HOME/.grok/bin
 fish_add_path $HOME/.opencode/bin
 fish_add_path -a $HOME/.foundry/bin
 fish_add_path -a $HOME/local/share/pnpm
-source $HOME/.atuin/bin/env.fish
 
 # pnpm
 set -gx PNPM_HOME $HOME/.local/share/pnpm

dot_config/fish/conf.d/atuin.env.fish

@@ -1,2 +0,0 @@
-
-source "$HOME/.atuin/bin/env.fish"

dot_config/fish/config.fish

@@ -30,10 +30,9 @@ status is-interactive; and test "$FISH_BOTTOM_PROMPT" = 1; and tput cup $LINES 0
 fish_add_path $HOME/.grok/bin
 # <<< grok installer <<<
 
+# Generated for envman. Do not edit.
+test -s ~/.config/envman/load.fish; and source ~/.config/envman/load.fish
 
 if status is-interactive
     atuin init fish | source
 end
-
-# Generated for envman. Do not edit.
-test -s ~/.config/envman/load.fish; and source ~/.config/envman/load.fish

dot_config/fish/functions/fish_user_key_bindings.fish

@@ -1,25 +1,33 @@
 function fish_user_key_bindings
-    # Keys owned by kitty.conf never reach fish and are NOT bound here:
-    #   ctrl-g → lazygit overlay, ctrl-a → omp hsplit, ctrl-y → yazi vsplit,
-    #   ctrl-h/j/k/l → vim-aware split nav (pass_keys.py).
-    # ctrl-e: yazi, same as ctrl-f (cd's to yazi's exit dir on quit).
-    bind ctrl-e 'yy; commandline -f repaint'
-    bind ctrl-b purple repaint
-    bind ctrl-y clip-last
+    # Vi mode first: it rebinds the preset tables and (on first activation)
+    # re-triggers this function via the fish_key_bindings handler, so custom
+    # binds must come after it to land on top.
+    fish_vi_key_bindings
 
-    bind ctrl-o 'gho; commandline -f repaint'
-    bind ctrl-p 'pj; commandline -f repaint'
-    bind ctrl-a 'omp; commandline -f repaint'
-    # bind \ca 'launch_omp_livediff_overlay; commandline -f repaint'
+    # Vi mode types in `insert`; bind customs there AND in `default` (normal)
+    # so the keys work regardless of mode.
+    for mode in insert default
+        # Keys owned by kitty.conf never reach fish and are NOT bound here:
+        #   ctrl-g → lazygit overlay, ctrl-a → omp hsplit, ctrl-y → yazi vsplit,
+        #   ctrl-h/j/k/l → vim-aware split nav (pass_keys.py).
+        # ctrl-e: yazi, same as ctrl-f (cd's to yazi's exit dir on quit).
+        bind -M $mode ctrl-e 'yy; commandline -f repaint'
+        bind -M $mode ctrl-b purple repaint
+        bind -M $mode ctrl-y clip-last
 
-    # ctrl-f: pick file(s) with television and open in nvim.
-    bind ctrl-f 'yy; commandline -f repaint'
-    bind ctrl-g 'lazygit; commandline -f repaint'
+        bind -M $mode ctrl-o 'gho; commandline -f repaint'
+        bind -M $mode ctrl-p 'pj; commandline -f repaint'
+        bind -M $mode ctrl-a 'omp; commandline -f repaint'
 
-    # ctrl-c routes through the clear wrapper (kitty scrollback + prompt
-    # pinned to the bottom) AND wipes any text typed on the command line.
-    bind ctrl-c 'commandline -r ""; clear; commandline -f repaint'
+        # ctrl-f: pick file(s) with television and open in nvim.
+        bind -M $mode ctrl-f 'yy; commandline -f repaint'
+        bind -M $mode ctrl-g 'lazygit; commandline -f repaint'
 
-    # ctrl-q mirrors ctrl-d's preset (`exit`) — quit the shell.
-    bind ctrl-q exit
+        # ctrl-c routes through the clear wrapper (kitty scrollback + prompt
+        # pinned to the bottom) AND wipes any text typed on the command line.
+        bind -M $mode ctrl-c 'commandline -r ""; clear; commandline -f repaint'
+
+        # ctrl-q mirrors ctrl-d's preset (`exit`) — quit the shell.
+        bind -M $mode ctrl-q exit
+    end
 end