implement a common module for system definitions

5 files changed, 34 insertions, 10 deletions

diff --git a/deployment/system.scm b/deployment/system.scm
new file mode 100644
index 0000000..5ac011d
--- /dev/null
+++ b/deployment/system.scm
@@ -0,0 +1,25 @@
+(define-module (deployment system)
+  #: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:))
+
+(define-public aisaka deployment:systems:aisaka:system)
+
+(define-public akashi deployment:systems:akashi:system)
+
+(define-public asakura deployment:systems:asakura:system)
+
+(define-public cokolwiek deployment:systems:cokolwiek:system)
+
+(define-public mcdowell deployment:systems:mcdowell:system)
+
+(define-public rakan deployment:systems:rakan:system)
diff --git a/deployment/systems/asakura.scm b/deployment/systems/asakura.scm
index 5a617b8..2b8397d 100644
--- a/deployment/systems/asakura.scm
+++ b/deployment/systems/asakura.scm
@@ -109,7 +109,7 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-public operating-system*
+(define-public system
   (gnu:system:operating-system
    (kernel nongnu:packages:linux:linux)
    (bootloader (bootloader))
@@ -128,3 +128,5 @@
    (locale-definitions sovereign:systems:%sovereign-locale-definitions)
    (services services)
    (sudoers-file sovereign:systems:%sovereign-sudoers-specification)))
+
+(define-public operating-system* system)
diff --git a/deployment/systems/cokolwiek.scm b/deployment/systems/cokolwiek.scm
index 5802376..15beb99 100644
--- a/deployment/systems/cokolwiek.scm
+++ b/deployment/systems/cokolwiek.scm
@@ -64,7 +64,7 @@
       (inherit  sovereign:devices:swap/no-trim)
       (target   l-target))))
 
-(define system
+(define-public system
   (let*
     ( (l-guix-homes         (list users:id1000:named-home-environment
                                   users:id1001:named-home-environment))
@@ -102,5 +102,4 @@
       (services           l-services)
       (sudoers-file       sovereign:systems:%sovereign-sudoers-specification))))
 
-(define-public operating-system*
-  system)
+(define-public operating-system* system)
diff --git a/deployment/systems/mcdowell.scm b/deployment/systems/mcdowell.scm
index 7da49e8..341bb50 100644
--- a/deployment/systems/mcdowell.scm
+++ b/deployment/systems/mcdowell.scm
@@ -79,7 +79,7 @@
     (authorized-keys (list deployment:keys:rakan-guix))
     (build-machines  (list rakan-machine))))
 
-(define system
+(define-public system
   (let*
     ( (l-guix-homes         (list users:id1000:named-home-environment))
       (l-guix-home-service  (sovereign:systems:guix-home-service  l-guix-homes))
@@ -118,5 +118,4 @@
       (services           l-services)
       (sudoers-file       sovereign:systems:%sovereign-sudoers-specification))))
 
-(define-public operating-system*
-  system)
+(define-public operating-system* system)
diff --git a/deployment/systems/rakan.scm b/deployment/systems/rakan.scm
index 62a06fb..769c10d 100644
--- a/deployment/systems/rakan.scm
+++ b/deployment/systems/rakan.scm
@@ -192,7 +192,7 @@
                                gnu:services:base:guix-service-type
                                guix-offload-authorizations))
 
-(define system
+(define-public system
   (gnu:system:operating-system
    (kernel                  nongnu:packages:linux:linux)
    (kernel-loadable-modules (list))
@@ -237,5 +237,4 @@
    (location                (and=> (current-source-location)
                                    guix:diagnostics:source-properties->location))))
 
-(define-public operating-system*
-  system)
+(define-public operating-system* system)