Fix key definition for nonguix substitute

2024-05-08 08:00:50 +01:00 · 2024-05-08 08:00:50 +01:00 · 87468fa46b
parent 3f2b2f7f63
commit 87468fa46b
1 changed files with 59 additions and 59 deletions
--- a/system-configuration.scm
+++ b/system-configuration.scm
@ -16,66 +16,66 @@
 (operating-system
 (kernel linux)
 (firmware (list linux-firmware))
-  (locale "en_GB.utf8")
-  (timezone "Europe/London")
-  (keyboard-layout (keyboard-layout "gb"))
-  (host-name "Northstar")
+ (locale "en_GB.utf8")
+ (timezone "Europe/London")
+ (keyboard-layout (keyboard-layout "gb"))
+ (host-name "Northstar")

-  ;; The list of user accounts ('root' is implicit).
-  (users (cons* (user-account
-                  (name "pixelifytica")
-                  (comment "Evie Litherland-Smith")
-                  (group "users")
-                  (home-directory "/home/pixelifytica")
-                  (supplementary-groups '("wheel" "netdev" "audio" "video")))
-                %base-user-accounts))
+ ;; The list of user accounts ('root' is implicit).
+ (users (cons* (user-account
+                (name "pixelifytica")
+                (comment "Evie Litherland-Smith")
+                (group "users")
+                (home-directory "/home/pixelifytica")
+                (supplementary-groups '("wheel" "netdev" "audio" "video")))
+               %base-user-accounts))

-  ;; Packages installed system-wide.  Users can also install packages
-  ;; under their own account: use 'guix search KEYWORD' to search
-  ;; for packages and 'guix install PACKAGE' to install a package.
-  (packages (append (list (specification->package "sway")
-                          (specification->package "swaylock-effects")
-                          (specification->package "swaynotificationcenter")
-                          (specification->package "waybar")
-                          (specification->package "rofi")
-                          (specification->package "alacritty")
-                          (specification->package "zsh")
-                          )
-                    %base-packages))
+ ;; Packages installed system-wide.  Users can also install packages
+ ;; under their own account: use 'guix search KEYWORD' to search
+ ;; for packages and 'guix install PACKAGE' to install a package.
+ (packages (append (list (specification->package "sway")
+                         (specification->package "swaylock-effects")
+                         (specification->package "swaynotificationcenter")
+                         (specification->package "waybar")
+                         (specification->package "rofi")
+                         (specification->package "alacritty")
+                         (specification->package "zsh")
+                         )
+                   %base-packages))

-  ;; Below is the list of system services.  To search for available
-  ;; services, run 'guix system search KEYWORD' in a terminal.
-  (services
-   (modify-services %desktop-services
-                    (guix-service-type config =>
-                                       (guix-configuration
-                                        (inherit config)
-                                        (substitute-urls
-                                         (append (list "https://substitutes.nonguix.org")
-                                                 %default-substitute-urls))
-                                        (authorized-keys
-                                         (append (list (local-file "/etc/signing-key.pub")
-                                                       %default-authorized-guix-keys)))))))
-  (bootloader (bootloader-configuration
-                (bootloader grub-efi-bootloader)
-                (targets (list "/boot/efi"))
-                (keyboard-layout keyboard-layout)))
-  (mapped-devices (list (mapped-device
-                          (source (uuid
-                                   "da927001-dae7-4d96-ad02-d8b3dc5657bd"))
-                          (target "cryptroot")
-                          (type luks-device-mapping))))
+ ;; Below is the list of system services.  To search for available
+ ;; services, run 'guix system search KEYWORD' in a terminal.
+ (services
+  (modify-services %desktop-services
+                   (guix-service-type config =>
+                                      (guix-configuration
+                                       (inherit config)
+                                       (substitute-urls
+                                        (append (list "https://substitutes.nonguix.org")
+                                                %default-substitute-urls))
+                                       (authorized-keys
+                                        (append (list (local-file "/etc/signing-key.pub"))
+                                                %default-authorized-guix-keys))))))
+ (bootloader (bootloader-configuration
+              (bootloader grub-efi-bootloader)
+              (targets (list "/boot/efi"))
+              (keyboard-layout keyboard-layout)))
+ (mapped-devices (list (mapped-device
+                        (source (uuid
+                                 "da927001-dae7-4d96-ad02-d8b3dc5657bd"))
+                        (target "cryptroot")
+                        (type luks-device-mapping))))

-  ;; The list of file systems that get "mounted".  The unique
-  ;; file system identifiers there ("UUIDs") can be obtained
-  ;; by running 'blkid' in a terminal.
-  (file-systems (cons* (file-system
-                         (mount-point "/boot/efi")
-                         (device (uuid "9936-B235"
-                                       'fat32))
-                         (type "vfat"))
-                       (file-system
-                         (mount-point "/")
-                         (device "/dev/mapper/cryptroot")
-                         (type "ext4")
-                         (dependencies mapped-devices)) %base-file-systems)))
+ ;; The list of file systems that get "mounted".  The unique
+ ;; file system identifiers there ("UUIDs") can be obtained
+ ;; by running 'blkid' in a terminal.
+ (file-systems (cons* (file-system
+                       (mount-point "/boot/efi")
+                       (device (uuid "9936-B235"
+                                     'fat32))
+                       (type "vfat"))
+                      (file-system
+                       (mount-point "/")
+                       (device "/dev/mapper/cryptroot")
+                       (type "ext4")
+                       (dependencies mapped-devices)) %base-file-systems)))