diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 13c63d4..47761b2 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -7,8 +7,8 @@ in
 {
   imports = (featureBundler ./bundles) ++ (featureBundler ./features);
 
-  bash.enable = lib.mkDefault true;
   gh.enable = lib.mkDefault true;
   git.enable = lib.mkDefault true;
+  nushell.enable = lib.mkDefault true;
   zoxide.enable = lib.mkDefault true;
 }
diff --git a/modules/home-manager/features/bash.nix b/modules/home-manager/features/bash.nix
deleted file mode 100644
index e5ff5fb..0000000
--- a/modules/home-manager/features/bash.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }:
-let
-  feature = "bash";
-in
-{
-  config = lib.mkIf config.${feature}.enable {
-    programs.bash.enable = true;
-  };
-
-  imports = [ ];
-
-  options.${feature}.enable = lib.mkEnableOption "enables ${feature}";
-}
diff --git a/modules/home-manager/features/nushell.nix b/modules/home-manager/features/nushell.nix
new file mode 100644
index 0000000..820b0ee
--- /dev/null
+++ b/modules/home-manager/features/nushell.nix
@@ -0,0 +1,33 @@
+{ config, lib, ... }:
+let
+  feature = "nushell";
+in
+{
+  config = lib.mkIf config.${feature}.enable {
+    home.shell.enableNushellIntegration = true;
+    programs.nushell = {
+      enable = true;
+      environmentVariables = {
+
+      };
+      settings = {
+
+      };
+      shellAliases = {
+        cat = "bat";
+        cd = "zoxide";
+        g = "lazygit";
+        l = "eza";
+        la = "eza -a";
+        ls = "eza";
+        ns = "nh os switch";
+        vi = "nvim";
+        vim = "nvim";
+      };
+    };
+  };
+
+  imports = [ ];
+
+  options.${feature}.enable = lib.mkEnableOption "enables ${feature}";
+}
diff --git a/modules/nixos/features/shell.nix b/modules/nixos/features/shell.nix
deleted file mode 100644
index 2d3d4a7..0000000
--- a/modules/nixos/features/shell.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, lib, ... }:
-let
-  feature = "shell";
-in
-{
-  config = lib.mkIf config.${feature}.enable {
-    environment.shellAliases = {
-      l = "eza --long --header --group-directories-first --icons always";
-      la = "l -a";
-      g = "lazygit";
-      ns = "nh os switch";
-      rf = "nix flake init --template 'https://flakehub.com/f/the-nix-way/dev-templates/*#rust' && direnv allow";
-      vi = "nvim";
-      vim = "nvim";
-    };
-  };
-
-  imports = [ ];
-
-  options.${feature}.enable = lib.mkEnableOption "enables ${feature}";
-}