summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system-configuration.scm66
1 files changed, 35 insertions, 31 deletions
diff --git a/system-configuration.scm b/system-configuration.scm
index f27d047..5e4e148 100644
--- a/system-configuration.scm
+++ b/system-configuration.scm
@@ -14,18 +14,39 @@
( define keyboard-layouts ( keyboard-layout "pl" ) )
( define user-accounts
- ( cons*
- ( user-account
- ( name "marek" )
- ( comment "Marek Paśnikowski" )
- ( group "users" )
- ( home-directory "/home/marek" )
- ( supplementary-groups
- '("wheel"
- "netdev"
- "audio"
- "video" ) ) )
- %base-user-accounts ) )
+ ( cons*
+ ( user-account
+ ( name "marek" )
+ ( comment "Marek Paśnikowski" )
+ ( group "users" )
+ ( home-directory "/home/marek" )
+ ( supplementary-groups
+ '("wheel"
+ "netdev"
+ "audio"
+ "video" ) ) )
+ %base-user-accounts ) )
+
+( define package-list
+ ( append
+ ( map
+ ( compose list specification->package+output )
+ ( list
+ "nss-certs"
+ "trezord"
+ "trezord-udev-rules" ) )
+ %base-packages ) )
+
+( define service-list
+ ( append
+ ( list
+ ( service cups-service-type )
+ ( service openssh-service-type )
+ ( service gnome-desktop-service-type )
+ ( set-xorg-configuration
+ ( xorg-configuration
+ ( keyboard-layout keyboard-layouts ) ) ) )
+ %desktop-services ) )
( operating-system
( locale "pl_PL.utf8" )
@@ -33,25 +54,8 @@
( keyboard-layout keyboard-layouts )
( host-name "aisaka" )
( users user-accounts )
- ( packages
- ( append
- ( map
- ( compose list specification->package+output )
- ( list
- "nss-certs"
- "trezord"
- "trezord-udev-rules" ) )
- %base-packages ) )
- ( services
- ( append
- ( list
- ( service cups-service-type )
- ( service openssh-service-type )
- ( service gnome-desktop-service-type )
- ( set-xorg-configuration
- ( xorg-configuration
- ( keyboard-layout keyboard-layout ) ) ) )
- %desktop-services ) )
+ ( packages package-list )
+ ( services service-list )
( bootloader
( bootloader-configuration
( bootloader grub-bootloader )