move system modules to (deployment system) namespace

10 files changed, 52 insertions, 52 deletions

diff --git a/deployment/machine/ssh.scm b/deployment/machine/ssh.scm
index edeeffd..d6294f0 100644
--- a/deployment/machine/ssh.scm
+++ b/deployment/machine/ssh.scm
@@ -1,8 +1,8 @@
 (define-module (deployment machine ssh)
-  #:use-module ((deployment systems aisaka)
-                #:prefix deployment:systems:aisaka:)
-  #:use-module ((deployment systems akashi)
-                #:prefix deployment:systems:akashi:)
+  #:use-module ((deployment system aisaka)
+                #:prefix deployment:system:aisaka:)
+  #:use-module ((deployment system akashi)
+                #:prefix deployment:system:akashi:)
   #:use-module ((gnu machine ssh)
                 #:prefix gnu:machine:ssh:))
 
@@ -12,8 +12,8 @@
 
 (define-public aisaka-configuration
   (gnu:machine:ssh:machine-ssh-configuration
-   (host-name         deployment:systems:aisaka:system-name)
-   (system            deployment:systems:aisaka:architecture)
+   (host-name         deployment:system:aisaka:system-name)
+   (system            deployment:system:aisaka:architecture)
    (build-locally?    #t)
    (authorize?        #t)
    (allow-downgrades? #f)
@@ -27,8 +27,8 @@
 
 (define-public akashi-configuration
   (gnu:machine:ssh:machine-ssh-configuration
-   (host-name         deployment:systems:akashi:system-name)
-   (system            deployment:systems:akashi:architecture)
+   (host-name         deployment:system:akashi:system-name)
+   (system            deployment:system:akashi:architecture)
    (build-locally?    #t)
    (authorize?        #t)
    (allow-downgrades? #f)
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)
diff --git a/deployment/systems/aisaka.scm b/deployment/system/aisaka.scm
index da3816c..192982a 100644
--- a/deployment/systems/aisaka.scm
+++ b/deployment/system/aisaka.scm
@@ -1,7 +1,7 @@
 ;;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;; SPDX-FileCopyrightText: 2024-2026 Marek Paśnikowski <marek@marekpasnikowski.pl>
 
-(define-module (deployment systems aisaka)
+(define-module (deployment system aisaka)
   #:use-module (guix gexp)
   #:use-module ((deployment keys)
                 #:prefix deployment:keys:)
diff --git a/deployment/systems/akashi.scm b/deployment/system/akashi.scm
index 142ffae..3b58940 100644
--- a/deployment/systems/akashi.scm
+++ b/deployment/system/akashi.scm
@@ -1,7 +1,7 @@
 ;;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;; SPDX-FileCopyrightText: 2024-2025 Marek Paśnikowski <marek@marekpasnikowski.pl>
 
-(define-module (deployment systems akashi)
+(define-module (deployment system akashi)
   #:use-module (guix gexp)
   #:use-module (users id1000)
   #:use-module ((deployment keys)
diff --git a/deployment/systems/asakura.scm b/deployment/system/asakura.scm
index 2b8397d..b56d77e 100644
--- a/deployment/systems/asakura.scm
+++ b/deployment/system/asakura.scm
@@ -1,7 +1,7 @@
 ;;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;; SPDX-FileCopyrightText: 2024-2025 Marek Paśnikowski <marek@marekpasnikowski.pl>
 
-(define-module (deployment systems asakura)
+(define-module (deployment system asakura)
   #:use-module ((gnu system)                    #:prefix gnu:system:)
   #:use-module ((gnu system file-systems)       #:prefix gnu:system:file-systems:)
   #:use-module ((gnu system uuid)               #:prefix gnu:system:uuid:)
diff --git a/deployment/systems/cokolwiek.scm b/deployment/system/cokolwiek.scm
index 15beb99..e917851 100644
--- a/deployment/systems/cokolwiek.scm
+++ b/deployment/system/cokolwiek.scm
@@ -1,7 +1,7 @@
 ;;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;; SPDX-FileCopyrightText: 2024-2025 Marek Paśnikowski <marek@marekpasnikowski.pl>
 
-(define-module (deployment systems cokolwiek)
+(define-module (deployment system cokolwiek)
   #:use-module ( (gnu packages package-management)
                  #:prefix gnu:packages:package-management:)
   #:use-module ( (gnu services)
diff --git a/deployment/systems/git-ignore.conf b/deployment/system/git-ignore.conf
index 98e588f..98e588f 100644
--- a/deployment/systems/git-ignore.conf
+++ b/deployment/system/git-ignore.conf
diff --git a/deployment/systems/gitconfig b/deployment/system/gitconfig
index 300f906..300f906 100644
--- a/deployment/systems/gitconfig
+++ b/deployment/system/gitconfig
diff --git a/deployment/systems/mcdowell.scm b/deployment/system/mcdowell.scm
index 341bb50..b38aea8 100644
--- a/deployment/systems/mcdowell.scm
+++ b/deployment/system/mcdowell.scm
@@ -1,7 +1,7 @@
 ;;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;; SPDX-FileCopyrightText: 2024-2025 Marek Paśnikowski <marek@marekpasnikowski.pl>
 
-(define-module (deployment systems mcdowell)
+(define-module (deployment system mcdowell)
   #:use-module ( (deployment keys)
                  #:prefix deployment:keys:)
   #:use-module ( (gnu packages package-management)
diff --git a/deployment/systems/rakan.scm b/deployment/system/rakan.scm
index 35e0803..9e9d77c 100644
--- a/deployment/systems/rakan.scm
+++ b/deployment/system/rakan.scm
@@ -1,7 +1,7 @@
 ;;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;; SPDX-FileCopyrightText: 2024-2025 Marek Paśnikowski <marek@marekpasnikowski.pl>
 
-(define-module (deployment systems rakan)
+(define-module (deployment system rakan)
   #:use-module (guix gexp)
   #:use-module ( (deployment keys)
                  #:prefix deployment:keys:)