From 5fc32bd6b937c76d1217a6120b3e90a802c596ee Mon Sep 17 00:00:00 2001 From: Thomas Syms Date: Thu, 15 Aug 2024 08:48:03 -0300 Subject: [PATCH] Updated docker-nvidia configuration --- hosts/Equinox/default.nix | 2 +- modules/containers-nvidia.nix | 7 ------- modules/containers.nix | 8 +++++++- 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 modules/containers-nvidia.nix diff --git a/hosts/Equinox/default.nix b/hosts/Equinox/default.nix index 794a370..fc642b4 100644 --- a/hosts/Equinox/default.nix +++ b/hosts/Equinox/default.nix @@ -19,7 +19,7 @@ in { # Import system configuration ../../modules/system.nix - ../../modules/containers-nvidia.nix + ../../modules/containers.nix ../../modules/virtualization.nix ../../modules/harden.nix ../../modules/hyprland.nix diff --git a/modules/containers-nvidia.nix b/modules/containers-nvidia.nix deleted file mode 100644 index b53a80e..0000000 --- a/modules/containers-nvidia.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - virtualisation.docker = { - enable = true; - storageDriver = "btrfs"; - enableNvidia = true; - }; -} diff --git a/modules/containers.nix b/modules/containers.nix index 2c11b90..f09796a 100644 --- a/modules/containers.nix +++ b/modules/containers.nix @@ -1,5 +1,11 @@ -{...}: { +{ + lib, + config, + ... +}: { virtualisation.docker = { enable = true; }; + + hardware.nvidia-container-toolkit.enable = lib.mkIf config.hardware.nvidia.modesetting.enable true; }