nushell: add nu_scripts to NU_LIB_DIRS

home-manager/modules/emacs/default.nix

@@ -12,6 +12,17 @@ with lib; let
     cp ${initFile} $out
   '';
 
+  tree-sitter-hare = pkgs.tree-sitter.buildGrammar {
+    language = "tree-sitter-hare";
+    version = "unstable-2023-12-31";
+    src = pkgs.fetchFromSourcehut {
+      owner = "~ecs";
+      repo = "tree-sitter-hare";
+      rev = "9408bb8fd6c110307f7c92fa834eb5dbd92e36d8";
+      sha256 = "iqaj+7Ax5zfXGXsJw5pesTlTeah2X4Li4LpInDSUTcU=";
+    };
+  };
+
   emacsWithPackages = pkgs.emacsWithPackagesFromUsePackage {
     config =
       let
@@ -50,6 +61,7 @@ with lib; let
         tree-sitter-gomod
         tree-sitter-gowork
         tree-sitter-graphql
+        tree-sitter-hare
         tree-sitter-haskell
         tree-sitter-hcl
         tree-sitter-heex
@@ -65,14 +77,7 @@ with lib; let
         tree-sitter-markdown
         tree-sitter-markdown-inline
         tree-sitter-nix
-        (tree-sitter-nu.overrideAttrs (_prevAttr: {
+        tree-sitter-nu
-          src = pkgs.fetchFromGitHub {
-            owner = "nushell";
-            repo = "tree-sitter-nu";
-            rev = "307559b6a3885ef0c55bcd5e23e9e164a7ce03bd";
-            sha256 = "RuvR2Yb2CTxpxyXgr+2uUQa9N75sIhYlS9moyedZo8A=";
-          };
-        }))
         tree-sitter-pioasm
         tree-sitter-python
         tree-sitter-query

home-manager/modules/nushell/default.nix

@@ -27,6 +27,8 @@ in
         ${config.programs.zoxide.package}/bin/zoxide init nushell ${zoxideOptions} | save --force ${config.xdg.cacheHome}/zoxide/init.nu
         # Temporary fix until zoxide releases new version
         sed -i 's/def-env/def --env/g' ${config.xdg.cacheHome}/zoxide/init.nu
+
+        $env.NU_LIB_DIRS = ($env.NU_LIB_DIRS | append ${pkgs.nu_scripts}/share/nu_scripts)
       '';
       extraConfig = ''
         alias vim = nvim
@@ -40,7 +42,9 @@ in
 
         use kink.nu
 
-        use ${pkgs.nu_scripts}/share/nu_scripts/themes/nu-themes/dracula.nu
+        # use ${pkgs.nu_scripts}/share/nu_scripts/themes/nu-themes/dracula.nu
+        use themes/nu-themes/dracula.nu
+
         $env.config = ($env.config | merge { color_config: (dracula)})
 
         source ${config.xdg.cacheHome}/zoxide/init.nu