From 8126c81e97b1d50a1b8aafc889ea62a51273933d Mon Sep 17 00:00:00 2001
From: Cian Hughes <chughes000@gmail.com>
Date: Tue, 13 Jan 2026 12:32:27 +0000
Subject: [PATCH] Tweaked nushell config to allow my dotfiles to co-exist with
 HM settings

---
 home-manager/core/dotfiles     |  2 +-
 home-manager/core/dotfiles.nix |  2 +-
 home-manager/core/programs.nix | 18 ++++++++++++++++++
 nixos/worklaptop.nix           |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/home-manager/core/dotfiles b/home-manager/core/dotfiles
index 936e833..6531159 160000
--- a/home-manager/core/dotfiles
+++ b/home-manager/core/dotfiles
@@ -1 +1 @@
-Subproject commit 936e8338c68db6160c5090f45d2e561b992d6ed6
+Subproject commit 6531159f6361de6b91016074e0686c66c6770d8f
diff --git a/home-manager/core/dotfiles.nix b/home-manager/core/dotfiles.nix
index 54bf484..8635b07 100644
--- a/home-manager/core/dotfiles.nix
+++ b/home-manager/core/dotfiles.nix
@@ -13,7 +13,7 @@
     };
     "nushell" = {
       source = ./dotfiles/dot_config/nushell;
-      target = ".config/nushell";
+      target = ".config/nushell/my_config";
       recursive = true;
     };
     "nvim" = {
diff --git a/home-manager/core/programs.nix b/home-manager/core/programs.nix
index c4a3248..e507cd9 100644
--- a/home-manager/core/programs.nix
+++ b/home-manager/core/programs.nix
@@ -12,6 +12,24 @@
   ];
   programs = {
     home-manager.enable = true;
+    nushell = let
+      pkgStream = unstablePkgs;
+    in {
+      enable = true;
+      package = pkgStream.nushell;
+      plugins = with pkgStream.nushellPlugins; [
+        formats
+        gstat
+        polars
+        query
+      ];
+      extraConfig = ''
+        source ~/.config/nushell/my_config/config.nu
+      '';
+      extraEnv = ''
+        source ~/.config/nushell/my_config/env.nu
+      '';
+    };
     git.enable = true;
   };
 }
diff --git a/nixos/worklaptop.nix b/nixos/worklaptop.nix
index 2ee6a7a..53820df 100644
--- a/nixos/worklaptop.nix
+++ b/nixos/worklaptop.nix
@@ -141,5 +141,5 @@
   };
 
   # Set user config settings
-  users.defaultUserShell = pkgs.nushell;
+  users.defaultUserShell = unstablePkgs.nushell;
 }