Update

Author: raba-jp

.github/mergify.yml

@@ -10,7 +10,7 @@ pull_request_rules:
     actions:
       queue:
         name: default
-        method: merge
+        merge_method: squash
         update_method: merge
   - name: Automatic update
     conditions:
@@ -21,5 +21,5 @@ pull_request_rules:
 
 queue_rules:
   - name: default
-    conditions:
-      - "check-success=build"
+    merge_conditions:
+      - "check-success=build"

darwin/common/global/default.nix darwin/common/default.nix

@@ -23,7 +23,7 @@
       "the-unarchiver"
       "visual-studio-code"
       "raycast"
-      "wezterm-nightly"
+      "wezterm@nightly"
       "zoom"
       "macfuse"
       "obsidian"

darwin/common/global/defaults.nix darwin/common/defaults.nix

@@ -13,7 +13,7 @@
       trusted-public-keys = outputs.nixConfig.extra-trusted-public-keys;
 
       experimental-features = ["nix-command" "flakes" "repl-flake"];
-      auto-optimise-store = lib.mkDefault true;
+      auto-optimise-store = false;
       warn-dirty = false;
     };
 

darwin/common/global/home-manager.nix darwin/common/home-manager.nix

@@ -1,9 +1,18 @@
-{...}: {
+{...}: let
+    hostName = "BVA769AW6V";
+in {
   imports = [
-    ../../common/global
-    ../../common/users/sakuraba.nix
+    ../../common
   ];
 
-  nix.settings.auto-optimise-store = false;
-  networking.hostName = "BVA769AW6V";
+  networking.hostName = hostName;
+
+  users.users.sakuraba.name = "sakuraba";
+  users.users.sakuraba.home = "/Users/sakuraba";
+  home-manager.users.sakuraba = {
+  imports = [
+  ../../../home/profiles/desktop
+  ];
+    home.stateVersion = "24.11";
+  };
 }

darwin/common/global/homebrew.nix darwin/common/homebrew.nix

@@ -1,9 +1,18 @@
-{...}: {
+{...}: let
+    hostName = "QN63HFT2NY";
+in {
   imports = [
-    ../../common/global
-    ../../common/users/sakuraba.nix
+    ../../common
   ];
 
-  nix.settings.auto-optimise-store = false;
-  networking.hostName = "QN63HFT2NY";
+  networking.hostName = hostName;
+
+  users.users.sakuraba.name = "sakuraba";
+  users.users.sakuraba.home = "/Users/sakuraba";
+  home-manager.users.sakuraba = {
+  imports = [
+  ../../../home/profiles/desktop
+  ];
+    home.stateVersion = "24.11";
+  };
 }

darwin/common/global/nix.nix darwin/common/nix.nix

@@ -68,7 +68,7 @@
             extraSpecialArgs = {
               inherit inputs outputs;
             };
-            modules = [./home/users/sakuraba/home.nix];
+            modules = [./home/hosts/standalone.nix];
           };
       };
     })

darwin/common/global/nixpkgs.nix darwin/common/nixpkgs.nix

@@ -0,0 +1,8 @@
+{
+imports = [
+    ../../profiles/minimal
+];
+
+home.stateVersion = "24.11";
+manual.manpages.enable = false;
+}

darwin/common/users/sakuraba.nix

@@ -0,0 +1,8 @@
+{
+imports =[
+../minimal
+
+./zed
+./wezterm
+];
+}