From 7fbc6f180e4554d7d85e06b1bb8d681fc28d955c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20R=C3=B6ger?= <jonas.roeger@tu-dortmund.de>
Date: Sun, 29 Mar 2026 17:54:43 +0200
Subject: [PATCH] System Gen229 @ 2026-03-29-17:54:43 by jonas@comfy-station

---
 hosts/comfy-station/configuration.nix |  3 ++-
 hosts/monolith/configuration.nix      |  1 +
 modules/desktop/hyprland.nix          | 36 ++++++++++++++++----------
 modules/desktop/kwallet.nix           |  3 ++-
 modules/desktop/sddm.nix              | 37 ---------------------------
 5 files changed, 28 insertions(+), 52 deletions(-)
 delete mode 100644 modules/desktop/sddm.nix

diff --git a/hosts/comfy-station/configuration.nix b/hosts/comfy-station/configuration.nix
index d77752d..17de184 100644
--- a/hosts/comfy-station/configuration.nix
+++ b/hosts/comfy-station/configuration.nix
@@ -29,7 +29,8 @@
 
   # hive modules
   hive.hyprland.enable = true;
-  hive.sddm.autologin = "jonas";
+  hive.hyprland.autologin = "jonas";
+  hive.kwallet.enable = true;
   hive.kwallet.forUsers = ["jonas"];
   hive.virt-manager.enable = true;
   hive.virt-manager.forUsers = ["jonas"];
diff --git a/hosts/monolith/configuration.nix b/hosts/monolith/configuration.nix
index e2ce277..9f43f1d 100644
--- a/hosts/monolith/configuration.nix
+++ b/hosts/monolith/configuration.nix
@@ -49,6 +49,7 @@
   ];
 
   # hive modules
+  hive.kwallet.enable = true;
   hive.kwallet.forUsers = ["jonas"];
   hive.virt-manager.enable = true;
   hive.virt-manager.forUsers = ["jonas"];
diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
index 9e1da02..bfb2166 100644
--- a/modules/desktop/hyprland.nix
+++ b/modules/desktop/hyprland.nix
@@ -1,4 +1,4 @@
-{self, ...}: {
+{
   flake.nixosModules.hyprland = {
     config,
     lib,
@@ -9,13 +9,30 @@
   in {
     options.hive.hyprland = with lib; {
       enable = mkEnableOption "Enable Hyprland Wayland compositor";
+      autologin = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "The autologin username or null for no autologin.";
+      };
     };
-    imports = [
-      self.nixosModules.sddm
-    ];
     config = lib.mkIf cfg.enable {
-      hive.sddm.enable = true;
-      hive.sddm.wayland = true;
+      services.displayManager = {
+        autoLogin.enable = cfg.autologin != null;
+        autoLogin.user = cfg.autologin;
+        sddm = {
+          enable = true;
+          wayland.enable = true;
+        };
+      };
+
+      programs.hyprland = {
+        enable = true;
+        withUWSM = true;
+        xwayland.enable = true;
+      };
+
+      services.libinput.enable = true;
+      services.dbus.enable = true;
 
       xdg.portal = {
         enable = true;
@@ -27,14 +44,7 @@
       };
 
       environment.systemPackages = with pkgs; [spaceFM];
-
       services.udisks2.enable = true;
-
-      programs.hyprland = {
-        enable = true;
-        withUWSM = true;
-        xwayland.enable = true;
-      };
       programs.hyprlock.enable = true;
       security.pam.services.hyprlock = {};
     };
diff --git a/modules/desktop/kwallet.nix b/modules/desktop/kwallet.nix
index c87edeb..5f8445c 100644
--- a/modules/desktop/kwallet.nix
+++ b/modules/desktop/kwallet.nix
@@ -8,6 +8,7 @@
     cfg = config.hive.kwallet;
   in {
     options.hive.kwallet = {
+      enable = lib.mkEnableOption "Enable kwallet integration with pam.";
       forUsers = lib.mkOption {
         type = lib.types.listOf lib.types.str;
         default = [];
@@ -17,7 +18,7 @@
       };
     };
 
-    config = {
+    config = lib.mkIf cfg.enable {
       environment.systemPackages = with pkgs.kdePackages; [
         kwallet
         kwalletmanager
diff --git a/modules/desktop/sddm.nix b/modules/desktop/sddm.nix
deleted file mode 100644
index 130e25c..0000000
--- a/modules/desktop/sddm.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  flake.nixosModules.sddm = {
-    config,
-    lib,
-    ...
-  }: let
-    cfg = config.hive.sddm;
-  in {
-    options.hive.sddm = with lib; {
-      enable = mkEnableOption "Enable SDDM display manager";
-      autologin = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = "The autologin username or null for no autologin.";
-      };
-      wayland = mkEnableOption "Enable Wayland session in SDDM";
-    };
-
-    config = lib.mkIf cfg.enable {
-      services.xserver.enable = true;
-      services.xserver = {
-        xkb.layout = "de";
-        xkb.variant = "";
-        xkb.options = "caps:ctrl_modifier";
-      };
-      services.displayManager.autoLogin.enable = cfg.autologin != null;
-      services.displayManager.autoLogin.user = cfg.autologin;
-
-      services.libinput.enable = true;
-      services.dbus.enable = true;
-      services.displayManager.sddm = {
-        enable = true;
-        wayland.enable = cfg.wayland;
-      };
-    };
-  };
-}