From 8811b7c3470136a74b81df092ebd8011ecb38445 Mon Sep 17 00:00:00 2001
From: YouSiki <You.Siki@outlook.com>
Date: Fri, 16 Feb 2024 17:40:15 +0800
Subject: [PATCH] Update shell.nix and default.nix files

---
 src/homeProfiles/shell.nix              | 16 +++++++++++++---
 src/nixosConfigurations/yui/default.nix |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/homeProfiles/shell.nix b/src/homeProfiles/shell.nix
index 7653e71..aa213b7 100644
--- a/src/homeProfiles/shell.nix
+++ b/src/homeProfiles/shell.nix
@@ -10,9 +10,6 @@ with builtins // lib; {
     globals.outputs.homeProfiles.catppuccin
   ];
 
-  catppuccin.enable = true;
-  catppuccin.flavor = "mocha";
-
   programs = {
     # bash
     bash = {
@@ -178,14 +175,27 @@ with builtins // lib; {
           "history"
           "python"
           "rust"
+          "shell-proxy"
           "thefuck"
+          "zoxide"
           "zsh-interactive-cd"
         ];
       };
       initExtra = ''
         bindkey "\e[1;3D" backward-word # ⌥←
         bindkey "\e[1;3C" forward-word # ⌥→
+
+        if [[ -f ~/.orbstack/shell/init.zsh ]]; then
+          source ~/.orbstack/shell/init.zsh 2>/dev/null || :
+        fi
       '';
+      sessionVariables = {
+        SHELLPROXY_URL =
+          if hasSuffix "-darwin" pkgs.system
+          then "http://127.0.0.1:6152" # Surge
+          else "http://127.0.0.1:7890"; # Clash
+        SHELLPROXY_NO_PROXY = "localhost,127.0.0.1,pku.edu.cn,yousiki.top,ybh1998.space";
+      };
     };
   };
 
diff --git a/src/nixosConfigurations/yui/default.nix b/src/nixosConfigurations/yui/default.nix
index a67ef21..69e3254 100644
--- a/src/nixosConfigurations/yui/default.nix
+++ b/src/nixosConfigurations/yui/default.nix
@@ -23,6 +23,7 @@
           imports = with homeProfiles; [
             base
             lang.complete
+            shell
           ];
         };
       };