update: change mkHost field name

hosts/arcadia/default.nix

@@ -8,8 +8,8 @@ mkHost {
   users = [
     {
       username = "hare";
-      homeModule = [ ./hare/home-manager.nix ];
+      home = ./hare/home-manager.nix;
-      userNixos = ./hare/nixos.nix;
+      nixos = ./hare/nixos.nix;
     }
   ];
   systemModules = [ ./nixos.nix ];

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 = {

hosts/fungus/default.nix

@@ -8,8 +8,8 @@ mkHost {
   users = [
     {
       username = "hare";
-      homeModule = [ ./hare/home-manager.nix ];
+      home = ./hare/home-manager.nix;
-      userNixos = ./hare/nixos.nix;
+      nixos = ./hare/nixos.nix;
     }
   ];
   systemModules = [ ./nixos.nix ];

hosts/mkHost.nix

@@ -16,8 +16,8 @@ in
     modules =
       systemModules
       ++ (map (u: { pkgs, ... }: {
-        users.users.${u.username} = import u.userNixos { inherit pkgs; };
+        users.users.${u.username} = import u.nixos { inherit pkgs; };
-      }) (builtins.filter (u: u ? userNixos) users))
+      }) (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);
 }

hosts/x1carbon/default.nix

@@ -8,8 +8,8 @@ mkHost {
   users = [
     {
       username = "hare";
-      homeModule = [ ./hare/home-manager.nix ];
+      home = ./hare/home-manager.nix;
-      userNixos = ./hare/nixos.nix;
+      nixos = ./hare/nixos.nix;
     }
   ];
   systemModules = [ ./nixos.nix ];