From 7f25694251b0385ca1779b2392608eb30f1d270d Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@araneo.si>
Date: Wed, 16 Aug 2023 14:25:40 +0200
Subject: [PATCH] hosts/kirsty: update services

Switch to seatd & greetd. Switch to chrony. Drop custom swaylock service.
---
 hosts/kirsty/system.scm | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/hosts/kirsty/system.scm b/hosts/kirsty/system.scm
index 443a37e..f8eae5d 100644
--- a/hosts/kirsty/system.scm
+++ b/hosts/kirsty/system.scm
@@ -11,11 +11,12 @@
   #:use-module (gnu services security-token)
   #:use-module (gnu services sound)
   #:use-module (gnu services virtualization)
+  #:use-module (gnu services xorg)
   #:use-module (gnu system locale)
   #:use-module (gnu system setuid)
   #:use-module (nongnu packages linux)
   #:use-module (nongnu system linux-initrd)
-  #:use-module (services swaylock))
+  #:use-module (config base))
 
 (define host-dir (dirname (module-filename (current-module))))
 
@@ -66,7 +67,7 @@
      (name "timotej")
      (comment "Timotej Lazar")
      (group "users")
-     (supplementary-groups '("cdrom" "kvm" "netdev" "wheel"))
+     (supplementary-groups '("audio" "cdrom" "dialout" "kvm" "netdev" "seat" "wheel"))
      (home-directory "/home/timotej"))
     %base-user-accounts))
 
@@ -78,28 +79,51 @@
     (extra-special-file "/usr/bin/env" (file-append coreutils "/bin/env"))
     (extra-special-file "/bin/bash" (file-append bash "/bin/bash"))
 
+    (service seatd-service-type)
+    (service greetd-service-type
+             (greetd-configuration
+              (greeter-supplementary-groups '("input" "video"))
+              (terminals
+               (map (lambda (tty)
+                      (greetd-terminal-configuration
+                       (terminal-vt tty)
+                       (terminal-switch #t)))
+                    '("1" "2" "3" "4" "5" "6")))))
+
     ;; Networking.
     (service network-manager-service-type)
     (service wpa-supplicant-service-type)
     (service modem-manager-service-type)
     (service usb-modeswitch-service-type)
-    (service openntpd-service-type
-             (openntpd-configuration (servers '("pool.ntp.org"))))
-    (service tor-service-type)
+    (service tor-service-type
+             (tor-configuration
+              (config-file (plain-file "torrc" "SocksPort 127.0.0.1:9050 IsolateDestAddr"))))
 
     ;; Desktop.
-    (service elogind-service-type)
     (service udisks-service-type)
     (service upower-service-type)
     (service alsa-service-type)
     (service pcscd-service-type)
-    (service swaylock-service-type)
+
+    (service screen-locker-service-type
+             (screen-locker-configuration
+              (name "swaylock")
+              (program (file-append swaylock "/bin/swaylock"))
+              (using-pam? #t)
+              (using-setuid? #f)))
 
     (service qemu-binfmt-service-type
              (qemu-binfmt-configuration
               (platforms (lookup-qemu-platforms "arm" "aarch64" "mips64el" "x86"))))
 
-    (modify-services %base-services
+    (modify-services (base-services)
+      (delete login-service-type)
+      (delete mingetty-service-type)
+      (delete mingetty-service-type)
+      (delete mingetty-service-type)
+      (delete mingetty-service-type)
+      (delete mingetty-service-type)
+      (delete mingetty-service-type)
       ;; Don’t use up all CPU (and RAM) when compiling.
       (guix-service-type config =>
                          (guix-configuration