diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2025-07-23 23:27:44 +0200 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2025-07-23 23:27:44 +0200 |
| commit | 541c5dbdcd9bd84fc50dc01c8382c0421e65d0d5 (patch) | |
| tree | b1b6ec0e70ba7e2497ed71bdc459089f3c0e8656 | |
| parent | b85588311c23f7fc5985107404fbefde3abd47e6 (diff) | |
| parent | 7ade7e29ba1dc1585398db801812126818319549 (diff) | |
Merge branch 'dedistribution' into staging
| -rw-r--r-- | deployment/systems/aisaka.scm | 1 | ||||
| -rw-r--r-- | deployment/systems/akashi.scm | 11 | ||||
| -rw-r--r-- | deployment/systems/ayase.scm | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm index e77f6c8..e5b9f1a 100644 --- a/deployment/systems/aisaka.scm +++ b/deployment/systems/aisaka.scm @@ -18,7 +18,6 @@ #:use-module ((sovereign devices amd64) #:prefix sovereign:devices:amd64:) #:use-module ((sovereign packages jekyll) #:prefix sovereign:packages:jekyll:) #:use-module ((sovereign systems) #:prefix sovereign:systems:) - #:use-module ((suweren system) #:prefix suweren:system:) #:use-module ((suweren update) #:prefix suweren:update:) #:use-module ((users id1000) #:prefix users:id1000:) #:use-module ((users vmail) #:prefix users:vmail:)) diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm index a7d48d2..dc2f65e 100644 --- a/deployment/systems/akashi.scm +++ b/deployment/systems/akashi.scm @@ -5,6 +5,7 @@ #:use-module ((gnu packages linux) #:prefix gnu:packages:linux:) #:use-module ((gnu services guix) #:prefix gnu:services:guix:) #:use-module ((gnu system) #:prefix gnu:system:) + #:use-module ((gnu system file-systems) #:prefix gnu:system:file-systems:) #:use-module ((machines thinkpad-x200) #:prefix machines:thinkpad-x200:) #:use-module ((sovereign systems) #:prefix sovereign:systems:) #:use-module (users id1000)) @@ -21,16 +22,14 @@ "akashi") (define (file-systems) - (use-modules (suweren system)) - (append %suweren-file-systems - (list root-partition))) + (cons* root-partition + gnu:system:file-systems:%base-file-systems)) (define keyboard-layout* ((@ (gnu system keyboard) keyboard-layout) "pl")) (define (services) - (use-modules (suweren system)) (let* ((home-environments `((,uid1000-name ,uid1000-home-environment))) (guix-home ((@ (gnu services) service) gnu:services:guix:guix-home-service-type @@ -63,7 +62,7 @@ (swap-devices (machines:thinkpad-x200:swap-devices* host-name*)) (users users) (timezone timezone*) - (locale polish-locale-string) - (locale-definitions %suweren-locale-definitions) + (locale sovereign:systems:pl-locale) + (locale-definitions sovereign:systems:%sovereign-locale-definitions) (services (services)) (sudoers-file sovereign:systems:%sovereign-sudoers-specification)))) diff --git a/deployment/systems/ayase.scm b/deployment/systems/ayase.scm index 9606c7b..933c211 100644 --- a/deployment/systems/ayase.scm +++ b/deployment/systems/ayase.scm @@ -10,7 +10,6 @@ #:use-module ((sovereign devices amd64) #:prefix sovereign:devices:amd64:) #:use-module ((sovereign packages protonmail) #:prefix sovereign:packages:protonmail:) #:use-module ((sovereign systems) #:prefix sovereign:systems:) - #:use-module ((suweren system) #:prefix suweren:system:) #:use-module ((users id1000) #:prefix users:id1000:)) (define efi-filesystem-uuid @@ -133,7 +132,7 @@ swap-device-2)) (users (users)) (timezone "Europe/Warsaw") - (locale suweren:system:polish-locale-string) - (locale-definitions suweren:system:%suweren-locale-definitions) + (locale sovereign:systems:pl-locale) + (locale-definitions sovereign:systems:%sovereign-locale-definitions) (services services) (sudoers-file sovereign:systems:%sovereign-sudoers-specification))) |