diff --git a/modules/home/common/default.nix b/modules/home/common/default.nix
index 1269453..ce6da62 100644
--- a/modules/home/common/default.nix
+++ b/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 = {
diff --git a/wrappers/fish/config.fish b/wrappers/fish/config.fish
index 7b77cb9..59ce5c8 100644
--- a/wrappers/fish/config.fish
+++ b/wrappers/fish/config.fish
@@ -1,15 +1,25 @@
-# Abbreviations
-## nix
-abbr --add --global -- ns 'nix shell'
-abbr --add --global -- nss 'nix search'
-abbr --add --global -- flake-update 'nix flake lock --update-input'
-## git
-abbr --add --global -- gs 'git status'
-abbr --add --global -- gp 'git pull'
-abbr --add --global -- gc 'git checkout'
-abbr --add --global -- ga 'git add'
-abbr --add --global -- gr 'git rebase'
+status --is-interactive
+and begin
 
-# Aliases
-alias cat bat
-alias l 'eza -lah --group-directories-first --icons'
+    # Abbreviations
+    ## nix
+    abbr --add --global -- ns 'nix shell'
+    abbr --add --global -- nss 'nix search'
+    abbr --add --global -- flake-update 'nix flake lock --update-input'
+    ## git
+    abbr --add --global -- gs 'git status'
+    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
diff --git a/wrappers/fish/default.nix b/wrappers/fish/default.nix
index 8f34374..eaeebd0 100644
--- a/wrappers/fish/default.nix
+++ b/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];
   };
 }