From c4aacf02119f15138207eb54780903d976f169fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Tue, 23 Jul 2024 08:53:05 +0200
Subject: [PATCH] make kde and sway coexist

---
 config/desktop.nix |  3 ++-
 config/devterm.nix |  1 +
 config/kde.nix     |  8 ++++----
 config/sway.nix    | 15 +++++++++++++++
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 config/sway.nix

diff --git a/config/desktop.nix b/config/desktop.nix
index 6af40065..ad58502a 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -20,7 +20,8 @@ in {
       ./services/cups.nix
       ./services/docker.nix
       ./services/cifs.nix
-      #./kde.nix
+      ./kde.nix
+      ./sway.nix
     ]
     ++ (
       if system == "x86_64-linux"
diff --git a/config/devterm.nix b/config/devterm.nix
index c4783f0b..9ac232d3 100644
--- a/config/devterm.nix
+++ b/config/devterm.nix
@@ -93,4 +93,5 @@
     }
   ];
   hardware.enableRedistributableFirmware = true;
+  services.xserver.displayManager.defaultSession = lib.mkForce "sway";
 }
diff --git a/config/kde.nix b/config/kde.nix
index 04d9c399..22176e5b 100644
--- a/config/kde.nix
+++ b/config/kde.nix
@@ -3,9 +3,9 @@
   services.xserver = {
     displayManager.sddm.enable = true;
     displayManager.sddm.wayland.enable = true;
-    #desktopManager.plasma6.enable = true;
-    desktopManager.plasma5.enable = true;
-    #displayManager.defaultSession = "plasma";
-    displayManager.defaultSession = "plasmawayland";
+    desktopManager.plasma6.enable = true;
+    #desktopManager.plasma5.enable = true;
+    displayManager.defaultSession = "plasma";
+    #displayManager.defaultSession = "plasmawayland";
   };
 }
diff --git a/config/sway.nix b/config/sway.nix
new file mode 100644
index 00000000..24ac4aae
--- /dev/null
+++ b/config/sway.nix
@@ -0,0 +1,15 @@
+{
+  system,
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  programs.sway.enable = true;
+  programs.sway.package = config.home-manager.users.darkkirb.wayland.windowManager.sway.package;
+  security.pam.services.sddm.u2fAuth = true;
+  services.xserver = {
+    displayManager.sddm.enable = true;
+    displayManager.sddm.wayland.enable = true;
+  };
+}