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.
This commit is contained in:
parent
1178a79018
commit
059e1bba38
|
@ -46,12 +46,6 @@
|
||||||
(serial-speed 115200)
|
(serial-speed 115200)
|
||||||
(targets '("/dev/sda"))))
|
(targets '("/dev/sda"))))
|
||||||
|
|
||||||
(swap-devices
|
|
||||||
(list (swap-space
|
|
||||||
(target "/swap/swapfile")
|
|
||||||
(dependencies (filter (file-system-mount-point-predicate "/swap")
|
|
||||||
file-systems)))))
|
|
||||||
|
|
||||||
(file-systems (append
|
(file-systems (append
|
||||||
(list (file-system
|
(list (file-system
|
||||||
(device (file-system-label "root"))
|
(device (file-system-label "root"))
|
||||||
|
@ -65,6 +59,12 @@
|
||||||
(options "subvol=@swap")))
|
(options "subvol=@swap")))
|
||||||
%base-file-systems))
|
%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
|
(users (cons* (user-account
|
||||||
(name %automation-user)
|
(name %automation-user)
|
||||||
(comment "Automation User")
|
(comment "Automation User")
|
||||||
|
@ -96,23 +96,24 @@
|
||||||
|
|
||||||
(services
|
(services
|
||||||
(append
|
(append
|
||||||
(list (service openssh-service-type
|
(list
|
||||||
(openssh-configuration
|
(service openssh-service-type
|
||||||
(password-authentication? #f)
|
(openssh-configuration
|
||||||
(authorized-keys
|
(password-authentication? #f)
|
||||||
`(("auto" ,(local-file "../../../.pubkeys/deploy-key.pub"))
|
(authorized-keys
|
||||||
("collin" ,(local-file "../../../.pubkeys/collin.pub"))
|
`(("auto" ,(local-file "../../../.pubkeys/deploy-key.pub"))
|
||||||
("root" ,(local-file "../../../.pubkeys/collin.pub"))))))
|
("collin" ,(local-file "../../../.pubkeys/collin.pub"))
|
||||||
(service static-networking-service-type
|
("root" ,(local-file "../../../.pubkeys/collin.pub"))))))
|
||||||
(list (static-networking
|
(service static-networking-service-type
|
||||||
(addresses
|
(list (static-networking
|
||||||
(list (network-address
|
(addresses
|
||||||
(device "eno8303")
|
(list (network-address
|
||||||
(value "216.37.76.55/24"))))
|
(device "eno8303")
|
||||||
(routes
|
(value "216.37.76.55/24"))))
|
||||||
(list (network-route
|
(routes
|
||||||
(destination "default")
|
(list (network-route
|
||||||
(gateway "216.37.76.1"))))
|
(destination "default")
|
||||||
(name-servers '("216.37.64.2" "216.37.64.3")))))
|
(gateway "216.37.76.1"))))
|
||||||
(service ntp-service-type))
|
(name-servers '("216.37.64.2" "216.37.64.3")))))
|
||||||
|
(service ntp-service-type))
|
||||||
%base-services))))
|
%base-services))))
|
||||||
|
|
Loading…
Reference in New Issue