summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--systems/ayase/guix-ayase.org9
-rw-r--r--systems/ayase/system-configuration.scm9
2 files changed, 6 insertions, 12 deletions
diff --git a/systems/ayase/guix-ayase.org b/systems/ayase/guix-ayase.org
index c2848aa..97452b6 100644
--- a/systems/ayase/guix-ayase.org
+++ b/systems/ayase/guix-ayase.org
@@ -16,9 +16,6 @@
#:use-module (gnu services ssh)
#:use-module (gnu services xorg))
- ;; (define keyboard-layout
- ;; (keyboard-layout "pl"))
-
(define main-memory
'(target (uuid "cc6bbf7c-e42a-4ac3-a9ae-3b14d3b4b841")))
@@ -33,13 +30,13 @@
"video"))))
(define xorg-configuration
- (xorg-configuration (keyboard-layout keyboard-layout)))
+ '(xorg-configuration (keyboard-layout keyboard-layout)))
(define ayase-user-accounts
(list marek-account))
(define bootloader
- (bootloader-configuration (bootloader grub-efi-bootloader)
+ '(bootloader-configuration (bootloader grub-efi-bootloader)
(targets (list "/boot/efi"))
(keyboard-layout keyboard-layout)))
@@ -68,7 +65,7 @@
(set-xorg-configuration xorg-configuration)))
(operating-system (bootloader bootloader)
- (keyboard-layout (keyboard-layout "os"))
+ (keyboard-layout (keyboard-layout "pl"))
(host-name "ayase")
(file-systems (append %base-file-systems
efi-partition
diff --git a/systems/ayase/system-configuration.scm b/systems/ayase/system-configuration.scm
index 58c12e9..a99b7f9 100644
--- a/systems/ayase/system-configuration.scm
+++ b/systems/ayase/system-configuration.scm
@@ -6,9 +6,6 @@
#:use-module (gnu services ssh)
#:use-module (gnu services xorg))
-;; (define keyboard-layout
-;; (keyboard-layout "pl"))
-
(define main-memory
'(target (uuid "cc6bbf7c-e42a-4ac3-a9ae-3b14d3b4b841")))
@@ -23,13 +20,13 @@
"video"))))
(define xorg-configuration
- (xorg-configuration (keyboard-layout keyboard-layout)))
+ '(xorg-configuration (keyboard-layout keyboard-layout)))
(define ayase-user-accounts
(list marek-account))
(define bootloader
- (bootloader-configuration (bootloader grub-efi-bootloader)
+ '(bootloader-configuration (bootloader grub-efi-bootloader)
(targets (list "/boot/efi"))
(keyboard-layout keyboard-layout)))
@@ -58,7 +55,7 @@
(set-xorg-configuration xorg-configuration)))
(operating-system (bootloader bootloader)
- (keyboard-layout (keyboard-layout "os"))
+ (keyboard-layout (keyboard-layout "pl"))
(host-name "ayase")
(file-systems (append %base-file-systems
efi-partition