From 61fb43ab7521941b89b5412a02212726f06179cd Mon Sep 17 00:00:00 2001
From: Hare <kei.hiracchi.0928@gmail.com>
Date: Sat, 28 Feb 2026 22:23:37 +0900
Subject: [PATCH] update: change mkHost field name

---
 hosts/arcadia/default.nix           | 4 ++--
 hosts/arcadia/hare/home-manager.nix | 8 +-------
 hosts/fungus/default.nix            | 4 ++--
 hosts/mkHost.nix                    | 7 ++++---
 hosts/x1carbon/default.nix          | 4 ++--
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/hosts/arcadia/default.nix b/hosts/arcadia/default.nix
index dc271d6..f97c99b 100644
--- a/hosts/arcadia/default.nix
+++ b/hosts/arcadia/default.nix
@@ -8,8 +8,8 @@ mkHost {
   users = [
     {
       username = "hare";
-      homeModule = [ ./hare/home-manager.nix ];
-      userNixos = ./hare/nixos.nix;
+      home = ./hare/home-manager.nix;
+      nixos = ./hare/nixos.nix;
     }
   ];
   systemModules = [ ./nixos.nix ];
diff --git a/hosts/arcadia/hare/home-manager.nix b/hosts/arcadia/hare/home-manager.nix
index b906d1e..22d5224 100644
--- a/hosts/arcadia/hare/home-manager.nix
+++ b/hosts/arcadia/hare/home-manager.nix
@@ -53,15 +53,9 @@
     unityhub
     nixd
     rust-analyzer
-    beeper
-    # aseprite
+    aseprite
     bambu-studio
     orca-slicer
-
-    vinegar
-
-    antigravity
-
     davinci-resolve
   ];
   services.easyeffects = {
diff --git a/hosts/fungus/default.nix b/hosts/fungus/default.nix
index e426a10..e5990a5 100644
--- a/hosts/fungus/default.nix
+++ b/hosts/fungus/default.nix
@@ -8,8 +8,8 @@ mkHost {
   users = [
     {
       username = "hare";
-      homeModule = [ ./hare/home-manager.nix ];
-      userNixos = ./hare/nixos.nix;
+      home = ./hare/home-manager.nix;
+      nixos = ./hare/nixos.nix;
     }
   ];
   systemModules = [ ./nixos.nix ];
diff --git a/hosts/mkHost.nix b/hosts/mkHost.nix
index 9c9047a..f325f43 100644
--- a/hosts/mkHost.nix
+++ b/hosts/mkHost.nix
@@ -16,8 +16,8 @@ in
     modules =
       systemModules
       ++ (map (u: { pkgs, ... }: {
-        users.users.${u.username} = import u.userNixos { inherit pkgs; };
-      }) (builtins.filter (u: u ? userNixos) users))
+        users.users.${u.username} = import u.nixos { inherit pkgs; };
+      }) (builtins.filter (u: u ? nixos) users))
       ++ [
         {
           users.users = builtins.listToAttrs (map (u: {
@@ -56,7 +56,8 @@ in
           programs.home-manager.enable = true;
         }
         (import ../system/home-manager)
-      ] ++ u.homeModule;
+        u.home
+      ];
     };
   }) users);
 }
diff --git a/hosts/x1carbon/default.nix b/hosts/x1carbon/default.nix
index 408cc54..d3a2bc0 100644
--- a/hosts/x1carbon/default.nix
+++ b/hosts/x1carbon/default.nix
@@ -8,8 +8,8 @@ mkHost {
   users = [
     {
       username = "hare";
-      homeModule = [ ./hare/home-manager.nix ];
-      userNixos = ./hare/nixos.nix;
+      home = ./hare/home-manager.nix;
+      nixos = ./hare/nixos.nix;
     }
   ];
   systemModules = [ ./nixos.nix ];