diff --git a/hosts/base/default.nix b/hosts/base/default.nix index 700cb9f..7e14c42 100644 --- a/hosts/base/default.nix +++ b/hosts/base/default.nix @@ -101,7 +101,6 @@ enable = true; flake = "/etc/nixos"; }; - virt-manager.enable = true; }; services = { @@ -146,9 +145,6 @@ pkgs.hplip ]; }; - libvirtd = { - enable = true; - }; }; networking = { diff --git a/hosts/lenar/default.nix b/hosts/lenar/default.nix index 027eb9e..f78b9fe 100644 --- a/hosts/lenar/default.nix +++ b/hosts/lenar/default.nix @@ -85,6 +85,7 @@ }; waydroid.enable = true; podman.enable = true; + libvirtd.enable = true; de.gnome = { enable = true; }; diff --git a/nixosModules/dev/containers.nix b/nixosModules/dev/containers.nix index 368f348..aa14cb7 100644 --- a/nixosModules/dev/containers.nix +++ b/nixosModules/dev/containers.nix @@ -25,7 +25,10 @@ let enable = lib.mkEnableOption "Whether to enable Podman."; }; waydroid-cfg = { - enable = lib.mkEnableOption "Whence to enable Waydroid."; + enable = lib.mkEnableOption "Whether to enable Waydroid."; + }; + libvirtd-cfg = { + enable = lib.mkEnableOption "Whether to enable libvirtd."; }; in { @@ -33,6 +36,7 @@ in docker = docker-cfg; podman = podman-cfg; waydroid = waydroid-cfg; + libvirtd = libvirtd-cfg; }; config = { @@ -58,6 +62,12 @@ in virtualisation.waydroid.enable = cfg.waydroid.enable; + virtualisation.libvirtd = lib.mkIf cfg.libvirtd.enable { + enable = true; + }; + + programs.virt-manager.enable = cfg.libvirtd.enable; + users.users.krop = lib.mkIf (cfg.docker.addUserToGroup && cfg.docker.enable) { extraGroups = [ "docker" ]; };