diff options
| -rw-r--r-- | deployment/machine.scm | 18 | ||||
| -rw-r--r-- | deployment/machine/ssh.scm | 24 | ||||
| -rw-r--r-- | deployment/systems/aisaka.scm | 15 | ||||
| -rw-r--r-- | deployment/systems/akashi.scm | 5 | ||||
| -rw-r--r-- | deployment/systems/rakan.scm | 5 |
5 files changed, 61 insertions, 6 deletions
diff --git a/deployment/machine.scm b/deployment/machine.scm new file mode 100644 index 0000000..28e303b --- /dev/null +++ b/deployment/machine.scm @@ -0,0 +1,18 @@ +(define-module (deployment machine) + #:use-module ((deployment machine ssh) + #:prefix deployment:machine:ssh:) + #:use-module ((deployment systems aisaka) + #:prefix deployment:systems:aisaka:) + #:use-module ((gnu machine) + #:prefix gnu:machine:) + #:use-module ((gnu machine ssh) + #:prefix gnu:machine:ssh:)) + +(define aisaka-machine + (gnu:machine:machine + (operating-system deployment:systems:aisaka:system) + (environment gnu:machine:ssh:managed-host-environment-type) + (configuration deployment:machine:ssh:aisaka-configuration))) + +(define-public aisaka + (list aisaka-machine)) diff --git a/deployment/machine/ssh.scm b/deployment/machine/ssh.scm new file mode 100644 index 0000000..e7339b1 --- /dev/null +++ b/deployment/machine/ssh.scm @@ -0,0 +1,24 @@ +(define-module (deployment machine ssh) + #:use-module ((deployment systems aisaka) + #:prefix deployment:systems:aisaka:) + #:use-module ((gnu machine ssh) + #:prefix gnu:machine:ssh:)) + +(define open-machine-ssh-session* + (@@ (gnu machine ssh) + open-machine-ssh-session*)) + +(define-public aisaka-configuration + (gnu:machine:ssh:machine-ssh-configuration + (host-name deployment:systems:aisaka:system-name) + (system deployment:systems:aisaka:architecture) + (build-locally? #t) + (authorize? #t) + (allow-downgrades? #f) + (safety-checks? #t) + (port 22) + (user "marek") + (identity #f) + (session (open-machine-ssh-session* (@@ (gnu machine ssh) + this-machine-ssh-configuration))) + (host-key #f))) diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm index 83bc320..c4c01ca 100644 --- a/deployment/systems/aisaka.scm +++ b/deployment/systems/aisaka.scm @@ -51,16 +51,18 @@ #:prefix gnu:system:linux-initrd:) #:use-module ((gnu system locale) #:prefix gnu:system:locale:) + #:use-module ((gnu packages matrix) + #:prefix gnu:packages:matrix:) #:use-module ((gnu system nss) #:prefix gnu:system:nss:) #:use-module ((gnu system pam) #:prefix gnu:system:pam:) #:use-module ((gnu system shadow) #:prefix gnu:system:shadow:) + #:use-module ((guix diagnostics) + #:prefix guix:diagnostics:) #:use-module ((nongnu packages linux) #:prefix nongnu:packages:linux:) - #:use-module ((gnu packages matrix) - #:prefix gnu:packages:matrix:) #:use-module ((nongnu system linux-initrd) #:prefix nongnu:system:linux-initrd:) #:use-module ((sovereign devices) @@ -76,7 +78,7 @@ #:use-module ((users vmail) #:prefix users:vmail:)) -(define system-name "aisaka") +(define-public system-name "aisaka") (define ip-multimedia "81.190.248.246") @@ -697,6 +699,9 @@ (define guix-home-service (sovereign:systems:guix-home-service named-home-environments)) +(define-public architecture + "x86_64-linux") + (define-public system (gnu:system:operating-system (kernel nongnu:packages:linux:linux) @@ -756,6 +761,8 @@ (privileged-programs gnu:system:%default-privileged-programs) (setuid-programs gnu:system:%setuid-programs) (sudoers-file sovereign:systems:%sovereign-sudoers-specification) - (location gnu:system:operating-system-location))) + (location (and=> (current-source-location) + guix:diagnostics:source-properties->location)))) + (define-public operating-system* system) diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm index c6687b6..b7b8361 100644 --- a/deployment/systems/akashi.scm +++ b/deployment/systems/akashi.scm @@ -30,6 +30,8 @@ #:prefix gnu:system:pam:) #:use-module ((gnu system shadow) #:prefix gnu:system:shadow:) + #:use-module ((guix diagnostics) + #:prefix guix:diagnostics:) #:use-module ((machines thinkpad-x200) #:prefix machines:thinkpad-x200:) #:use-module ((sovereign systems) @@ -116,6 +118,7 @@ (privileged-programs gnu:system:%default-privileged-programs) (setuid-programs gnu:system:%setuid-programs) (sudoers-file sovereign:systems:%sovereign-sudoers-specification) - (location gnu:system:operating-system-location))) + (location (and=> (current-source-location) + guix:diagnostics:source-properties->location)))) (define-public operating-system* system) diff --git a/deployment/systems/rakan.scm b/deployment/systems/rakan.scm index 0e9c212..3510f00 100644 --- a/deployment/systems/rakan.scm +++ b/deployment/systems/rakan.scm @@ -35,6 +35,8 @@ #:prefix gnu:system:pam:) #:use-module ( (gnu system shadow) #:prefix gnu:system:shadow:) + #:use-module ( (guix diagnostics) + #:prefix guix:diagnostics:) #:use-module ( (nongnu packages linux) #:prefix nongnu:packages:linux:) #:use-module ( (nongnu system linux-initrd) @@ -245,7 +247,8 @@ (pam-services (gnu:system:pam:base-pam-services)) (privileged-programs gnu:system:%default-privileged-programs) (sudoers-file sovereign:systems:%sovereign-sudoers-specification) - (location gnu:system:operating-system-location))) + (location (and=> (current-source-location) + guix:diagnostics:source-properties->location)))) (define-public operating-system* system) |