diff --git a/users/willifan/common/shell/bash.nix b/users/willifan/common/shell/bash.nix
new file mode 100644
index 0000000..ece7fb5
--- /dev/null
+++ b/users/willifan/common/shell/bash.nix
@@ -0,0 +1,17 @@
+{ ... }:
+{
+  
+  home-manager.users.willifan = {
+    programs = {
+      bash = {
+        enable = true;
+      };
+      starship = {
+        enableBashIntegration = true;
+      };
+    };
+  };
+
+#  programs.bash.blesh.enable = true;
+
+}
diff --git a/users/willifan/common/shell/default.nix b/users/willifan/common/shell/default.nix
index b18c40b..6064585 100644
--- a/users/willifan/common/shell/default.nix
+++ b/users/willifan/common/shell/default.nix
@@ -2,13 +2,15 @@
 {
 
   imports = [
+    ./bash.nix
     ./hyfetch.nix
     ./nushell.nix
     ./ssh.nix
     ./starship.nix
+    ./zoxide.nix
     ./zsh.nix
   ];
 
-  users.users.willifan.shell = pkgs.nushell;
+  users.users.willifan.shell = pkgs.bash;
 
 }
diff --git a/users/willifan/common/shell/nushell.nix b/users/willifan/common/shell/nushell.nix
index a07f4e0..77d54d9 100644
--- a/users/willifan/common/shell/nushell.nix
+++ b/users/willifan/common/shell/nushell.nix
@@ -1,8 +1,15 @@
 { ... }:
 {
 
-  home-manager.users.willifan.programs.nushell = {
-    enable = true;
+  home-manager.users.willifan = {
+    programs = {
+      nushell = {
+        enable = true;
+      };
+      starship = {
+        enableNushellIntegration = true;
+      };
+    };
   };
 
 }
diff --git a/users/willifan/common/shell/starship.nix b/users/willifan/common/shell/starship.nix
index 585f20e..417b914 100644
--- a/users/willifan/common/shell/starship.nix
+++ b/users/willifan/common/shell/starship.nix
@@ -3,7 +3,6 @@
 
   home-manager.users.willifan.programs.starship = {
     enable = true;
-    enableNushellIntegration = true;
     settings = {
       format = lib.concatStrings [
 	"[  ](fg:twelve bg:trans_blue)"
diff --git a/users/willifan/common/shell/zoxide.nix b/users/willifan/common/shell/zoxide.nix
new file mode 100644
index 0000000..4612a20
--- /dev/null
+++ b/users/willifan/common/shell/zoxide.nix
@@ -0,0 +1,13 @@
+{ ... }:
+{
+
+  home-manager.users.willifan = {
+    programs.zoxide = {
+      enable = true;
+      options = [
+        "--cmd cd"
+      ];
+    };
+  };
+
+}