nixos/desktop: update to plasma 6

3 files changed, 37 insertions, 4 deletions

diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index 17392c4..6fbfd59 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -17,6 +17,7 @@ in {
     ./budgie
     ./gnome
     ./plasma
+    ./plasma5
   ];
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix
index df9fe38..d84e651 100644
--- a/modules/nixos/desktop/plasma/default.nix
+++ b/modules/nixos/desktop/plasma/default.nix
@@ -10,7 +10,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     environment = {
-      plasma5.excludePackages = with pkgs.libsForQt5; [
+      plasma6.excludePackages = with pkgs.libsForQt5; [
         khelpcenter
         plasma-browser-integration
         print-manager
@@ -18,10 +18,14 @@ in {
     };
 
     services.xserver = {
-      displayManager.sddm.enable = true;
-      desktopManager.plasma5 = {
+      displayManager.sddm = {
         enable = true;
-        useQtScaling = true;
+        wayland.enable = true;
+      };
+
+      desktopManager.plasma6 = {
+        enable = true;
+        enableQt5Integration = true;
       };
     };
   };
diff --git a/modules/nixos/desktop/plasma5/default.nix b/modules/nixos/desktop/plasma5/default.nix
new file mode 100644
index 0000000..be9edc8
--- /dev/null
+++ b/modules/nixos/desktop/plasma5/default.nix
@@ -0,0 +1,28 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.desktop.plasma5;
+in {
+  options.desktop.plasma5.enable = lib.mkEnableOption "Plasma 5 desktop";
+
+  config = lib.mkIf cfg.enable {
+    environment = {
+      plasma5.excludePackages = with pkgs.libsForQt5; [
+        khelpcenter
+        plasma-browser-integration
+        print-manager
+      ];
+    };
+
+    services.xserver = {
+      displayManager.sddm.enable = true;
+      desktopManager.plasma5 = {
+        enable = true;
+        useQtScaling = true;
+      };
+    };
+  };
+}