update: change mkHost field name

This commit is contained in:
Keisuke Hirata 2026-02-28 22:23:37 +09:00
parent 18cba8e35f
commit 61fb43ab75
5 changed files with 11 additions and 16 deletions

View File

@ -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 ];

View File

@ -53,15 +53,9 @@
unityhub
nixd
rust-analyzer
beeper
# aseprite
aseprite
bambu-studio
orca-slicer
vinegar
antigravity
davinci-resolve
];
services.easyeffects = {

View File

@ -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 ];

View File

@ -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);
}

View File

@ -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 ];