summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hosts/glados/default.nix7
-rw-r--r--modules/nixos/base/default.nix1
-rw-r--r--modules/nixos/features/virtualisation.nix (renamed from modules/nixos/base/virtualisation.nix)5
3 files changed, 8 insertions, 5 deletions
diff --git a/hosts/glados/default.nix b/hosts/glados/default.nix
index ba930d2..a2300f1 100644
--- a/hosts/glados/default.nix
+++ b/hosts/glados/default.nix
@@ -3,12 +3,15 @@ _: {
./boot.nix
./hardware-configuration.nix
../../modules/nixos/features/tailscale.nix
+ ../../modules/nixos/features/virtualisation.nix
];
getchoo = {
- base.virtualisation.enable = true;
desktop.gnome.enable = true;
- features.tailscale.enable = true;
+ features = {
+ tailscale.enable = true;
+ virtualisation.enable = true;
+ };
hardware = {
enable = true;
nvidia.enable = true;
diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
index e788ded..8c93d09 100644
--- a/modules/nixos/base/default.nix
+++ b/modules/nixos/base/default.nix
@@ -18,7 +18,6 @@ in {
./security.nix
./systemd.nix
./upgrade-diff.nix
- ./virtualisation.nix
];
config = mkIf cfg.enable {
diff --git a/modules/nixos/base/virtualisation.nix b/modules/nixos/features/virtualisation.nix
index 7654fbb..db17c8b 100644
--- a/modules/nixos/base/virtualisation.nix
+++ b/modules/nixos/features/virtualisation.nix
@@ -4,16 +4,17 @@
pkgs,
...
}: let
- cfg = config.getchoo.base.virtualisation;
+ cfg = config.getchoo.features.virtualisation;
inherit (lib) mkEnableOption mkIf;
in {
- options.getchoo.base.virtualisation.enable = mkEnableOption "enable podman";
+ options.getchoo.features.virtualisation.enable = mkEnableOption "enable podman";
config.virtualisation = mkIf cfg.enable {
podman = {
enable = true;
enableNvidia = true;
extraPackages = with pkgs; [podman-compose];
+ autoPrune.enable = true;
};
oci-containers.backend = "podman";
};