modules: support >= 24.05

2 files changed, 35 insertions, 44 deletions

diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix
index c8e2683..b6e06da 100644
--- a/modules/nixos/desktop/plasma/default.nix
+++ b/modules/nixos/desktop/plasma/default.nix
@@ -9,34 +9,31 @@
 in {
   options.desktop.plasma.enable = lib.mkEnableOption "Plasma desktop";
 
-  config = lib.mkIf cfg.enable (
-    # this is bad, i don't care
-    lib.optionalAttrs (lib.versionAtLeast lib.version "24.05pre-git") {
-      environment = {
-        plasma6.excludePackages = with pkgs.kdePackages; [
-          khelpcenter
-          plasma-browser-integration
-          print-manager
-        ];
+  config = lib.mkIf cfg.enable {
+    environment = {
+      plasma6.excludePackages = with pkgs.kdePackages; [
+        khelpcenter
+        plasma-browser-integration
+        print-manager
+      ];
 
-        sessionVariables = {
-          NIXOS_OZONE_WL = "1";
-        };
-
-        systemPackages = [
-          pkgs.haruna
-          inputs.krunner-nix.packages.${pkgs.system}.default
-        ];
+      sessionVariables = {
+        NIXOS_OZONE_WL = "1";
       };
 
-      services.xserver = {
-        displayManager.sddm = {
-          enable = true;
-          wayland.enable = true;
-        };
+      systemPackages = [
+        pkgs.haruna
+        inputs.krunner-nix.packages.${pkgs.system}.default
+      ];
+    };
 
-        desktopManager.plasma6.enable = true;
+    services = {
+      displayManager.sddm = {
+        enable = true;
+        wayland.enable = true;
       };
-    }
-  );
+
+      desktopManager.plasma6.enable = true;
+    };
+  };
 }
diff --git a/modules/nixos/traits/containers.nix b/modules/nixos/traits/containers.nix
index 10824eb..5170c34 100644
--- a/modules/nixos/traits/containers.nix
+++ b/modules/nixos/traits/containers.nix
@@ -6,35 +6,29 @@
   ...
 }: let
   cfg = config.traits.containers;
+  enableNvidia = lib.elem "nvidia" (config.services.xserver.videoDrivers or []);
 in {
   options.traits.containers = {
     enable = lib.mkEnableOption "containers support";
   };
 
-  config.virtualisation = lib.mkIf cfg.enable (
+  config = lib.mkIf cfg.enable (
     lib.mkMerge [
       {
-        podman = {
-          enable = true;
-          extraPackages = with pkgs; [podman-compose];
-          autoPrune.enable = true;
-        };
+        virtualisation = {
+          podman = {
+            enable = true;
+            extraPackages = with pkgs; [podman-compose];
+            autoPrune.enable = true;
+          };
 
-        oci-containers.backend = "podman";
+          oci-containers.backend = "podman";
+        };
       }
 
-      (let
-        enable = lib.mkDefault (
-          lib.elem "nvidia" (config.services.xserver.videoDrivers or [])
-        );
-      in
-        if (options.virtualisation.containers ? cdi)
-        then {
-          containers.cdi.dynamic.nvidia = {inherit enable;};
-        }
-        else {
-          podman.enableNvidia = enable;
-        })
+      (lib.mkIf enableNvidia {
+        hardware.nvidia-container-toolkit.enable = true;
+      })
     ]
   );
 }