From a23c3801cbe943211b014220a32c755f27d77de0 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 5 Dec 2020 15:37:44 +0100 Subject: [PATCH] Parameterise libvirt --- machines/nunotaba/configuration.nix | 2 +- machines/sayuri/configuration.nix | 2 +- modules/default.nix | 1 + modules/libvirt.nix | 8 ++++++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/machines/nunotaba/configuration.nix b/machines/nunotaba/configuration.nix index ae23a9a..6e9e3a1 100644 --- a/machines/nunotaba/configuration.nix +++ b/machines/nunotaba/configuration.nix @@ -6,7 +6,6 @@ ./hardware-configuration.nix ../../modules/cpu/intel.nix ../../modules/gpu/intel.nix - ../../modules/libvirt.nix ../../modules ../../profiles/dev.nix ../../users/simon @@ -14,6 +13,7 @@ sbruder = { gui = true; + libvirt.enable = true; restic.enable = true; ssd.enable = true; wireguard.home = { diff --git a/machines/sayuri/configuration.nix b/machines/sayuri/configuration.nix index 60ecd62..40acac4 100644 --- a/machines/sayuri/configuration.nix +++ b/machines/sayuri/configuration.nix @@ -6,7 +6,6 @@ ./hardware-configuration.nix ../../modules/cpu/intel.nix ../../modules/gpu/amd.nix - ../../modules/libvirt.nix ../../modules ../../profiles/dev.nix ../../users/simon @@ -14,6 +13,7 @@ sbruder = { gui = true; + libvirt.enable = true; restic.enable = true; ssd.enable = true; wireguard.home = { diff --git a/modules/default.nix b/modules/default.nix index 6678f5b..e80697c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -15,6 +15,7 @@ ./docker.nix ./fonts.nix ./grub.nix + ./libvirt.nix ./locales.nix ./media.nix ./network-manager.nix diff --git a/modules/libvirt.nix b/modules/libvirt.nix index b40cfff..d92a1e0 100644 --- a/modules/libvirt.nix +++ b/modules/libvirt.nix @@ -1,7 +1,11 @@ { config, lib, pkgs, ... }: { - virtualisation.libvirtd.enable = true; + options.sbruder.libvirt.enable = lib.mkEnableOption "libvirt"; - environment.systemPackages = lib.mkIf config.sbruder.gui [ pkgs.virt-manager ]; + config = { + virtualisation.libvirtd.enable = config.sbruder.libvirt.enable; + + environment.systemPackages = lib.mkIf config.sbruder.gui [ pkgs.virt-manager ]; + }; }