diff --git a/home/default.nix b/home/default.nix
index 1af7a46..5f94fd6 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -23,7 +23,6 @@
     stateVersion = "24.11";
   };
 
-  # ── User-level packages ────────────────────────────
   home.packages = with pkgs; [
     # Modern CLI replacements
     dust # du
@@ -56,6 +55,5 @@
     pandoc
   ];
 
-  # XDG directories
   xdg.enable = true;
 }
diff --git a/home/dev/git.nix b/home/dev/git.nix
index 1ea0a4e..044ad0d 100644
--- a/home/dev/git.nix
+++ b/home/dev/git.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 
 {
   programs.git = {
@@ -34,9 +34,7 @@
         nerdFontsVersion = "3";
         showBottomLine = false;
       };
-      git.pagers = [
-        { pager = "delta --paging=never"; }
-      ];
+      git.paging.pager = "delta --paging=never";
       update.method = "never";
       disableStartupPopups = true;
     };
diff --git a/home/dev/neovim.nix b/home/dev/neovim.nix
index 3ca1bac..eebdbd7 100644
--- a/home/dev/neovim.nix
+++ b/home/dev/neovim.nix
@@ -1,4 +1,4 @@
-{ ... }:
+_:
 
 {
   # Disable catppuccin/nix neovim integration — LazyVim manages its own colorscheme
diff --git a/home/shell/fish.nix b/home/shell/fish.nix
index 9743bba..ab3960e 100644
--- a/home/shell/fish.nix
+++ b/home/shell/fish.nix
@@ -28,18 +28,13 @@ in
       ll = "eza -lh";
       lla = "eza -lah --time-style=long-iso";
 
-      # Tools
       cat = "bat --paging=never";
       rm = "gomi";
       lg = "lazygit";
-      vi = "nvim";
     };
 
     interactiveShellInit = ''
-      # No greeting
       set -g fish_greeting
-
-      # PATH
       fish_add_path $HOME/go/bin $HOME/.bun/bin
 
       # Sudo: double Escape to prepend sudo
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index fa15618..db254ac 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -6,10 +6,8 @@
 }:
 
 {
-  # ── Primary user (required by nix-darwin) ──────────
   system.primaryUser = username;
 
-  # ── User ───────────────────────────────────────────
   users.knownUsers = [ username ];
   users.users.${username} = {
     home = "/Users/${username}";
@@ -32,10 +30,7 @@
       wvous-bl-corner = 1;
       wvous-br-corner = 1;
     };
-    finder = {
-      AppleShowAllExtensions = true;
-      FXPreferredViewStyle = "clmv";
-    };
+    finder.FXPreferredViewStyle = "clmv";
     NSGlobalDomain = {
       AppleShowAllExtensions = true;
       InitialKeyRepeat = 15;
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 9762448..29b8e64 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -10,21 +10,18 @@
     ./docker.nix
   ];
 
-  # ── System-essential packages ──────────────────────
   environment.systemPackages = with pkgs; [
     curl
     git
     ghostty.terminfo
   ];
 
-  # ── Locale / Timezone ──────────────────────────────
   i18n = {
     defaultLocale = "en_US.UTF-8";
     supportedLocales = [ "en_US.UTF-8/UTF-8" ];
   };
   time.timeZone = "Asia/Shanghai";
 
-  # ── Default user ───────────────────────────────────
   users.users.${username} = {
     isNormalUser = true;
     shell = pkgs.fish;
@@ -32,6 +29,5 @@
     openssh.authorizedKeys.keys = sshKeys;
   };
 
-  # ── sudo ───────────────────────────────────────────
   security.sudo.wheelNeedsPassword = false;
 }