From 99e8adabc03d809afb2410c3db2c2151b1e72bd5 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Sat, 25 May 2024 17:03:31 +0200 Subject: abstract away complex elements from ayase operating-system --- systems/ayase/system-configuration.scm | 37 ++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 11 deletions(-) (limited to 'systems') diff --git a/systems/ayase/system-configuration.scm b/systems/ayase/system-configuration.scm index e8680ff..c88c2e2 100644 --- a/systems/ayase/system-configuration.scm +++ b/systems/ayase/system-configuration.scm @@ -83,21 +83,36 @@ (targets bootloader-targets) (keyboard-layout keyboard-layout))) +(define file-systems + (append %base-file-systems + ;; %distribution-file-systems + ayase-file-systems)) + +(define packages + (append %base-packages + ;; %distribution-packages + system-packages)) + +(define services + (append %distribution-services + system-services)) + +(define swap-devices + (list main-swap)) + +(define users + (append %base-user-accounts + ayase-user-accounts)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (operating-system (bootloader bootloader) (keyboard-layout keyboard-layout) (host-name "ayase") - (file-systems (append %base-file-systems - ;; %distribution-file-systems - ayase-file-systems)) - (swap-devices (list main-swap)) - (users (append %base-user-accounts - ayase-user-accounts)) - (packages (append %base-packages - ;; %distribution-packages - system-packages)) + (file-systems file-systems) + (swap-devices swap-devices) + (users users) + (packages packages) (timezone "Europe/Warsaw") (locale "pl_PL.utf8") - (services (append %distribution-services - system-services))) + (services services)) -- cgit v1.2.3