From e0c007d9e47a4c8b352bc267d92a9029b37cea86 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Sun, 30 Jun 2024 23:47:35 +0530 Subject: [PATCH] skipper: move virtualisation related config --- hosts/skipper/default.nix | 2 +- hosts/skipper/virtualisation/default.nix | 3 +++ .../docker.nix} | 10 ---------- hosts/skipper/virtualisation/libvirtd.nix | 14 ++++++++++++++ 4 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 hosts/skipper/virtualisation/default.nix rename hosts/skipper/{virtualisation.nix => virtualisation/docker.nix} (79%) create mode 100644 hosts/skipper/virtualisation/libvirtd.nix diff --git a/hosts/skipper/default.nix b/hosts/skipper/default.nix index af60270..9e5b803 100644 --- a/hosts/skipper/default.nix +++ b/hosts/skipper/default.nix @@ -5,10 +5,10 @@ ./services ./network ./persistence + ./virtualisation ./plymouth.nix ./secureboot.nix ./security.nix - ./virtualisation.nix ]; console.useXkbConfig = true; diff --git a/hosts/skipper/virtualisation/default.nix b/hosts/skipper/virtualisation/default.nix new file mode 100644 index 0000000..65331c1 --- /dev/null +++ b/hosts/skipper/virtualisation/default.nix @@ -0,0 +1,3 @@ +_: { + imports = [ ./libvirtd.nix ./docker.nix ]; +} diff --git a/hosts/skipper/virtualisation.nix b/hosts/skipper/virtualisation/docker.nix similarity index 79% rename from hosts/skipper/virtualisation.nix rename to hosts/skipper/virtualisation/docker.nix index e3bbb46..0ea85c8 100644 --- a/hosts/skipper/virtualisation.nix +++ b/hosts/skipper/virtualisation/docker.nix @@ -25,15 +25,5 @@ }; storageDriver = "btrfs"; }; - libvirtd = { - enable = true; - qemu = { - package = pkgs.qemu_kvm; - ovmf = { - enable = true; - packages = [ pkgs.OVMFFull.fd ]; - }; - }; - }; }; } diff --git a/hosts/skipper/virtualisation/libvirtd.nix b/hosts/skipper/virtualisation/libvirtd.nix new file mode 100644 index 0000000..1b21c57 --- /dev/null +++ b/hosts/skipper/virtualisation/libvirtd.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: { + virtualisation = { + libvirtd = { + enable = true; + qemu = { + package = pkgs.qemu_kvm; + ovmf = { + enable = true; + packages = [ pkgs.OVMFFull.fd ]; + }; + }; + }; + }; +}