diff --git a/modules/core/default.server.nix b/modules/core/default.server.nix index 850882f..118f8a3 100644 --- a/modules/core/default.server.nix +++ b/modules/core/default.server.nix @@ -1,13 +1,12 @@ { ... }: { imports = - [ (import ./hardware.nix) ] - ++ [ (import ./network.nix) ] - ++ [ (import ./program.nix) ] - ++ [ (import ./sshd.nix) ] - ++ [ (import ./security.nix) ] - ++ [ (import ./services.nix) ] - ++ [ (import ./system.nix) ] - ++ [ (import ./user.nix) ] - ++ [ (import ./virtualization.nix) ]; + [(import ./hardware.nix)] + ++ [(import ./network.nix)] + ++ [(import ./program.nix)] + ++ [(import ./sshd.nix)] + ++ [(import ./security.nix)] + ++ [(import ./services.nix)] + ++ [(import ./system.nix)] + ++ [(import ./user.nix)]; } diff --git a/modules/core/virtualization.nix b/modules/core/virtualization.nix index 601680b..94c40a7 100644 --- a/modules/core/virtualization.nix +++ b/modules/core/virtualization.nix @@ -12,8 +12,6 @@ libvirtd.enable = if (host == "violet") then true - else if (host == "dandelion") then - true else if (host == "sakura") then true else if (host == "yoshino") then @@ -38,7 +36,7 @@ # { }; users.groups.libvirtd.members = - if (config.virtualisation.libvirtd.enable == true) then [ username ] else [ ]; + if (config.virtualisation.waydroid.enable == true) then [ username ] else [ ]; # Enable qemu etc environment.systemPackages = with pkgs; [