diff --git a/home/dev/git.nix b/home/dev/git.nix
index be0189c..a71c7c0 100644
--- a/home/dev/git.nix
+++ b/home/dev/git.nix
@@ -3,6 +3,7 @@
 {
   programs.git = {
     enable = true;
+    signing.format = null;
     settings = {
       user = {
         name = "imbytecat";
@@ -48,6 +49,7 @@
 
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
     matchBlocks."*" = {
       identityFile = "~/.ssh/id_ed25519";
       addKeysToAgent = "yes";
diff --git a/home/theme.nix b/home/theme.nix
index 663845e..1d85c11 100644
--- a/home/theme.nix
+++ b/home/theme.nix
@@ -4,6 +4,6 @@
   catppuccin = {
     enable = true;
     flavor = "mocha";
-    # Automatically themes: bat, btop, delta, fish, fzf, lazygit, starship, tmux, etc.
+    nvim.enable = false; # catppuccin-nvim require check broken in nixpkgs
   };
 }
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index a787ced..4c72eaa 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -63,7 +63,7 @@
       "dbeaver-community"
       "discord"
       "feishu"
-      "fl-clash"
+      "goooler/repo/fl-clash"
       "ghostty"
       "keka"
       "logitech-g-hub"
diff --git a/modules/shared/nix.nix b/modules/shared/nix.nix
index 4000e04..cefb94c 100644
--- a/modules/shared/nix.nix
+++ b/modules/shared/nix.nix
@@ -1,17 +1,15 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
 
 {
-  nix.settings = {
+  # Determinate Nix manages the daemon on macOS
+  nix.enable = !pkgs.stdenv.isDarwin;
+
+  nix.settings = lib.mkIf (!pkgs.stdenv.isDarwin) {
     experimental-features = [
       "nix-command"
       "flakes"
     ];
     warn-dirty = false;
-    # 国内镜像（按需取消注释）
-    # substituters = [
-    #   "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
-    #   "https://cache.nixos.org"
-    # ];
   };
 
   nixpkgs = {
diff --git a/overlays/default.nix b/overlays/default.nix
index 4ef4343..f547d93 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,5 +1,3 @@
 final: prev: {
-  # ── Custom overlays ──────────────────────────────────
-  # Override or extend nixpkgs packages here.
   comment-checker = final.callPackage ../pkgs/comment-checker { };
 }