users/willifan/common/default.nix

@@ -8,6 +8,7 @@
 
     ./envvar.nix
     ./git.nix
+    ./hyfetch.nix
     ./locales.nix
     ./user.nix
   ];

users/willifan/common/shell/bash.nix

@@ -1,17 +0,0 @@
-{ ... }:
-{
-  
-  home-manager.users.willifan = {
-    programs = {
-      bash = {
-        enable = true;
-      };
-      starship = {
-        enableBashIntegration = true;
-      };
-    };
-  };
-
-#  programs.bash.blesh.enable = true;
-
-}

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;
 
 }

users/willifan/common/shell/eza.nix

@@ -1,10 +0,0 @@
-{ ... }:
-{
-
-  home-manager.users.willifan = {
-    programs.eza = {
-      enable = true;
-    };
-  };
-
-}

users/willifan/common/shell/nushell.nix

@@ -1,15 +1,8 @@
 { ... }:
 {
 
-  home-manager.users.willifan = {
+  home-manager.users.willifan.programs.nushell = {
-    programs = {
+    enable = true;
-      nushell = {
-        enable = true;
-      };
-      starship = {
-        enableNushellIntegration = true;
-      };
-    };
   };
 
 }

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)"

users/willifan/common/shell/zoxide.nix

@@ -1,13 +0,0 @@
-{ ... }:
-{
-
-  home-manager.users.willifan = {
-    programs.zoxide = {
-      enable = true;
-      options = [
-        "--cmd cd"
-      ];
-    };
-  };
-
-}