From d2aa3572c161fd6183b141aeb11ae863589a640d Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Mon, 23 Mar 2026 07:01:04 +0100
Subject: (deployment systems rakan): simplify definition of system

---
 deployment/systems/rakan.scm | 96 ++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 47 deletions(-)

(limited to 'deployment')

diff --git a/deployment/systems/rakan.scm b/deployment/systems/rakan.scm
index daf03eb..df972e6 100644
--- a/deployment/systems/rakan.scm
+++ b/deployment/systems/rakan.scm
@@ -175,54 +175,56 @@
         (list name-
               home-environment-*)))))
 
+(define guix-homes
+  (list name/home-environment-1000))
+
+(define guix-home-service
+  (sovereign:systems:guix-home-service guix-homes))
+
+(define offload-auth
+  (gnu:services:simple-service 'offload-authorizations
+                               gnu:services:base:guix-service-type
+                               guix-offload-authorizations))
+
+(define openssh-configuration
+  (gnu:services:ssh:openssh-configuration
+   (extra-content (string-append "\n"
+                                 "ClientAliveInterval 10\n"
+                                 "ClientAliveCountMax 10\n"))))
+
+(define openssh-service
+  (gnu:services:service gnu:services:ssh:openssh-service-type
+                        openssh-configuration))
+
 (define system
-  (let
-    ( (l-bootloader     (sovereign:devices:amd64:custom-bootloader-configuration system-name))
-      (l-file-systems   (cons* file-system-root
-                               file-system-efi
-                               gnu:system:file-systems:%base-file-systems))
-      (l-firmware       (list nongnu:packages:linux:linux-firmware))
-      (l-guix-homes     (list name/home-environment-1000))
-      (l-initrd-modules (cons* "mei_me"
-                               gnu:system:linux-initrd:%base-initrd-modules))
-      (l-offload-auth   (gnu:services:simple-service 'offload-authorizations
-                                                     gnu:services:base:guix-service-type
-                                                     guix-offload-authorizations))
-      (l-openssh        (gnu:services:service gnu:services:ssh:openssh-service-type
-                                              (gnu:services:ssh:openssh-configuration
-                                               (extra-content (string-append "\n"
-                                                                             "ClientAliveInterval 10\n"
-                                                                             "ClientAliveCountMax 10\n")))))
-      (l-swap-devices   (list swap))
-      (l-users          (cons* users:id1000:uid1000-account
-                               gnu:system:shadow:%base-user-accounts)))
-    (let*
-      ( (l-guix-home-service (sovereign:systems:guix-home-service l-guix-homes))
-        (l-services          (cons* l-guix-home-service
-                                    guix-publish-service
-                                    l-offload-auth
-                                    l-openssh
-                                    sovereign:packages:protonmail:nogui-profile
-                                    samba-service
-                                    sovereign:systems:%sovereign-services)))
-      (gnu:system:operating-system
-        (kernel             nongnu:packages:linux:linux)
-        (bootloader         l-bootloader)
-        (label              (sovereign:systems:operating-system-label* system-name
-                                                                       gnu:system:this-operating-system))
-        (keyboard-layout    sovereign:devices:pl-keyboard-layout)
-        (initrd             nongnu:system:linux-initrd:microcode-initrd)
-        (initrd-modules     l-initrd-modules)
-        (firmware           l-firmware)
-        (host-name          system-name)
-        (file-systems       l-file-systems)
-        (swap-devices       l-swap-devices)
-        (users              l-users)
-        (timezone           "Europe/Warsaw")
-        (locale             sovereign:systems:pl-locale)
-        (locale-definitions sovereign:systems:%sovereign-locale-definitions)
-        (services           l-services)
-        (sudoers-file       sovereign:systems:%sovereign-sudoers-specification)))))
+  (gnu:system:operating-system
+   (kernel             nongnu:packages:linux:linux)
+   (bootloader         (sovereign:devices:amd64:custom-bootloader-configuration system-name))
+   (label              (sovereign:systems:operating-system-label* system-name
+                                                                  gnu:system:this-operating-system))
+   (keyboard-layout    sovereign:devices:pl-keyboard-layout)
+   (initrd             nongnu:system:linux-initrd:microcode-initrd)
+   (initrd-modules     (cons* "mei_me"
+                              gnu:system:linux-initrd:%base-initrd-modules))
+   (firmware           (list nongnu:packages:linux:linux-firmware))
+   (host-name          system-name)
+   (file-systems       (cons* file-system-root
+                              file-system-efi
+                              gnu:system:file-systems:%base-file-systems))
+   (swap-devices       (list swap))
+   (users              (cons* users:id1000:uid1000-account
+                              gnu:system:shadow:%base-user-accounts))
+   (timezone           "Europe/Warsaw")
+   (locale             sovereign:systems:pl-locale)
+   (locale-definitions sovereign:systems:%sovereign-locale-definitions)
+   (services           (cons* guix-home-service
+                              guix-publish-service
+                              offload-auth
+                              openssh-service
+                              sovereign:packages:protonmail:nogui-profile
+                              samba-service
+                              sovereign:systems:%sovereign-services))
+   (sudoers-file       sovereign:systems:%sovereign-sudoers-specification)))
 
 (define-public operating-system*
   system)
-- 
cgit v1.3