diff options
| -rw-r--r-- | systems/akashi.scm | 2 | ||||
| -rw-r--r-- | systems/ayase.scm | 18 | ||||
| -rw-r--r-- | systems/izumi/izumi.org | 18 | ||||
| -rw-r--r-- | systems/izumi/system-configuration.scm | 18 |
4 files changed, 11 insertions, 45 deletions
diff --git a/systems/akashi.scm b/systems/akashi.scm index ae4f96a..0a4ebe3 100644 --- a/systems/akashi.scm +++ b/systems/akashi.scm @@ -58,6 +58,8 @@ (swap-devices (swap-devices* host-name*)) (users (users)) (timezone timezone*) + (locale polish-locale-string) + (locale-definitions %suweren-locale-definitions) (services (services)) (sudoers-file %sudoers-specification*)))) diff --git a/systems/ayase.scm b/systems/ayase.scm index 9281f8d..49c6b95 100644 --- a/systems/ayase.scm +++ b/systems/ayase.scm @@ -14,9 +14,6 @@ "-swap" number))) -(define polish-locale-string - "pl_PL.utf8") - (define root-filesystem-uuid ((@ (gnu system file-systems) uuid) "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c")) @@ -69,11 +66,6 @@ ((@ (gnu services) service) openssh-service-type)) -(define polish-locale - ((@ (gnu system locale) locale-definition) - (name polish-locale-string) - (source "pl_PL"))) - (define root-partition ((@ (gnu system file-systems) file-system) (mount-point "/") @@ -118,11 +110,6 @@ (list root-partition efi-partition))) -(define (locale-definitions) - (use-modules (gnu system locale)) - (append %default-locale-definitions - (list polish-locale))) - (define services (append (@ (suweren services) %distribution-services) (list (gc-workaround-service) @@ -151,7 +138,8 @@ (use-modules (nongnu packages linux) (nongnu system linux-initrd) (gnu system keyboard) - (suweren commons sudoers)) + (suweren commons sudoers) + (suweren system)) ((@ (gnu system) operating-system) (kernel linux) (bootloader (bootloader)) @@ -165,7 +153,7 @@ (users (users)) (timezone "Europe/Warsaw") (locale polish-locale-string) - (locale-definitions (locale-definitions)) + (locale-definitions %suweren-locale-definitions) (services services) (sudoers-file %sudoers-specification*))) diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org index f04e8d1..b712c71 100644 --- a/systems/izumi/izumi.org +++ b/systems/izumi/izumi.org @@ -20,7 +20,8 @@ ( guix records ) ( ice-9 match ) ( nongnu packages linux ) - ( nongnu system linux-initrd ) ) + ( nongnu system linux-initrd ) + (suweren system)) ( use-package-modules admin certs kde-frameworks kde-multimedia kde-pim kde-plasma kde-utils mail @@ -54,19 +55,6 @@ (define hosts-izumi (local-file "system-files/hosts")) - (define polish-locale-string - "pl_PL.utf8") - - (define polish-locale - ((@ (gnu system locale) locale-definition) - (name polish-locale-string) - (source "pl_PL"))) - - (define (locale-definitions) - (use-modules (gnu system locale)) - (append %default-locale-definitions - (list polish-locale))) - ( operating-system ( bootloader ( bootloader-configuration @@ -106,7 +94,7 @@ ( kernel linux ) ( keyboard-layout ( keyboard-layout "pl" ) ) (locale polish-locale-string) - (locale-definitions (locale-definitions)) + (locale-definitions %suweren-locale-definitions) ( services ( append ( modify-services diff --git a/systems/izumi/system-configuration.scm b/systems/izumi/system-configuration.scm index 77bcb8e..ef0e3f1 100644 --- a/systems/izumi/system-configuration.scm +++ b/systems/izumi/system-configuration.scm @@ -10,7 +10,8 @@ ( guix records ) ( ice-9 match ) ( nongnu packages linux ) - ( nongnu system linux-initrd ) ) + ( nongnu system linux-initrd ) + (suweren system)) ( use-package-modules admin certs kde-frameworks kde-multimedia kde-pim kde-plasma kde-utils mail @@ -44,19 +45,6 @@ (define hosts-izumi (local-file "system-files/hosts")) -(define polish-locale-string - "pl_PL.utf8") - -(define polish-locale - ((@ (gnu system locale) locale-definition) - (name polish-locale-string) - (source "pl_PL"))) - -(define (locale-definitions) - (use-modules (gnu system locale)) - (append %default-locale-definitions - (list polish-locale))) - ( operating-system ( bootloader ( bootloader-configuration @@ -96,7 +84,7 @@ ( kernel linux ) ( keyboard-layout ( keyboard-layout "pl" ) ) (locale polish-locale-string) - (locale-definitions (locale-definitions)) + (locale-definitions %suweren-locale-definitions) ( services ( append ( modify-services |