From 9c1831b4d19e2f4e0ba454e219fabff40055744f Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Wed, 25 Mar 2026 16:56:00 +0100 Subject: implement deployment of aisaka --- deployment/systems/aisaka.scm | 15 +++++++++++---- deployment/systems/akashi.scm | 5 ++++- deployment/systems/rakan.scm | 5 ++++- 3 files changed, 19 insertions(+), 6 deletions(-) (limited to 'deployment/systems') 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) -- cgit v1.3