From da7ee0fa6680fee7cc1d750252c6bb4ef00595cb Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Mon, 20 Apr 2026 17:11:36 +0200 Subject: move system modules to (deployment system) namespace --- deployment/system.scm | 76 +++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'deployment/system.scm') diff --git a/deployment/system.scm b/deployment/system.scm index 66cda59..bd09e44 100644 --- a/deployment/system.scm +++ b/deployment/system.scm @@ -3,18 +3,18 @@ #:prefix deployment:services:databases:) #:use-module ((deployment services matrix) #:prefix deployment:services:matrix:) - #:use-module ((deployment systems aisaka) - #:prefix deployment:systems:aisaka:) - #:use-module ((deployment systems akashi) - #:prefix deployment:systems:akashi:) - #:use-module ((deployment systems asakura) - #:prefix deployment:systems:asakura:) - #:use-module ((deployment systems cokolwiek) - #:prefix deployment:systems:cokolwiek:) - #:use-module ((deployment systems mcdowell) - #:prefix deployment:systems:mcdowell:) - #:use-module ((deployment systems rakan) - #:prefix deployment:systems:rakan:) + #:use-module ((deployment system aisaka) + #:prefix deployment:system:aisaka:) + #:use-module ((deployment system akashi) + #:prefix deployment:system:akashi:) + #:use-module ((deployment system asakura) + #:prefix deployment:system:asakura:) + #:use-module ((deployment system cokolwiek) + #:prefix deployment:system:cokolwiek:) + #:use-module ((deployment system mcdowell) + #:prefix deployment:system:mcdowell:) + #:use-module ((deployment system rakan) + #:prefix deployment:system:rakan:) #:use-module ((gnu packages tls) #:prefix gnu:packages:tls:) #:use-module ((gnu packages matrix) @@ -56,24 +56,24 @@ (kernel-loadable-modules (list)) (kernel-arguments gnu:system:%default-kernel-arguments) (hurd #f) - (bootloader deployment:systems:aisaka:system-bootloader) - (label (sovereign:systems:operating-system-label* deployment:systems:aisaka:system-name + (bootloader deployment:system:aisaka:system-bootloader) + (label (sovereign:systems:operating-system-label* deployment:system:aisaka:system-name gnu:system:this-operating-system)) - (keyboard-layout deployment:systems:aisaka:system-keyboard-layout) + (keyboard-layout deployment:system:aisaka:system-keyboard-layout) (initrd nongnu:system:linux-initrd:microcode-initrd) (initrd-modules gnu:system:linux-initrd:%base-initrd-modules) (firmware (list nongnu:packages:linux:linux-firmware)) - (host-name deployment:systems:aisaka:system-name) + (host-name deployment:system:aisaka:system-name) (hosts-file #f) (mapped-devices (list)) - (file-systems (cons* deployment:systems:aisaka:file-system-root - deployment:systems:aisaka:file-system-efi + (file-systems (cons* deployment:system:aisaka:file-system-root + deployment:system:aisaka:file-system-efi gnu:system:file-systems:%base-file-systems)) (swap-devices (list)) (users (cons* users:id1000:uid1000-account users:vmail:vmail-account gnu:system:shadow:%base-user-accounts)) - (groups (cons* deployment:systems:aisaka:vmail-group + (groups (cons* deployment:system:aisaka:vmail-group gnu:system:shadow:%base-groups)) (skeletons (gnu:system:shadow:default-skeletons)) (issue (@@ (gnu system) @@ -87,25 +87,25 @@ (locale-libcs gnu:system:locale:%default-locale-libcs) (name-service-switch gnu:system:nss:%default-nss) (essential-services (gnu:system:operating-system-default-essential-services gnu:system:this-operating-system)) - (services (cons* deployment:systems:aisaka:certbot - deployment:systems:aisaka:cgit + (services (cons* deployment:system:aisaka:certbot + deployment:system:aisaka:cgit users:id1000:dkim-service users:id1000:dovecot-service - deployment:systems:aisaka:etc - deployment:systems:aisaka:fcgiwrap - deployment:systems:aisaka:gitolite - deployment:systems:aisaka:guix-home-service - deployment:systems:aisaka:guix-publish-service - deployment:systems:aisaka:iproute2-networking - deployment:systems:aisaka:knot + deployment:system:aisaka:etc + deployment:system:aisaka:fcgiwrap + deployment:system:aisaka:gitolite + deployment:system:aisaka:guix-home-service + deployment:system:aisaka:guix-publish-service + deployment:system:aisaka:iproute2-networking + deployment:system:aisaka:knot deployment:services:matrix:matrix-service-aisaka - deployment:systems:aisaka:nginx - deployment:systems:aisaka:offload-rakan + deployment:system:aisaka:nginx + deployment:system:aisaka:offload-rakan deployment:services:databases:matrix-postgresql-service - deployment:systems:aisaka:radicale + deployment:system:aisaka:radicale users:id1000:smtp-service - deployment:systems:aisaka:static-networking - deployment:systems:aisaka:%sovereign-services*)) + deployment:system:aisaka:static-networking + deployment:system:aisaka:%sovereign-services*)) (pam-services (gnu:system:pam:base-pam-services)) (privileged-programs gnu:system:%default-privileged-programs) (setuid-programs gnu:system:%setuid-programs) @@ -113,12 +113,12 @@ (location (and=> (current-source-location) guix:diagnostics:source-properties->location)))) -(define-public akashi deployment:systems:akashi:system) +(define-public akashi deployment:system:akashi:system) -(define-public asakura deployment:systems:asakura:system) +(define-public asakura deployment:system:asakura:system) -(define-public cokolwiek deployment:systems:cokolwiek:system) +(define-public cokolwiek deployment:system:cokolwiek:system) -(define-public mcdowell deployment:systems:mcdowell:system) +(define-public mcdowell deployment:system:mcdowell:system) -(define-public rakan deployment:systems:rakan:system) +(define-public rakan deployment:system:rakan:system) -- cgit v1.3