From 03e0bce6a35fb4a3d84584a5af74b3994baa4120 Mon Sep 17 00:00:00 2001
From: arielherself <arielherself@duck.com>
Date: Tue, 30 Jul 2024 22:14:41 +0800
Subject: [PATCH] use clash-verge instead of clash-verge-rev

---
 home-manager/home.nix   | 11 ++++++-----
 nixos/configuration.nix | 13 ++++++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 1210726..23f8784 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -124,11 +124,11 @@ in {
     pkgs.adwaita-qt
     pkgs.adwaita-qt6
 
-    # # It is sometimes useful to fine-tune packages, for example, by applying
-    # # overrides. You can do that directly here, just don't forget the
-    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
-    # # fonts?
-    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+    # My version of BerkeleyMono NF is incomplete. Should add some fallback fonts.
+    (pkgs.nerdfonts.override { fonts = [
+      "JetBrainsMono"
+      "FiraCode"
+    ]; })
 
     # # You can also create simple shell scripts directly inside your
     # # configuration. For example, this adds a command 'my-hello' to your
@@ -205,6 +205,7 @@ in {
     extraConfig = {
       commit.gpgsign = true;
       gpg.format = "ssh";
+      # This may not apply. Also try `git config --global gpg.ssh.program "/home/user/.nix-profile/bin/op-ssh-sign"`
       gpg."ssh".program = "${unstable._1password-gui}/bin/op-ssh-sign";
       push.autoSetupRemote = true;
       core.editor = "nvim";
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 45baec6..c3f6bf5 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -38,8 +38,8 @@ in {
     "8.8.8.8"
     "1.1.1.1"
   ];
-  networking.proxy.default = "http://127.0.0.1:7897/";
-  networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+  # networking.proxy.default = "http://127.0.0.1:7897/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   # Select internationalisation properties.
   # i18n.defaultLocale = "en_US.UTF-8";
@@ -176,7 +176,7 @@ in {
     neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     wget
     sqlite
-    clash-verge-rev
+    # clash-verge-rev
     bind
     pciutils
   ];
@@ -189,6 +189,13 @@ in {
     enableSSHSupport = true;
   };
 
+  # Clash
+  programs.clash-verge = {
+    enable = true;
+    autoStart = true;
+    tunMode = true;
+  };
+
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.