diff --git a/home/darwin.nix b/home/darwin.nix
index 7ef9249..06c968f 100644
--- a/home/darwin.nix
+++ b/home/darwin.nix
@@ -15,8 +15,9 @@
   imports = [
     ../modules/ssh
     ../modules/git
-    ../modules/fish
+    ../modules/zoxide
     ../modules/atuin
+    ../modules/bash
     ../modules/wezterm
     ../modules/nvim
     ../modules/lazygit
diff --git a/modules/atuin/default.nix b/modules/atuin/default.nix
index 268d815..5712d3b 100644
--- a/modules/atuin/default.nix
+++ b/modules/atuin/default.nix
@@ -1,6 +1,7 @@
 {
   programs.atuin = {
     enable = true;
+    enableBashIntegration = true;
     enableFishIntegration = true;
     settings = {
       style = "compact";
diff --git a/modules/bash/default.nix b/modules/bash/default.nix
index 5e174f9..76afbfe 100644
--- a/modules/bash/default.nix
+++ b/modules/bash/default.nix
@@ -3,21 +3,35 @@
     enable = true;
     enableCompletion = true;
 
+    sessionVariables = {
+      GPG_TTY = "$(tty)";
+    };
+
     shellAliases = {
       "ff" = "${./bin/ff.sh}";
       "ipl" = "ifconfig | grep \"inet \" | grep -v 127.0.0.1 | awk '{print $2}' | head -n 1";
       "ipp" = "curl -4 ifconfig.me";
+      "lg" = "lazygit";
+      "g" = "git";
+      "xsrc" = "source ~/.bashrc && source .bash_profile";
     };
 
+    profileExtra = ''
+      export PATH=\
+      /run/current-system/sw/bin:\
+      /opt/homebrew/bin:$PATH
+    '';
+
     bashrcExtra = ''
-      # Env variables
-      # Setup emacs-libvterm
+      # FNM
+      eval "$(fnm env --use-on-cd --shell bash)"
+      
+      # emacs-libvterm
       if [[ "$INSIDE_EMACS" = 'vterm' ]] \
         && [[ -n "$EMACS_VTERM_PATH" ]] \
         && [[ -f "$EMACS_VTERM_PATH/etc/emacs-vterm-bash.sh" ]]; then
         source "$EMACS_VTERM_PATH
       fi
     '';
-
   };
 }
diff --git a/modules/zoxide/default.nix b/modules/zoxide/default.nix
new file mode 100644
index 0000000..95bf87b
--- /dev/null
+++ b/modules/zoxide/default.nix
@@ -0,0 +1,6 @@
+{
+  zoxide = {
+    enable = true;
+    enableBashIntegration = true;
+  };
+}