diff --git a/home-manager/home.nix b/home-manager/home.nix
index 16a372f..123becd 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -27,6 +27,7 @@
     ./modules/helix.nix
     ./modules/tofi.nix
     ./modules/vkbasalt.nix
+    ./modules/nushell.nix
   ];
 
   # My packages
diff --git a/home-manager/modules/confs/nushell/config.nu b/home-manager/modules/confs/nushell/config.nu
new file mode 100644
index 0000000..2d8f9c6
--- /dev/null
+++ b/home-manager/modules/confs/nushell/config.nu
@@ -0,0 +1,4 @@
+$env.config = {
+    show_banner: false,
+    edit_mode: vi,
+}
diff --git a/home-manager/modules/nushell.nix b/home-manager/modules/nushell.nix
new file mode 100644
index 0000000..173687d
--- /dev/null
+++ b/home-manager/modules/nushell.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }: {
+
+  programs.nushell = {
+    enable = true;
+    configFile.source = ./confs/nushell/config.nu;
+    extraConfig = ''
+      use ${pkgs.nu_scripts}/share/nu_scripts/aliases/git/git-aliases.nu *
+      use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu *
+
+      use ${pkgs.nu_scripts}/share/nu_scripts/themes/nu-themes/catppuccin-mocha.nu
+
+      $env.config.color_config = (catppuccin-mocha)
+    '';
+  };
+
+  programs.direnv.enableNushellIntegration = true;
+
+  programs.eza.enableNushellIntegration = true;
+
+  programs.starship.enableNushellIntegration = true;
+
+  programs.zoxide.enableNushellIntegration = true;
+}