From 15575633f1e40563fe92c0e1758481abf1a628c7 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Mon, 7 Oct 2024 23:55:18 +0200
Subject: refactor(izumi): isolate (bootloader-izumi)

---
 systems/izumi/izumi.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'systems/izumi')

diff --git a/systems/izumi/izumi.scm b/systems/izumi/izumi.scm
index e1c1f8b..f1740b8 100644
--- a/systems/izumi/izumi.scm
+++ b/systems/izumi/izumi.scm
@@ -73,6 +73,9 @@
 
 ;;;???????????????????????????????????????????????????????????????????
 
+(define keyboard-layout-izumi
+  (keyboard-layout "pl"))
+
 (define (mapped-devices-izumi)
   (use-modules (gnu system mapped-devices))
   (list (mapped-device (source "/dev/sda2")
@@ -84,6 +87,11 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define (bootloader-izumi)
+  (bootloader-configuration (bootloader grub-efi-bootloader)
+                            (keyboard-layout keyboard-layout-izumi)
+                            (targets (list "/boot/efi"))))
+
 (define (file-systems-izumi)
   (use-modules (gnu system file-systems))
   (append %base-file-systems
@@ -105,9 +113,6 @@
 (define host-name-izumi
   "izumi")
 
-(define keyboard-layout-izumi
-  (keyboard-layout "pl"))
-
 (define services-izumi
   (append
    ( modify-services
@@ -463,11 +468,7 @@
 
 (define (operating-system-izumi)
   (operating-system
-   ( bootloader
-     ( bootloader-configuration
-       ( bootloader grub-efi-bootloader )
-       ( keyboard-layout keyboard-layout-izumi )
-       ( targets ( list "/boot/efi" ) ) ) )
+   (bootloader (bootloader-izumi))
    (kernel linux)
    (keyboard-layout keyboard-layout-izumi)
    (initrd microcode-initrd)
-- 
cgit v1.2.3