diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-05-23 08:59:57 +0200 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-05-23 09:05:25 +0200 |
| commit | a144bd5046d1a70e0b07305f2520bc5a82cf61fe (patch) | |
| tree | 93101adfa10e6986054ec9cc559dabb70bf311bf | |
| parent | 89dfc4278d6220572b0234da33bb3916643fde80 (diff) | |
ayase: finally fix the keyboard-layoutayase-intro
| -rw-r--r-- | systems/ayase/guix-ayase.org | 14 | ||||
| -rw-r--r-- | systems/ayase/system-configuration.scm | 14 |
2 files changed, 10 insertions, 18 deletions
diff --git a/systems/ayase/guix-ayase.org b/systems/ayase/guix-ayase.org index e76b4dd..856b91b 100644 --- a/systems/ayase/guix-ayase.org +++ b/systems/ayase/guix-ayase.org @@ -25,8 +25,8 @@ (device (uuid "B4FB-CBD9" 'fat32)) (type "vfat"))) - (define keyboard - '(keyboard-layout "pl")) + (define keyboard-layout + (keyboard-layout "pl")) (define marek-account (user-account (name "marek") @@ -43,9 +43,6 @@ (device (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c" 'ext4)) (type "ext4"))) - (define xorg-configuration - '(xorg-configuration (keyboard-layout keyboard))) - ;; ABSTRACTION 1 (define ayase-file-systems @@ -58,7 +55,7 @@ (define bootloader (bootloader-configuration (bootloader grub-efi-bootloader) (targets (list "/boot/efi")) - (keyboard-layout keyboard))) + (keyboard-layout keyboard-layout))) (define main-swap (swap-space (target (uuid "cc6bbf7c-e42a-4ac3-a9ae-3b14d3b4b841")))) @@ -71,13 +68,12 @@ (define system-services (list (service openssh-service-type) (service tor-service-type) - (service cups-service-type) - (set-xorg-configuration xorg-configuration))) + (service cups-service-type))) ;; PUBLIC (operating-system (bootloader bootloader) - (keyboard-layout keyboard) + (keyboard-layout keyboard-layout) (host-name "ayase") (file-systems (append %base-file-systems ;; %distribution-file-systems diff --git a/systems/ayase/system-configuration.scm b/systems/ayase/system-configuration.scm index 7ac5a43..7e050bf 100644 --- a/systems/ayase/system-configuration.scm +++ b/systems/ayase/system-configuration.scm @@ -15,8 +15,8 @@ (device (uuid "B4FB-CBD9" 'fat32)) (type "vfat"))) -(define keyboard - '(keyboard-layout "pl")) +(define keyboard-layout + (keyboard-layout "pl")) (define marek-account (user-account (name "marek") @@ -33,9 +33,6 @@ (device (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c" 'ext4)) (type "ext4"))) -(define xorg-configuration - '(xorg-configuration (keyboard-layout keyboard))) - ;; ABSTRACTION 1 (define ayase-file-systems @@ -48,7 +45,7 @@ (define bootloader (bootloader-configuration (bootloader grub-efi-bootloader) (targets (list "/boot/efi")) - (keyboard-layout keyboard))) + (keyboard-layout keyboard-layout))) (define main-swap (swap-space (target (uuid "cc6bbf7c-e42a-4ac3-a9ae-3b14d3b4b841")))) @@ -61,13 +58,12 @@ (define system-services (list (service openssh-service-type) (service tor-service-type) - (service cups-service-type) - (set-xorg-configuration xorg-configuration))) + (service cups-service-type))) ;; PUBLIC (operating-system (bootloader bootloader) - (keyboard-layout keyboard) + (keyboard-layout keyboard-layout) (host-name "ayase") (file-systems (append %base-file-systems ;; %distribution-file-systems |