diff options
| -rw-r--r-- | deployment/systems/mcdowell.scm | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/deployment/systems/mcdowell.scm b/deployment/systems/mcdowell.scm index 3bcf592..41cf0b8 100644 --- a/deployment/systems/mcdowell.scm +++ b/deployment/systems/mcdowell.scm @@ -3,6 +3,7 @@ (define-module (deployment systems mcdowell) #:use-module ((gnu services) #:prefix gnu:services:) + #:use-module ((gnu services base) #:prefix gnu:services:base:) #:use-module ((gnu services guix) #:prefix gnu:services:guix:) #:use-module ((gnu services ssh) #:prefix gnu:services:ssh:) #:use-module ((gnu system) #:prefix gnu:system:) @@ -11,6 +12,7 @@ #:use-module ((gnu system shadow) #:prefix gnu:system:shadow:) #:use-module ((nongnu packages linux) #:prefix nongnu:packages:linux:) #:use-module ((nongnu system linux-initrd) #:prefix nongnu:system:linux-initrd:) + #:use-module ((sovereign channels) #:prefix sovereign:channels:) #:use-module ((sovereign devices) #:prefix sovereign:devices:) #:use-module ((sovereign devices amd64) #:prefix sovereign:devices:amd64:) #:use-module ((sovereign packages protonmail) #:prefix sovereign:packages:protonmail:) @@ -44,6 +46,20 @@ (inherit sovereign:devices:swap/no-trim) (target l-target)))) +(define (guix-configuration record) + (gnu:services:base:guix-configuration + (inherit record) + (channels (list sovereign:channels:%default-guix-channel + sovereign:channels:deployment-channel-staging + sovereign:channels:distribution-channel + sovereign:channels:nonguix-channel + sovereign:channels:sovereign-channel-staging)))) + +(define %sovereign-services* + (gnu:services:modify-services sovereign:systems:%sovereign-services + (gnu:services:base:guix-service-type + record => (guix-configuration record)))) + (define system (let* ( (l-guix-homes (list users:id1000:name/home-environment)) @@ -58,7 +74,7 @@ (l-services (cons* l-guix-home-service (gnu:services:service gnu:services:ssh:openssh-service-type) sovereign:packages:protonmail:nogui-profile - sovereign:systems:%sovereign-services)) + %sovereign-services*)) (l-swap-devices (list swap)) (l-users (cons* users:id1000:uid1000-account gnu:system:shadow:%base-user-accounts))) |