[darwin] 在 nix darwin 上跑通了

home/hosts/eris.nix

@@ -1,27 +1,25 @@
 { config, lib, pkgs, ... }:
 
 {
-  home.username = "origami";
   home.homeDirectory = "/home/origami";
 
-  programs.home-manager.enable = true;
-
   imports = [
-    ./modules/shell.nix
-    ./modules/desktop.nix
-    ./modules/shell-develop.nix
-    ./modules/vscode.nix
-    ./modules/gnome-dconf.nix
+    ../modules/common.nix
+    ../modules/shell.nix
+    ../modules/desktop.nix
+    ../modules/shell-develop.nix
+    ../modules/vscode.nix
+    ../modules/gnome-dconf.nix
   ];
 
-  nixpkgs.config.allowUnfreePredicate = _: true;
   home.packages = with pkgs;[
     # system call monitoring
     strace # system call monitoring
     ltrace # library call monitoring
     lsof # list open files
   ];
-  programs.nix-index.enable = true;
 
-  home.stateVersion = "23.11";
+  programs.fish.shellAliases = {
+    "flake-update" = "nixos-rebuild switch --use-remote-sudo --flake ${config.home.homeDirectory}/flakes#eris";
+  };
 }

home/hosts/hypnos.nix

@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.homeDirectory = "/Users/origami";
+
+  imports = [
+    ../modules/common.nix
+    ../modules/shell.nix
+    ../modules/shell-develop.nix
+    ../modules/vscode.nix
+  ];
+
+  programs.fish.shellAliases = {
+    "flake-update" = "home-manager switch --flake ${config.home.homeDirectory}/flakes#origami@hypnos";
+  };
+}

home/hosts/metis.nix

@@ -1,16 +1,11 @@
 { config, lib, pkgs, ... }:
 
 {
-  home.username = "origami";
   home.homeDirectory = "/home/origami";
 
-  programs.home-manager.enable = true;
-
   imports = [
-    ./modules/shell.nix
-    ./modules/shell-develop.nix
+    ../modules/common.nix
+    ../modules/shell.nix
+    ../modules/shell-develop.nix
   ];
-
-  nixpkgs.config.allowUnfreePredicate = _: true;
-  home.stateVersion = "23.11";
 }

home/modules/common.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+{
+  home.username = "origami";
+
+  programs.home-manager.enable = true;
+
+  programs.nix-index.enable = true;
+
+  home.stateVersion = "23.11";
+}

home/modules/shell-develop.nix

@@ -18,17 +18,19 @@
   programs.git = {
     enable = true;
     lfs.enable = true;
-    userName = "Origami404";
-    userEmail = "Origami404@foxmail.com";
-    extraConfig = {
-      user.signingKey = "5C7FCAFBC961E2E312B47FEC76447D4671CB3CC0";
+    settings = {
+      user = {
+        name = "Origami404";
+        email = "Origami404@foxmail.com";
+        signingKey = "5C7FCAFBC961E2E312B47FEC76447D4671CB3CC0";
+      };
       core.autocrlf = "input";
       push.autoSetupRemote = true;
       pull.rebase = true;
       init.defaultBranch = "main";
-    };
-    aliases = {
-      "l" = "log --date-order --graph --pretty=\"format:%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset\"";
+      aliases = {
+        "l" = "log --date-order --graph --pretty=\"format:%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset\"";
+      };
     };
   };
 }

home/modules/shell.nix

@@ -7,7 +7,7 @@
     bat # better cat on everything
     eza # better ls
     fzf # A command-line fuzzy finder
-    du-dust # better du
+    dust # better du
     duf # better df
     fd # better find
     btop # better top
@@ -60,7 +60,6 @@
       "cloc" = "scc";
       "cat" = "bat";
       "x" = "atool -x";
-      "flake-update" = "nixos-rebuild switch --use-remote-sudo --flake ${config.home.homeDirectory}/flakes#eris";
       "cl" = "clear";
     };
   };

home/modules/vscode.nix

@@ -2,6 +2,6 @@
 {
   programs.vscode = {
     enable = true;
-    package = pkgs.vscode.fhs;
+    package = if pkgs.stdenv.isLinux then pkgs.vscode.fhs else pkgs.vscode;
   };
 }