From e31bad8b571ee0e45df55d98b7a9204f238f3d24 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Mon, 25 May 2026 21:45:31 +0200 Subject: adapt to removal of pl-keyboard-layout in Sovereign --- deployment/system/aisaka.scm | 4 +--- deployment/system/cokolwiek.scm | 18 +++++++++--------- deployment/system/mcdowell.scm | 18 +++++++++--------- deployment/system/rakan.scm | 18 +++++++++--------- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm index ca7ae38..dcc7655 100644 --- a/deployment/system/aisaka.scm +++ b/deployment/system/aisaka.scm @@ -69,8 +69,6 @@ #:prefix nongnu:packages:linux:) #:use-module ((nongnu system linux-initrd) #:prefix nongnu:system:linux-initrd:) - #:use-module ((sovereign devices) - #:prefix sovereign:devices:) #:use-module ((sovereign packages jekyll) #:prefix sovereign:packages:jekyll:) #:use-module ((sovereign services) @@ -298,7 +296,7 @@ (gnu:bootloader:bootloader-configuration (bootloader gnu:bootloader:grub:grub-efi-bootloader) (targets (list "/boot")) - (keyboard-layout sovereign:devices:pl-keyboard-layout))) + (keyboard-layout sovereign:systems:keyboard-layout))) (define-public vmail-group (gnu:system:accounts:user-group diff --git a/deployment/system/cokolwiek.scm b/deployment/system/cokolwiek.scm index 14587e9..073f43a 100644 --- a/deployment/system/cokolwiek.scm +++ b/deployment/system/cokolwiek.scm @@ -42,10 +42,10 @@ #:prefix nongnu:system:linux-initrd:) #:use-module ( (sovereign channels) #:prefix sovereign:channels:) - #:use-module ( (sovereign devices) - #:prefix sovereign:devices:) #:use-module ( (sovereign packages protonmail) #:prefix sovereign:packages:protonmail:) + #:use-module ( (sovereign system file-systems) + #:prefix sovereign:system:file-systems:) #:use-module ( (sovereign systems) #:prefix sovereign:systems:) #:use-module ( (users id1000) @@ -59,25 +59,25 @@ (define file-system-efi (let* ( (l-system-name (string-upcase system-name)) - (l-device (sovereign:devices:file-system-label "BOOT"))) + (l-device (sovereign:system:file-systems:file-system-label "BOOT"))) (gnu:system:file-systems:file-system - (inherit sovereign:devices:file-system/efi) + (inherit sovereign:system:file-systems:file-system/efi) (device l-device)))) (define file-system-root (let - ( (l-device (sovereign:devices:file-system-label system-name + ( (l-device (sovereign:system:file-systems:file-system-label system-name "root"))) (gnu:system:file-systems:file-system - (inherit sovereign:devices:file-system/root) + (inherit sovereign:system:file-systems:file-system/root) (device l-device)))) (define swap (let - ( (l-target (sovereign:devices:file-system-label system-name + ( (l-target (sovereign:system:file-systems:file-system-label system-name "swap"))) (gnu:system:file-systems:swap-space - (inherit sovereign:devices:swap/no-trim) + (inherit sovereign:system:file-systems:swap/no-trim) (target l-target)))) (define-public system @@ -104,7 +104,7 @@ (bootloader l-bootloader) (label (sovereign:systems:operating-system-label* system-name gnu:system:this-operating-system)) - (keyboard-layout sovereign:devices:pl-keyboard-layout) + (keyboard-layout sovereign:systems:keyboard-layout) (initrd nongnu:system:linux-initrd:microcode-initrd) (initrd-modules l-initrd-modules) (firmware l-firmware) diff --git a/deployment/system/mcdowell.scm b/deployment/system/mcdowell.scm index 2a3566f..9291b81 100644 --- a/deployment/system/mcdowell.scm +++ b/deployment/system/mcdowell.scm @@ -45,10 +45,10 @@ #:prefix nongnu:system:linux-initrd:) #:use-module ( (sovereign channels) #:prefix sovereign:channels:) - #:use-module ( (sovereign devices) - #:prefix sovereign:devices:) #:use-module ( (sovereign packages protonmail) #:prefix sovereign:packages:protonmail:) + #:use-module ( (sovereign system file-systems) + #:prefix sovereign:system:file-systems:) #:use-module ( (sovereign systems) #:prefix sovereign:systems:) #:use-module ( (users id1000) @@ -60,25 +60,25 @@ (define file-system-efi (let* ( (l-system-name (string-upcase system-name)) - (l-device (sovereign:devices:file-system-label "BOOT"))) + (l-device (sovereign:system:file-systems:file-system-label "BOOT"))) (gnu:system:file-systems:file-system - (inherit sovereign:devices:file-system/efi) + (inherit sovereign:system:file-systems:file-system/efi) (device l-device)))) (define file-system-root (let - ( (l-device (sovereign:devices:file-system-label system-name + ( (l-device (sovereign:system:file-systems:file-system-label system-name "root"))) (gnu:system:file-systems:file-system - (inherit sovereign:devices:file-system/root) + (inherit sovereign:system:file-systems:file-system/root) (device l-device)))) (define swap (let - ( (l-target (sovereign:devices:file-system-label system-name + ( (l-target (sovereign:system:file-systems:file-system-label system-name "swap"))) (gnu:system:file-systems:swap-space - (inherit sovereign:devices:swap/no-trim) + (inherit sovereign:system:file-systems:swap/no-trim) (target l-target)))) (define rakan-machine @@ -120,7 +120,7 @@ (bootloader l-bootloader) (label (sovereign:systems:operating-system-label* system-name gnu:system:this-operating-system)) - (keyboard-layout sovereign:devices:pl-keyboard-layout) + (keyboard-layout sovereign:systems:keyboard-layout) (initrd nongnu:system:linux-initrd:microcode-initrd) (initrd-modules l-initrd-modules) (firmware l-firmware) diff --git a/deployment/system/rakan.scm b/deployment/system/rakan.scm index 0fbf2f3..0cdade7 100644 --- a/deployment/system/rakan.scm +++ b/deployment/system/rakan.scm @@ -60,14 +60,14 @@ #:prefix nongnu:system:linux-initrd:) #:use-module ( (gnu home-services mail) #:prefix rde/gnu:home-services:mail:) - #:use-module ( (sovereign devices) - #:prefix sovereign:devices:) #:use-module ( (sovereign packages emacs) #:prefix sovereign:packages:emacs:) #:use-module ( (sovereign packages protonmail) #:prefix sovereign:packages:protonmail:) #:use-module ( (sovereign services) #:prefix sovereign:services:) + #:use-module ( (sovereign system file-systems) + #:prefix sovereign:system:file-systems:) #:use-module ( (sovereign systems) #:prefix sovereign:systems:) #:use-module ( (users id1000) @@ -79,17 +79,17 @@ (define file-system-efi (let* ( (l-system-name (string-upcase system-name)) - (l-device (sovereign:devices:file-system-label "BOOT"))) + (l-device (sovereign:system:file-systems:file-system-label "BOOT"))) (gnu:system:file-systems:file-system - (inherit sovereign:devices:file-system/efi) + (inherit sovereign:system:file-systems:file-system/efi) (device l-device)))) (define file-system-root (let - ( (l-device (sovereign:devices:file-system-label system-name + ( (l-device (sovereign:system:file-systems:file-system-label system-name "root"))) (gnu:system:file-systems:file-system - (inherit sovereign:devices:file-system/root) + (inherit sovereign:system:file-systems:file-system/root) (device l-device)))) (define file-system/root-btrfs @@ -110,10 +110,10 @@ (define swap (let - ( (l-target (sovereign:devices:file-system-label system-name + ( (l-target (sovereign:system:file-systems:file-system-label system-name "swap"))) (gnu:system:file-systems:swap-space - (inherit sovereign:devices:swap/no-trim) + (inherit sovereign:system:file-systems:swap/no-trim) (target l-target)))) (define guix-offload-authorizations @@ -242,7 +242,7 @@ (bootloader (custom-bootloader-configuration bootloader-configuration-targets-rakan)) (label (sovereign:systems:operating-system-label* system-name gnu:system:this-operating-system)) - (keyboard-layout sovereign:devices:pl-keyboard-layout) + (keyboard-layout sovereign:systems:keyboard-layout) (initrd nongnu:system:linux-initrd:microcode-initrd) (initrd-modules (cons* "mei_me" gnu:system:linux-initrd:%base-initrd-modules)) -- cgit v1.3