From 0bc204d3f6c8424c8d6394f22eb385c94fcbf6ed Mon Sep 17 00:00:00 2001
From: Saku Laesvuori <saku@laesvuori.fi>
Date: Sun, 16 Aug 2026 08:18:17 +0300
Subject: [PATCH] Vaihda automaattikirjautuminen salasanattomaan

---
 modules/oms/systems.scm | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/modules/oms/systems.scm b/modules/oms/systems.scm
index 67d0ad6..8b24edc 100644
--- a/modules/oms/systems.scm
+++ b/modules/oms/systems.scm
@@ -12,6 +12,7 @@
   #:use-module (gnu services sysctl)
   #:use-module (gnu services vpn)
   #:use-module (gnu services xorg)
+  #:use-module (gnu system pam)
   #:use-module (guix gexp)
   #:use-module (nongnu packages linux)
   #:use-module (nongnu system linux-initrd)
@@ -37,8 +38,9 @@
                     (comment "Olarinmäen samoojat")
                     (group "users")
                     (home-directory "/home/oms")
-                    (supplementary-groups '("wheel" "netdev" "audio" "video")))
+                    (supplementary-groups '("wheel" "netdev" "audio" "video" "passwordlesslogin")))
                   %base-user-accounts))
+    (groups (cons (user-group (name "passwordlesslogin")) %base-groups))
     (services
      (append
       (list (service gnome-desktop-service-type)
@@ -57,6 +59,24 @@
                      (cups-configuration
                        (web-interface? #t)
                        (extensions (list cups-filters epson-inkjet-printer-escpr))))
+            (simple-service 'passwordless-gdm-login pam-root-service-type
+                            (list
+                             (pam-extension
+                               (transformer
+                                (lambda (service)
+                                  (if (equal? (pam-service-name service)
+                                               "gdm-password")
+                                    (pam-service
+                                      (inherit service)
+                                      (auth
+                                       (cons (pam-entry
+                                               (control "sufficient")
+                                               (module "pam_succeed_if.so")
+                                               (arguments
+                                                '("user" "ingroup"
+                                                  "passwordlesslogin")))
+                                             (pam-service-auth service))))
+                                    service))))))
             (set-xorg-configuration (xorg-configuration (keyboard-layout keyboard-layout))))
       (modify-services %desktop-services
         (guix-service-type config =>
@@ -69,12 +89,7 @@
             (authorized-keys
               (append (list (channel-file "keys/guix/nonguix.pub")
                             (channel-file "keys/guix/saku-laesvuori-x-kone.pub"))
-                      %default-authorized-guix-keys))))
-        (gdm-service-type config =>
-          (gdm-configuration
-            (inherit config)
-            (auto-login? #t)
-            (default-user "oms"))))))
+                      %default-authorized-guix-keys)))))))
     (bootloader (bootloader-configuration
                   (bootloader grub-efi-bootloader)
                   (targets (list "/boot/efi"))