guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: hydra: milano: Tweak formatting and whitespace.


From: Christopher Baines
Subject: 01/01: hydra: milano: Tweak formatting and whitespace.
Date: Tue, 11 Jun 2019 14:36:42 -0400 (EDT)

cbaines pushed a commit to branch master
in repository maintenance.

commit 6cc170807a64c89b582daaa8ac38b1924bd70840
Author: Christopher Baines <address@hidden>
Date:   Tue Jun 11 19:35:01 2019 +0100

    hydra: milano: Tweak formatting and whitespace.
    
    * hydra/milano-guix-1.scm: Remove tabs, trailing whitespace, let Emacs
    indent some bits, and tweak others to reduce the line length.
---
 hydra/milano-guix-1.scm | 104 ++++++++++++++++++++++++------------------------
 1 file changed, 53 insertions(+), 51 deletions(-)

diff --git a/hydra/milano-guix-1.scm b/hydra/milano-guix-1.scm
index 5ec1521..82b2fdf 100644
--- a/hydra/milano-guix-1.scm
+++ b/hydra/milano-guix-1.scm
@@ -23,10 +23,10 @@
 (define %accounts
   (list (sysadmin "ludo" "Ludovic Court├Ęs")
         (sysadmin "rekado" "Ricardo Wurmus")
-       (sysadmin "andreas" "Andreas Enge")
-       (sysadmin "cbaines" "Christopher Baines")
+        (sysadmin "andreas" "Andreas Enge")
+        (sysadmin "cbaines" "Christopher Baines")
         (sysadmin "degrees380" "Giovanni Biscuolo")
-       (sysadmin "atrent" "Andrea Trentini")
+        (sysadmin "atrent" "Andrea Trentini")
         (user-account
          (name "hydra")
          (comment "Hydra User")
@@ -60,65 +60,67 @@
   (locale "en_US.utf8")
   (timezone "Europe/Rome")
   (keyboard-layout
-    (keyboard-layout "it" "winkeys"))
+   (keyboard-layout "it" "winkeys"))
 
   (kernel-arguments '("vga=791"))
 
   (initrd-modules (append (list "hpsa")
-                        %base-initrd-modules))
-  
+                          %base-initrd-modules))
+
   (bootloader
-    (bootloader-configuration
-      (bootloader grub-bootloader)
-      (target "/dev/sda")
-      (keyboard-layout keyboard-layout)))
-  
+   (bootloader-configuration
+    (bootloader grub-bootloader)
+    (target "/dev/sda")
+    (keyboard-layout keyboard-layout)))
+
   (file-systems
-    (cons* (file-system
-             (mount-point "/")
-             (device
-               (uuid "620115c7-89c7-4d79-a0bb-4957057d9991"))
-             (type "btrfs"))
-           %base-file-systems))
+   (cons* (file-system
+            (mount-point "/")
+            (device
+             (uuid "620115c7-89c7-4d79-a0bb-4957057d9991"))
+            (type "btrfs"))
+          %base-file-systems))
 
   (swap-devices '("/dev/sda2"))
-  
+
   (host-name "milano-guix-1")
 
   (users (append %accounts %base-user-accounts))
-  
+
   (packages (cons* btrfs-progs screen openssh strace %base-packages))
 
   ;; Services
-  (services (append (list (service dhcp-client-service-type)
-
-                          (service openssh-service-type
-                                   (openssh-configuration
-                                    (port-number 22)
-                                   (authorized-keys
-                                    `(("degrees380" ,(local-file 
"keys/ssh/degrees380.pub"))
-                                      ("bayfront" ,(local-file 
"keys/ssh/bayfront.pub"))
-                                       ("atrent" ,(local-file 
"keys/ssh/atrent.pub"))
-                                      ("ludo" ,(local-file 
"keys/ssh/ludo.pub"))
-                                      ("andreas" ,(local-file 
"keys/ssh/andreas.pub"))
-                                      ("cbaines" ,(local-file 
"keys/ssh/cbaines.pub"))
-                                      ("rekado" ,(local-file 
"keys/ssh/rekado.pub"))))))
-                         
-                         (service ntp-service-type)
-                         
-                          (service qemu-binfmt-service-type
-                                   (qemu-binfmt-configuration
-                                    (platforms (lookup-qemu-platforms "arm" 
"aarch64"))
-                                    (guix-support? #t)))
-
-                         (service mcron-service-type
-                            (mcron-configuration
-                             (jobs (list gc-job btrfs-job)))))
-
-                   (modify-services %base-services
-                     (guix-service-type config =>
-                                        (guix-configuration
-                                         (inherit config)
-                                          (use-substitutes? #f)
-                                          (authorized-keys
-                                           %authorized-guix-keys)))))))
+  (services
+   (append (list
+            (service dhcp-client-service-type)
+
+            (service openssh-service-type
+                     (openssh-configuration
+                      (port-number 22)
+                      (authorized-keys
+                       `(("degrees380" ,(local-file "keys/ssh/degrees380.pub"))
+                         ("bayfront" ,(local-file "keys/ssh/bayfront.pub"))
+                         ("atrent" ,(local-file "keys/ssh/atrent.pub"))
+                         ("ludo" ,(local-file "keys/ssh/ludo.pub"))
+                         ("andreas" ,(local-file "keys/ssh/andreas.pub"))
+                         ("cbaines" ,(local-file "keys/ssh/cbaines.pub"))
+                         ("rekado" ,(local-file "keys/ssh/rekado.pub"))))))
+
+            (service ntp-service-type)
+
+            (service qemu-binfmt-service-type
+                     (qemu-binfmt-configuration
+                      (platforms (lookup-qemu-platforms "arm" "aarch64"))
+                      (guix-support? #t)))
+
+            (service mcron-service-type
+                     (mcron-configuration
+                      (jobs (list gc-job btrfs-job)))))
+
+           (modify-services %base-services
+             (guix-service-type config =>
+                                (guix-configuration
+                                 (inherit config)
+                                 (use-substitutes? #f)
+                                 (authorized-keys
+                                  %authorized-guix-keys)))))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]