summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deployment/systems/mcdowell.scm65
1 files changed, 43 insertions, 22 deletions
diff --git a/deployment/systems/mcdowell.scm b/deployment/systems/mcdowell.scm
index 2755e30..75e5d04 100644
--- a/deployment/systems/mcdowell.scm
+++ b/deployment/systems/mcdowell.scm
@@ -2,22 +2,40 @@
;;; SPDX-FileCopyrightText: 2024-2025 Marek Paśnikowski <marek@marekpasnikowski.pl>
(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:)
- #:use-module ((gnu system file-systems) #:prefix gnu:system:file-systems:)
- #:use-module ((gnu system linux-initrd) #:prefix gnu:system:linux-initrd:)
- #: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:)
- #:use-module ((sovereign systems) #:prefix sovereign:systems:)
- #:use-module ((users id1000) #:prefix users:id1000:))
+ #:use-module ( (gnu packages package-management)
+ #:prefix gnu:packages:package-management:)
+ #: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:)
+ #:use-module ( (gnu system file-systems)
+ #:prefix gnu:system:file-systems:)
+ #:use-module ( (gnu system linux-initrd)
+ #:prefix gnu:system:linux-initrd:)
+ #: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:)
+ #:use-module ( (sovereign systems)
+ #:prefix sovereign:systems:)
+ #:use-module ( (users id1000)
+ #:prefix users:id1000:))
(define system-name
"mcdowell")
@@ -47,12 +65,15 @@
(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:nonguix-channel
- sovereign:channels:sovereign-channel-staging))))
+ (let
+ ( (l-channels (list sovereign:channels:default-guix-channel
+ sovereign:channels:deployment-channel-staging
+ sovereign:channels:nonguix-channel
+ sovereign:channels:sovereign-channel-staging)))
+ (gnu:services:base:guix-configuration
+ (inherit record)
+ (guix (gnu:packages:package-management:guix-for-channels l-channels))
+ (channels l-channels))))
(define guix-publish-configuration
(gnu:services:base:guix-publish-configuration