From 059e1bba3821b1aed05615012606ca7dfb6de17f Mon Sep 17 00:00:00 2001
From: Collin J. Doering
Date: Thu, 21 Mar 2024 18:17:35 -0400
Subject: balg02: Minor adjustment and reformatting

* .guix/guix-na/config/balg02.scm: Move swap-devices to be after file-systems (file-systems
is referenced from within swap-devices). Other changes are just noop reformatting.
---
 .guix/guix-na/config/balg02.scm | 51 +++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/.guix/guix-na/config/balg02.scm b/.guix/guix-na/config/balg02.scm
index 2c5c356..e41333a 100644
--- a/.guix/guix-na/config/balg02.scm
+++ b/.guix/guix-na/config/balg02.scm
@@ -46,12 +46,6 @@
                 (serial-speed 115200)
                 (targets '("/dev/sda"))))
 
-   (swap-devices
-    (list (swap-space
-           (target "/swap/swapfile")
-           (dependencies (filter (file-system-mount-point-predicate "/swap")
-                                 file-systems)))))
-
    (file-systems (append
                   (list (file-system
                          (device (file-system-label "root"))
@@ -65,6 +59,12 @@
                          (options "subvol=@swap")))
                   %base-file-systems))
 
+   (swap-devices
+    (list (swap-space
+           (target "/swap/swapfile")
+           (dependencies (filter (file-system-mount-point-predicate "/swap")
+                                 file-systems)))))
+
    (users (cons* (user-account
                   (name %automation-user)
                   (comment "Automation User")
@@ -96,23 +96,24 @@
 
    (services
     (append
-     (list (service openssh-service-type
-		    (openssh-configuration
-		     (password-authentication? #f)
-		     (authorized-keys
-		      `(("auto" ,(local-file "../../../.pubkeys/deploy-key.pub"))
-                        ("collin" ,(local-file "../../../.pubkeys/collin.pub"))
-		        ("root" ,(local-file "../../../.pubkeys/collin.pub"))))))
-           (service static-networking-service-type
-                    (list (static-networking
-                           (addresses
-                            (list (network-address
-                                   (device "eno8303")
-                                   (value "216.37.76.55/24"))))
-                           (routes
-                            (list (network-route
-                                   (destination "default")
-                                   (gateway "216.37.76.1"))))
-                           (name-servers '("216.37.64.2" "216.37.64.3")))))
-           (service ntp-service-type))
+     (list
+      (service openssh-service-type
+	       (openssh-configuration
+		(password-authentication? #f)
+		(authorized-keys
+		 `(("auto" ,(local-file "../../../.pubkeys/deploy-key.pub"))
+                   ("collin" ,(local-file "../../../.pubkeys/collin.pub"))
+		   ("root" ,(local-file "../../../.pubkeys/collin.pub"))))))
+      (service static-networking-service-type
+               (list (static-networking
+                      (addresses
+                       (list (network-address
+                              (device "eno8303")
+                              (value "216.37.76.55/24"))))
+                      (routes
+                       (list (network-route
+                              (destination "default")
+                              (gateway "216.37.76.1"))))
+                      (name-servers '("216.37.64.2" "216.37.64.3")))))
+      (service ntp-service-type))
      %base-services))))
-- 
cgit v1.2.3