diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index baf0549..be65e29 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -22,7 +22,7 @@ in { }; }; - config.myConfig = lib.mkIf cfg.enable { + config = lib.mkIf cfg.enable { myConfig = { bootloader.enable = true; locale.enable = true; @@ -55,7 +55,7 @@ in { home-manager = { extraSpecialArgs = {inherit inputs;}; - users.${cfg.user} = import ./home.nix; + users.${cfg.user} = import ../../hosts/${cfg.network.hostName}/home.nix; }; }; } diff --git a/modules/nixos/network.nix b/modules/nixos/network.nix index ec8b4a3..636b34a 100644 --- a/modules/nixos/network.nix +++ b/modules/nixos/network.nix @@ -21,6 +21,6 @@ in { firewall.enable = false; }; - users.users.${cfg.user}.extraGroups = ["networkmanager"]; + users.users.${config.myConfig.user}.extraGroups = ["networkmanager"]; }; } diff --git a/modules/nixos/qemu.nix b/modules/nixos/qemu.nix index fe32c22..0db3b76 100644 --- a/modules/nixos/qemu.nix +++ b/modules/nixos/qemu.nix @@ -35,6 +35,6 @@ in { }; }; boot.binfmt.emulatedSystems = ["aarch64-linux"]; - users.users.${cfg.user}.extraGroups = ["libvirtd"]; + users.users.${config.myConfig.user}.extraGroups = ["libvirtd"]; }; }