From f99e787cc352f21a6d4e1a7bf0ccec20f881a033 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Wed, 23 Jul 2025 22:46:31 +0200 Subject: [1] systems: utilise locale definition from Sovereign channel This replacement is part of a process to decomission Deployment channel. --- The ultimate goal is to move useful code from Deployment channel to either Sovereign or Deployment channels. Everything else will be deleted and ultimately the entire channel will be removed from network. --- The replaced refences are already defined in Sovereign channel. --- The definitions from Sovereign channel are used in place of the old ones. --- The Sovereign definition is slightly more complete (with explicit charset field), but functionally the same as the old one. --- deployment/systems/akashi.scm | 2 +- deployment/systems/ayase.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'deployment/systems') diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm index a7d48d2..a40dd3b 100644 --- a/deployment/systems/akashi.scm +++ b/deployment/systems/akashi.scm @@ -64,6 +64,6 @@ (users users) (timezone timezone*) (locale polish-locale-string) - (locale-definitions %suweren-locale-definitions) + (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..390f437 100644 --- a/deployment/systems/ayase.scm +++ b/deployment/systems/ayase.scm @@ -134,6 +134,6 @@ (users (users)) (timezone "Europe/Warsaw") (locale suweren:system:polish-locale-string) - (locale-definitions suweren:system:%suweren-locale-definitions) + (locale-definitions sovereign:systems:%sovereign-locale-definitions) (services services) (sudoers-file sovereign:systems:%sovereign-sudoers-specification))) -- cgit v1.2.3 From 53811e4d2f2f0a72c212b859b549c579d9c9e202 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Wed, 23 Jul 2025 23:00:25 +0200 Subject: [2] systems: utilise locale string from Sovereign channel This replacement is part of a process to decomission Deployment channel. --- The ultimate foal is to move useful code from Deployment channel to either Sovereign or Deployment channels. Everything else will be deleted and ultimately the entire channel will be removed from network. --- The replaced refences are already defined in Sovereign channel. --- The definitions from Sovereign channel are used in place of the old ones. --- The Sovereign definition is exactly the same as on in Distribution channel. --- deployment/systems/akashi.scm | 2 +- deployment/systems/ayase.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'deployment/systems') diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm index a40dd3b..8a35a43 100644 --- a/deployment/systems/akashi.scm +++ b/deployment/systems/akashi.scm @@ -63,7 +63,7 @@ (swap-devices (machines:thinkpad-x200:swap-devices* host-name*)) (users users) (timezone timezone*) - (locale polish-locale-string) + (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 390f437..e83d1c6 100644 --- a/deployment/systems/ayase.scm +++ b/deployment/systems/ayase.scm @@ -133,7 +133,7 @@ swap-device-2)) (users (users)) (timezone "Europe/Warsaw") - (locale suweren:system:polish-locale-string) + (locale sovereign:systems:pl-locale) (locale-definitions sovereign:systems:%sovereign-locale-definitions) (services services) (sudoers-file sovereign:systems:%sovereign-sudoers-specification))) -- cgit v1.2.3 From d79cd4552df19cee7eb3c3a72b5e70858bd879d2 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Wed, 23 Jul 2025 23:16:58 +0200 Subject: [3] akashi: use %base-file-systems directly This replacement is part of a process to decomission Deployment channel. --- The ultimate goal is to move useful code from Deployment channel to either Sovereign or Deployment channels. Everything else will be deleted and ultimately will be removed from network. --- The replaced reference is a useless indirection. --- The direct object from upstream Guix channel is used instead. --- This is the last variable from (suweren system) module gone. --- deployment/systems/akashi.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'deployment/systems') diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm index 8a35a43..acf2e01 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)) @@ -22,8 +23,8 @@ (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) -- cgit v1.2.3 From 7ade7e29ba1dc1585398db801812126818319549 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Wed, 23 Jul 2025 23:23:39 +0200 Subject: [4] systems: delete imports of (suweren system) module This removal is part of a process to decomission Distribution channel. --- The ultimate goal is to move useful code from Distribution channel to either Sovereign or Deployment channels. Everything else will be deleted and ultimately will be removed from network. --- The (suweren system) module was imported in aisaka, akashi and ayase systems. --- All these imports are deleted. --- After this (suweren system) module can be deleted from Distribution channel. --- deployment/systems/aisaka.scm | 1 - deployment/systems/akashi.scm | 2 -- deployment/systems/ayase.scm | 1 - 3 files changed, 4 deletions(-) (limited to 'deployment/systems') 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 acf2e01..dc2f65e 100644 --- a/deployment/systems/akashi.scm +++ b/deployment/systems/akashi.scm @@ -22,7 +22,6 @@ "akashi") (define (file-systems) - (use-modules (suweren system)) (cons* root-partition gnu:system:file-systems:%base-file-systems)) @@ -31,7 +30,6 @@ "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 diff --git a/deployment/systems/ayase.scm b/deployment/systems/ayase.scm index e83d1c6..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 -- cgit v1.2.3