summaryrefslogtreecommitdiff
path: root/system-configuration.scm
diff options
context:
space:
mode:
authorMarek Paśnikowski <marekpasnikowski@protonmail.com>2022-07-21 04:32:01 +0200
committerMarek Paśnikowski <marekpasnikowski@protonmail.com>2022-07-21 04:32:01 +0200
commitaaca1164a80c00e6bdda8b2bc8b06f588e92bb19 (patch)
tree9f2b7b7ecb84b611858b1c81375b153c7a7bbd09 /system-configuration.scm
parent23b2526f25fb67bbf0a7962ad7877685c2ef8d0e (diff)
Complete Refactor
Diffstat (limited to 'system-configuration.scm')
-rw-r--r--system-configuration.scm90
1 files changed, 29 insertions, 61 deletions
diff --git a/system-configuration.scm b/system-configuration.scm
index 5e4e148..38091a3 100644
--- a/system-configuration.scm
+++ b/system-configuration.scm
@@ -1,72 +1,41 @@
-;; This is an operating system configuration generated
-;; by the graphical installer.
+( use-modules ( gnu ) )
-( use-modules
- ( gnu ) )
-
-( use-service-modules
- cups
- desktop
- networking
- ssh
- xorg )
-
-( 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 ) )
-
-( 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 ) )
+( use-service-modules cups desktop networking ssh xorg )
( operating-system
( locale "pl_PL.utf8" )
( timezone "Europe/Warsaw" )
- ( keyboard-layout keyboard-layouts )
+ ( keyboard-layout ( keyboard-layout "pl" ) )
( host-name "aisaka" )
- ( users user-accounts )
- ( packages package-list )
- ( services service-list )
+ ( users
+ ( cons*
+ ( user-account
+ ( name "marek" )
+ ( comment "Marek Paśnikowski" )
+ ( group "users" )
+ ( home-directory "/home/marek" )
+ ( supplementary-groups '( "wheel" "netdev" "audio" "video" ) ) )
+ %base-user-accounts ) )
+ ( packages
+ ( append
+ ( map
+ ( compose list specification->package+output )
+ ( list "guile-spec" "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 ) )
( bootloader
( bootloader-configuration
( bootloader grub-bootloader )
- ( targets
- ( list "/dev/sda" ) )
+ ( targets ( list "/dev/sda" ) )
( keyboard-layout keyboard-layout ) ) )
- ( swap-devices
- ( list
- ( swap-space
- ( target
- ( uuid "73bed3f9-be07-40ad-a228-577cd24f2e1d" ) ) ) ) )
+ ( swap-devices ( list ( swap-space ( target ( uuid "73bed3f9-be07-40ad-a228-577cd24f2e1d" ) ) ) ) )
( mapped-devices
( list
( mapped-device
@@ -83,7 +52,6 @@
( dependencies mapped-devices ) )
( file-system
( mount-point "/boot" )
- ( device
- ( uuid "4f77b5fc-56ad-43ae-b6ec-e5adc8c48587" 'ext4 ) )
+ ( device ( uuid "4f77b5fc-56ad-43ae-b6ec-e5adc8c48587" 'ext4 ) )
( type "ext4" ) )
%base-file-systems ) ) )