wrappers/fish: add zoxide and direnv properly

modules/home/common/default.nix

@@ -21,7 +21,6 @@ in {
   ];
 
   programs.fish.enable = true;
-  programs.direnv.enable = true;
   programs.nix-index.enable = true;
   programs.ssh.enable = true;
   programs.git = {

wrappers/fish/config.fish

@@ -1,3 +1,6 @@
+status --is-interactive
+and begin
+
     # Abbreviations
     ## nix
     abbr --add --global -- ns 'nix shell'
@@ -9,7 +12,14 @@ abbr --add --global -- gp 'git pull'
     abbr --add --global -- gc 'git checkout'
     abbr --add --global -- ga 'git add'
     abbr --add --global -- gr 'git rebase'
+    abbr --add --global -- gd 'git diff'
+    abbr --add --global -- gl 'git log'
 
     # Aliases
     alias cat bat
     alias l 'eza -lah --group-directories-first --icons'
+
+    zoxide init fish | source
+    direnv hook fish | source
+
+end

wrappers/fish/default.nix

@@ -22,14 +22,12 @@
 
         source ${./config.fish}
         source ${./prompt.fish}
-
-        ${lib.getExe pkgs.zoxide} init fish | source
       '';
     in [
       "-C"
       "source ${config-fish}"
     ];
 
-    pathAdd = with pkgs; [eza bat fzf ripgrep];
+    pathAdd = with pkgs; [eza bat fzf ripgrep zoxide direnv];
   };
 }