Fixed plasma6; added kodi; added wluma; commented out printing; moved fingerprint shit

system/desktop/greetd.nix

@@ -2,14 +2,12 @@
   config,
   lib,
   ...
-}: let
-  cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland;
-in {
-  config = lib.mkIf cfg {
+}: {
+  config = lib.mkIf config.niksos.desktop.enable {
     # greetd display manager
     services.greetd = let
       session = {
-        command = "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
+        command = lib.mkDefault "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
         user = "jsw";
       };
     in {
@@ -22,6 +20,6 @@ in {
       };
     };
 
-    programs.uwsm.enable = true;
+    programs.uwsm.enable = lib.mkDefault true;
   };
 }

system/desktop/plasma6.nix

@@ -6,28 +6,24 @@
 }: let
   cfg = config.niksos.desktop.enable && config.niksos.desktop.kde;
 in {
-  config = lib.mkIf cfg {
+  specialisation.de.configuration = lib.mkIf cfg {
     niksos.desktop.hyprland = lib.mkForce false;
-    specialisation.de.configuration = {
-      services = {
-        greetd = let
-          session = {
-            command = "${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland";
-            user = "jsw";
-          };
-        in {
-          enable = true;
-          settings = {
-            terminal.vt = 1;
-            default_session = session;
-            initial_session = session;
-          };
+    services = {
+      greetd = let
+        session.command = "${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland";
+      in {
+        enable = true;
+        settings = {
+          terminal.vt = 1;
+          default_session = session;
+          initial_session = session;
         };
-
-        desktopManager.plasma6.enable = true;
       };
 
-      home-manager.users.jsw.stylix.autoEnable = false;
+      desktopManager.plasma6.enable = true;
     };
+    programs.uwsm.enable = false;
+
+    home-manager.users.jsw.stylix.autoEnable = false;
   };
 }

system/hardware/fingerprint.nix

@@ -11,10 +11,16 @@
 in {
   options.niksos.fingerprint = mkEnableOption "fingerprint support.";
   config = mkIf fingerprint {
-    services.fprintd.enable = true;
+    services = {
+      fprintd.enable = true;
+      logind.extraConfig = mkIf desktop.hyprland ''
+        # don’t shutdown when power button is short-pressed
+        HandlePowerKey=ignore
+      '';
+    };
 
     home-manager.users.jsw.wayland.windowManager.hyprland.settings = mkIf desktop.hyprland {
-      bind = mkIf fingerprint [
+      bind = [
         ", XF86PowerOff, exec, ${uwsm} app -- pgrep fprintd-verify && exit 0 || ${foot} -a 'foot-fprintd' sh -c 'fprintd-verify && systemctl sleep'"
       ];
       windowrule = [