From fffd77b3d14ca457a68a955fa4744f73f5b943f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nikodem@rabulinski.com>
Date: Fri, 2 Feb 2024 12:13:00 +0100
Subject: [PATCH] wrappers/fish: enable vi mode

---
 wrappers/fish/config.fish | 3 ++-
 wrappers/fish/default.nix | 2 +-
 wrappers/fish/prompt.fish | 9 ++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wrappers/fish/config.fish b/wrappers/fish/config.fish
index 59ce5c8..e193e69 100644
--- a/wrappers/fish/config.fish
+++ b/wrappers/fish/config.fish
@@ -1,5 +1,6 @@
 status --is-interactive
 and begin
+    fish_vi_key_bindings insert
 
     # Abbreviations
     ## nix
@@ -19,7 +20,7 @@ and begin
     alias cat bat
     alias l 'eza -lah --group-directories-first --icons'
 
+    # Integrations
     zoxide init fish | source
     direnv hook fish | source
-
 end
diff --git a/wrappers/fish/default.nix b/wrappers/fish/default.nix
index eaeebd0..33e508d 100644
--- a/wrappers/fish/default.nix
+++ b/wrappers/fish/default.nix
@@ -20,8 +20,8 @@
       config-fish = pkgs.writeText "config.fish" ''
         ${path-add-lines}
 
-        source ${./config.fish}
         source ${./prompt.fish}
+        source ${./config.fish}
       '';
     in [
       "-C"
diff --git a/wrappers/fish/prompt.fish b/wrappers/fish/prompt.fish
index 161514c..f63c979 100644
--- a/wrappers/fish/prompt.fish
+++ b/wrappers/fish/prompt.fish
@@ -1,6 +1,10 @@
 # name: Nim
 # author: Guilhem "Nim" Saurel − https://github.com/nim65s/dotfiles/
 
+# Vi-mode
+# The default mode prompt would be prefixed, which ruins our alignment.
+function fish_mode_prompt; end
+
 function fish_prompt
     set -l retc red
     test $status = 0; and set retc green
@@ -60,11 +64,6 @@ function fish_prompt
     # Date
     _nim_prompt_wrapper $retc '' (date +%X)
 
-    # Vi-mode
-    # The default mode prompt would be prefixed, which ruins our alignment.
-    function fish_mode_prompt
-    end
-
     if test "$fish_key_bindings" = fish_vi_key_bindings
         or test "$fish_key_bindings" = fish_hybrid_key_bindings
         set -l mode