diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-05-25 16:58:22 +0200 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-05-25 16:58:22 +0200 |
| commit | 2a34a174c96a3213fc7da4d31d978a974b9948a7 (patch) | |
| tree | caf77500f0ad99409009ad0eaf75df5f895a7dc4 | |
| parent | 498dfaa08dda8c5c6fc7f92114c3a958f129617c (diff) | |
drop data separation in ayase operating-system
| -rw-r--r-- | systems/ayase/system-configuration.scm | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/systems/ayase/system-configuration.scm b/systems/ayase/system-configuration.scm index a0fad16..e8680ff 100644 --- a/systems/ayase/system-configuration.scm +++ b/systems/ayase/system-configuration.scm @@ -11,12 +11,6 @@ (define bootloader-targets (list "/boot/efi")) -(define host-name - "ayase") - -(define locale - "pl_PL.utf8") - (define package-specifications (list "emacs" "emacs-exwm" @@ -34,9 +28,6 @@ (define swap-uuid "cc6bbf7c-e42a-4ac3-a9ae-3b14d3b4b841") -(define timezone - "Europe/Warsaw") - ;; ABSTRACTION 2 (define efi-partition @@ -44,9 +35,6 @@ (device (uuid "B4FB-CBD9" 'fat32)) (type "vfat"))) -(define keyboard-layout - (keyboard-layout "pl")) - (define marek-account (user-account (name "marek") (comment "Marek Paśnikowski") @@ -71,11 +59,6 @@ (define ayase-user-accounts (list marek-account)) -(define bootloader - (bootloader-configuration (bootloader grub-efi-bootloader) - (targets bootloader-targets) - (keyboard-layout keyboard-layout))) - (define main-swap (swap-space (target (uuid swap-uuid)))) @@ -88,11 +71,23 @@ (service tor-service-type) (service cups-service-type))) -;; PUBLIC +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define keyboard-layout + (keyboard-layout "pl")) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define bootloader + (bootloader-configuration (bootloader grub-efi-bootloader) + (targets bootloader-targets) + (keyboard-layout keyboard-layout))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (operating-system (bootloader bootloader) (keyboard-layout keyboard-layout) - (host-name host-name) + (host-name "ayase") (file-systems (append %base-file-systems ;; %distribution-file-systems ayase-file-systems)) @@ -102,7 +97,7 @@ (packages (append %base-packages ;; %distribution-packages system-packages)) - (timezone timezone) - (locale locale) + (timezone "Europe/Warsaw") + (locale "pl_PL.utf8") (services (append %distribution-services system-services))) |