diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2026-05-22 07:05:50 +0200 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2026-05-22 07:05:50 +0200 |
| commit | b8931ea96b6fdd0a4085f5daab41f9c852d14c19 (patch) | |
| tree | ff058b7b6ec32717e86cd874a481039f0de1d7f2 | |
| parent | f58c3094abe55e42ade55d3f70b9fe523a116300 (diff) | |
(machine,system): use a system type string defined in Sovereign
| -rw-r--r-- | deployment/machine/ssh.scm | 8 | ||||
| -rw-r--r-- | deployment/system/aisaka.scm | 2 | ||||
| -rw-r--r-- | deployment/system/akashi.scm | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/deployment/machine/ssh.scm b/deployment/machine/ssh.scm index 8a1e73f..09d05b3 100644 --- a/deployment/machine/ssh.scm +++ b/deployment/machine/ssh.scm @@ -24,7 +24,9 @@ #:use-module ((deployment system akashi) #:prefix deployment:system:akashi:) #:use-module ((gnu machine ssh) - #:prefix gnu:machine:ssh:)) + #:prefix gnu:machine:ssh:) + #:use-module ((sovereign machine) + #:prefix sovereign:machine:)) (define open-machine-ssh-session* (@@ (gnu machine ssh) @@ -33,7 +35,7 @@ (define-public aisaka-configuration (gnu:machine:ssh:machine-ssh-configuration (host-name deployment:system:aisaka:system-name) - (system deployment:system:aisaka:architecture) + (system sovereign:machine:system-x86-linux) (build-locally? #t) (authorize? #t) (allow-downgrades? #f) @@ -48,7 +50,7 @@ (define-public akashi-configuration (gnu:machine:ssh:machine-ssh-configuration (host-name deployment:system:akashi:system-name) - (system deployment:system:akashi:architecture) + (system sovereign:machine:system-x86-linux) (build-locally? #t) (authorize? #t) (allow-downgrades? #f) diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm index 17636d1..7f0f43a 100644 --- a/deployment/system/aisaka.scm +++ b/deployment/system/aisaka.scm @@ -83,8 +83,6 @@ #:use-module ((users vmail) #:prefix users:vmail:)) -(define-public architecture "x86_64-linux") - (define-public system-name "aisaka") (define radicale-keys "/secrets/radicale/keys") diff --git a/deployment/system/akashi.scm b/deployment/system/akashi.scm index ab6bb63..7276a03 100644 --- a/deployment/system/akashi.scm +++ b/deployment/system/akashi.scm @@ -54,8 +54,6 @@ #:use-module ((sovereign systems) #:prefix sovereign:systems:)) -(define-public architecture "x86_64-linux") - (define-public system-name "akashi") (define root-partition |