From 9b0a48a0cae8b93c64cc9f0da322fd72c8a70b34 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Fri, 26 Jul 2024 11:33:45 +0200 Subject: feat!(system): implement keyboard-layout --- machines/portable-bios.scm | 5 +++-- systems/mcdowell.scm | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/machines/portable-bios.scm b/machines/portable-bios.scm index a5c03c1..416960d 100644 --- a/machines/portable-bios.scm +++ b/machines/portable-bios.scm @@ -8,12 +8,13 @@ ) ;; bootloader-configuration -(define-public bootloader-configuration* +(define-public (bootloader-configuration* keyboard-layout*) (let ((bootloader* grub-bootloader) (bootloader-targets (list "/dev/sdb")) ; TODO: generalize the target ) (bootloader-configuration (bootloader bootloader*) - (targets bootloader-targets)))) + (targets bootloader-targets) + (keyboard-layout keyboard-layout*)))) ;; string -> (file-system) (define-public (file-systems* host-name*) diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm index 7994ac8..323e2ec 100644 --- a/systems/mcdowell.scm +++ b/systems/mcdowell.scm @@ -1,6 +1,7 @@ (define-module (systems mcdowell) #:use-module (gnu services) ; service #:use-module (gnu services guix) ; guix-home-service-type + #:use-module (gnu system keyboard) ; keyboard-layout #:use-module (machines portable-bios) ; bootloader-configuration* ; file-systems* ; firmware* @@ -27,9 +28,11 @@ (guix-home (service guix-home-service-type home-environments)) + (keyboard-layout* (keyboard-layout "pl")) (services* (list guix-home))) (%suweren-operating-system kernel* - bootloader-configuration* + (bootloader-configuration* keyboard-layout*) + keyboard-layout* initrd* firmware* host-name* -- cgit v1.2.3