feat: update for shells

home/base/server/bash.nix

@@ -1,16 +0,0 @@
-_: {
-  programs.bash = {
-    enable = true;
-    enableCompletion = true;
-    bashrcExtra = ''
-      export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
-    '';
-
-    shellAliases = {
-      k = "kubectl";
-
-      urldecode = "python3 -c 'import sys, urllib.parse as ul; print(ul.unquote_plus(sys.stdin.read()))'";
-      urlencode = "python3 -c 'import sys, urllib.parse as ul; print(ul.quote_plus(sys.stdin.read()))'";
-    };
-  };
-}

home/base/server/default.nix

@@ -1,10 +1,9 @@
 {...}: {
   imports = [
-    ./nushell
+    ./shells
     ./tmux
     ./zellij
 
-    ./bash.nix
     ./bat.nix
     ./btop.nix
     ./core.nix

home/base/server/nushell/default.nix

@@ -1,19 +0,0 @@
-{config, ...}: {
-  programs.nushell = {
-    enable = true;
-    configFile.source = ./config.nu;
-
-    # home-manager will merge the cotent in `environmentVariables` with the `envFile.source`
-    # but basically, I set all environment variables via the shell-independent way, so I don't need to use those two options
-    #
-    # envFile.source = ./env.nu;
-    # environmentVariables = { FOO="bar"; };
-
-    shellAliases = {
-      k = "kubectl";
-
-      urldecode = "python3 -c 'import sys, urllib.parse as ul; print(ul.unquote_plus(sys.stdin.read()))'";
-      urlencode = "python3 -c 'import sys, urllib.parse as ul; print(ul.quote_plus(sys.stdin.read()))'";
-    };
-  };
-}

home/base/server/shells/default.nix

@@ -0,0 +1,25 @@
+let
+  shellAliases = {
+    k = "kubectl";
+
+    urldecode = "python3 -c 'import sys, urllib.parse as ul; print(ul.unquote_plus(sys.stdin.read()))'";
+    urlencode = "python3 -c 'import sys, urllib.parse as ul; print(ul.quote_plus(sys.stdin.read()))'";
+  };
+in {
+  # only works in bash/zsh, not nushell
+  home.shellAliases = shellAliases;
+
+  programs.nushell = {
+    enable = true;
+    configFile.source = ./config.nu;
+    shellAliases = shellAliases;
+  };
+
+  programs.bash = {
+    enable = true;
+    enableCompletion = true;
+    bashrcExtra = ''
+      export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
+    '';
+  };
+}

home/darwin/default.nix

@@ -3,9 +3,9 @@
     ../base/desktop
 
     ./proxychains
-
     ./core.nix
     ./rime-squirrel.nix
+    ./shell.nix
   ];
 
   # Home Manager needs a bit of information about you and the

home/darwin/shell.nix

@@ -0,0 +1,10 @@
+_: {
+  # add homebrew into PATH
+
+  programs.bash.bashrcExtra = ''
+    export PATH="/opt/homebrew/bin:$PATH"
+  '';
+  programs.zsh.envExtra = ''
+    export PATH="/opt/homebrew/bin:$PATH"
+  '';
+}