System Gen182 @ 2025-05-02-23:48:15 by jonas@comfy-station

modules/desktop/dm/default.nix

@@ -3,12 +3,12 @@
   lib,
   ...
 }: let
-  cfg = config.desktop.dm;
+  cfg = config.hive.displayManager;
 in {
-  options.desktop.dm = with lib; {
+  options.hive.displayManager = with lib; {
     name = mkOption {
-      type = types.nullOr (types.enum ["sddm" "gdm"]);
-      default = null;
+      type = types.enum ["sddm" "gdm" "cosmic"];
+      default = "sddm";
       description = "The display manager to use.";
     };
     autologin = mkOption {
@@ -16,11 +16,6 @@ in {
       default = null;
       description = "The autologin username or null for no autologin.";
     };
-    wayland = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable wayland";
-    };
   };
 
   imports = [

modules/desktop/dm/gdm.nix

@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  cfg = config.desktop.dm;
+  cfg = config.hive.displayManager;
 in {
   config = lib.mkIf (cfg.name == "gdm") {
     services.xserver.displayManager.gdm = {

modules/desktop/dm/sddm.nix

@@ -4,21 +4,16 @@
   pkgs,
   ...
 }: let
-  cfg = config.desktop.dm;
+  cfg = config.hive.displayManager;
 in {
   config = lib.mkIf (cfg.name == "sddm") {
     services.displayManager.sddm = {
       enable = true;
-      wayland.enable = cfg.wayland;
+      wayland.enable = true;
     };
     environment.systemPackages = with pkgs; [
       kdePackages.kwallet
       kdePackages.kwalletmanager
     ];
-    security.pam.services.jonas.kwallet = {
-      enable = true;
-      forceRun = true;
-      package = pkgs.kdePackages.kwallet-pam;
-    };
   };
 }