[desktops] desktops: respect flake config

billy4479 · Feb 18, 2025 · d85ebac · d85ebac
1 parent d94725d
commit d85ebac
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/system/hosts/computerone/default.nix b/system/hosts/computerone/default.nix
@@ -5,7 +5,6 @@
     ./xrandr.nix
     ../../modules/containers.nix
     ../../modules/virtualization.nix
-    ../../modules/desktops/qtile.nix
     ../../modules/graphics/nvidia.nix
 
     ../../modules/cifs-client.nix

diff --git a/user/computerone.nix b/user/computerone.nix
@@ -11,7 +11,7 @@
 
     ./modules/wallpapers.nix
 
-    ./modules/desktops/qtile
+    ./modules/desktops
     ./modules/qt.nix
   ];
 

diff --git a/user/modules/desktops/default.nix b/user/modules/desktops/default.nix
@@ -1,7 +1,19 @@
-desktop:
-if desktop == "kde" then
-  ./kde
-else if desktop == "qtile" then
-  ./qtile
-else
-  throw "desktop ${desktop} is not supported"
+{
+  extraConfig,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  imports =
+    (lib.trivial.throwIfNot (builtins.elem extraConfig.desktop [
+      "kde"
+      "qtile"
+    ]) "The desktop \"${extraConfig.desktop}\" is not supported" [ ])
+    ++ lib.optionals (extraConfig.desktop == "kde") [ ./kde ]
+    ++ lib.optionals (extraConfig.desktop == "qtile") [ ./qtile ];
+
+  home.packages =
+    with pkgs;
+    [ pavucontrol ] ++ (if (extraConfig.wayland) then [ wl-clipboard ] else [ xclip ]);
+}
diff --git a/user/nixbox.nix b/user/nixbox.nix
@@ -10,6 +10,6 @@
 
     ./modules/wallpapers.nix
 
-    ./modules/desktops/kde
+    ./modules/desktops
   ];
 }
diff --git a/user/portatilo.nix b/user/portatilo.nix
@@ -11,7 +11,7 @@
 
     ./modules/wallpapers.nix
 
-    ./modules/desktops/kde
+    ./modules/desktops
   ];
 
   programs.ssh = {