From dfb26c3b59675a906162e88b13e0270977e282a1 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 13 Apr 2025 19:42:55 +0800
Subject: [PATCH] feat: nushell - update extraConfig

---
 home/base/core/shells/config.nu |  7 -------
 home/base/tui/shell.nix         | 27 ++++++++++++++++-----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/home/base/core/shells/config.nu b/home/base/core/shells/config.nu
index 7f4ec134..bca89b48 100644
--- a/home/base/core/shells/config.nu
+++ b/home/base/core/shells/config.nu
@@ -147,11 +147,6 @@ const NU_LIB_DIRS = [
     ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
     ($nu.data-dir | path join 'completions') # default home for nushell completions
 ]
-# You can replace (override) or append to this list by shadowing the constant
-const NU_LIB_DIRS = $NU_LIB_DIRS ++ [($nu.default-config-dir | path join 'modules')]
-
-# An environment variable version of this also exists. It is searched after the constant.
-$env.NU_LIB_DIRS ++= [ ($nu.data-dir | path join "nu_scripts") ]
 
 # NU_PLUGIN_DIRS
 # --------------
@@ -162,8 +157,6 @@ $env.NU_LIB_DIRS ++= [ ($nu.data-dir | path join "nu_scripts") ]
 const NU_PLUGIN_DIRS = [
     ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
 ]
-# You can replace (override) or append to this list by shadowing the constant
-const NU_PLUGIN_DIRS = $NU_PLUGIN_DIRS ++ [($nu.default-config-dir | path join 'plugins')]
 
 # As with NU_LIB_DIRS, an $env.NU_PLUGIN_DIRS is searched after the constant version
 
diff --git a/home/base/tui/shell.nix b/home/base/tui/shell.nix
index d5e5707c..4cf3550c 100644
--- a/home/base/tui/shell.nix
+++ b/home/base/tui/shell.nix
@@ -25,19 +25,24 @@ in {
     # https://github.com/nushell/nushell/issues/8214
     extraConfig = ''
       source /etc/agenix/alias-for-work.nushell
+
+      # Directories in this constant are searched by the
+      # `use` and `source` commands.
+      const NU_LIB_DIRS = $NU_LIB_DIRS ++ ['${nu_scripts}/share/nu_scripts']
+
       # completion
-      use ${nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu *
-      use ${nu_scripts}/share/nu_scripts/custom-completions/glow/glow-completions.nu *
-      use ${nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu *
-      use ${nu_scripts}/share/nu_scripts/custom-completions/make/make-completions.nu *
-      use ${nu_scripts}/share/nu_scripts/custom-completions/man/man-completions.nu *
-      use ${nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu *
-      use ${nu_scripts}/share/nu_scripts/custom-completions/cargo/cargo-completions.nu *
-      use ${nu_scripts}/share/nu_scripts/custom-completions/zellij/zellij-completions.nu *
+      use custom-completions/git/git-completions.nu *
+      use custom-completions/glow/glow-completions.nu *
+      use custom-completions/just/just-completions.nu *
+      use custom-completions/make/make-completions.nu *
+      use custom-completions/man/man-completions.nu *
+      use custom-completions/nix/nix-completions.nu *
+      use custom-completions/cargo/cargo-completions.nu *
+      use custom-completions/zellij/zellij-completions.nu *
       # alias
-      # use ${nu_scripts}/share/nu_scripts/aliases/git/git-aliases.nu *
-      use ${nu_scripts}/share/nu_scripts/aliases/eza/eza-aliases.nu *
-      use ${nu_scripts}/share/nu_scripts/aliases/bat/bat-aliases.nu *
+      use aliases/git/git-aliases.nu *
+      use aliases/eza/eza-aliases.nu *
+      use aliases/bat/bat-aliases.nu *
     '';
   };
 }