diff --git a/users/willifan/common/default.nix b/users/willifan/common/default.nix
index bb63c10..2d1a652 100644
--- a/users/willifan/common/default.nix
+++ b/users/willifan/common/default.nix
@@ -8,6 +8,7 @@
 
     ./envvar.nix
     ./git.nix
+    ./hyfetch.nix
     ./locales.nix
     ./user.nix
   ];
diff --git a/users/willifan/common/shell/hyfetch.nix b/users/willifan/common/hyfetch.nix
similarity index 100%
rename from users/willifan/common/shell/hyfetch.nix
rename to users/willifan/common/hyfetch.nix
diff --git a/users/willifan/common/shell/bash.nix b/users/willifan/common/shell/bash.nix
deleted file mode 100644
index ece7fb5..0000000
--- a/users/willifan/common/shell/bash.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ ... }:
-{
-  
-  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 ca4468f..08704ad 100644
--- a/users/willifan/common/shell/default.nix
+++ b/users/willifan/common/shell/default.nix
@@ -2,16 +2,12 @@
 {
 
   imports = [
-    ./bash.nix
-    ./eza.nix
-    ./hyfetch.nix
     ./nushell.nix
     ./ssh.nix
     ./starship.nix
-    ./zoxide.nix
     ./zsh.nix
   ];
 
-  users.users.willifan.shell = pkgs.bash;
+  users.users.willifan.shell = pkgs.nushell;
 
 }
diff --git a/users/willifan/common/shell/eza.nix b/users/willifan/common/shell/eza.nix
deleted file mode 100644
index bcd651d..0000000
--- a/users/willifan/common/shell/eza.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ ... }:
-{
-
-  home-manager.users.willifan = {
-    programs.eza = {
-      enable = true;
-    };
-  };
-
-}
diff --git a/users/willifan/common/shell/nushell.nix b/users/willifan/common/shell/nushell.nix
index 77d54d9..a07f4e0 100644
--- a/users/willifan/common/shell/nushell.nix
+++ b/users/willifan/common/shell/nushell.nix
@@ -1,15 +1,8 @@
 { ... }:
 {
 
-  home-manager.users.willifan = {
-    programs = {
-      nushell = {
-        enable = true;
-      };
-      starship = {
-        enableNushellIntegration = true;
-      };
-    };
+  home-manager.users.willifan.programs.nushell = {
+    enable = true;
   };
 
 }
diff --git a/users/willifan/common/shell/starship.nix b/users/willifan/common/shell/starship.nix
index 417b914..585f20e 100644
--- a/users/willifan/common/shell/starship.nix
+++ b/users/willifan/common/shell/starship.nix
@@ -3,6 +3,7 @@
 
   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
deleted file mode 100644
index 4612a20..0000000
--- a/users/willifan/common/shell/zoxide.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ... }:
-{
-
-  home-manager.users.willifan = {
-    programs.zoxide = {
-      enable = true;
-      options = [
-        "--cmd cd"
-      ];
-    };
-  };
-
-}