diff options
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | modules/nixos/traits/containers.nix | 32 | ||||
| -rw-r--r-- | modules/nixos/traits/nvidia.nix | 4 |
3 files changed, 20 insertions, 28 deletions
@@ -339,11 +339,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728897630, - "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", + "lastModified": 1729164558, + "narHash": "sha256-dgla/HMyeUIbs0Qtd9DLB4BKFNz+Z8rUO0pbaW5ie2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9f0b4a395289ce18727e2a8e43cae6796693ccc", + "rev": "8bddc04f2eecdadeb2a7ab3674bdafc27b933f76", "type": "github" }, "original": { @@ -355,11 +355,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1729044727, + "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", "type": "github" }, "original": { diff --git a/modules/nixos/traits/containers.nix b/modules/nixos/traits/containers.nix index 407ee51..b684803 100644 --- a/modules/nixos/traits/containers.nix +++ b/modules/nixos/traits/containers.nix @@ -10,29 +10,17 @@ in { options.traits.containers = { enable = lib.mkEnableOption "support for containers"; - enableNvidia = lib.mkEnableOption "the use of nvidia-container-toolkit" // { - default = lib.elem "nvidia" config.services.xserver.videoDrivers; - defaultText = lib.literalExpression '' - lib.elem "nvidia" config.services.xserver.videoDrivers - ''; - }; }; - config = lib.mkIf cfg.enable ( - lib.mkMerge [ - { - virtualisation = { - podman = { - enable = true; - extraPackages = [ pkgs.podman-compose ]; - autoPrune.enable = true; - }; - - oci-containers.backend = "podman"; - }; - } + config = lib.mkIf cfg.enable { + virtualisation = { + podman = { + enable = true; + extraPackages = [ pkgs.podman-compose ]; + autoPrune.enable = true; + }; - (lib.mkIf cfg.enableNvidia { hardware.nvidia-container-toolkit.enable = true; }) - ] - ); + oci-containers.backend = "podman"; + }; + }; } diff --git a/modules/nixos/traits/nvidia.nix b/modules/nixos/traits/nvidia.nix index dab26c8..bd57108 100644 --- a/modules/nixos/traits/nvidia.nix +++ b/modules/nixos/traits/nvidia.nix @@ -50,6 +50,10 @@ in }; }; }) + + (lib.mkIf config.traits.containers.enable { + hardware.nvidia-container-toolkit.enable = true; + }) ] ); } |