From d905a23aa83ece2dd4a9d8d411d518781e174f75 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Fri, 4 Oct 2024 03:11:09 +0200 Subject: refactor(systems): transfer locale implementation to suweren module --- systems/izumi/izumi.org | 18 +++--------------- systems/izumi/system-configuration.scm | 18 +++--------------- 2 files changed, 6 insertions(+), 30 deletions(-) (limited to 'systems/izumi') 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 -- cgit v1.2.3