diff options
Diffstat (limited to 'system-configuration.scm')
| -rw-r--r-- | system-configuration.scm | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/system-configuration.scm b/system-configuration.scm index bd8fd8d..d4a8dc6 100644 --- a/system-configuration.scm +++ b/system-configuration.scm @@ -15,62 +15,62 @@ (define keyboard-layout (keyboard-layout "pl")) -(define mapped-devices - `(,(mapped-device (source (uuid "887ac37f-2919-41a0-a62a-e1ff5ea2d6cc")) - (target "aisaka-root") - (type luks-device-mapping)))) - (operating-system (locale "pl_PL.utf8") (timezone "Europe/Warsaw") (keyboard-layout keyboard-layout) (host-name "aisaka") (users (cons* (user-account (name "marek") - (comment "Marek Paśnikowski") - (group "users") - (home-directory "/home/marek") - (supplementary-groups '("audio" - "netdev" - "tor" - "video" - "wheel"))) - %base-user-accounts)) + (comment "Marek Paśnikowski") + (group "users") + (home-directory "/home/marek") + (supplementary-groups '("audio" + "netdev" + "tor" + "video" + "wheel"))) + %base-user-accounts)) (packages (append (map (compose list - specification->package+output) - '("netcat-openbsd" - "nss-certs" - "trezord" - "trezord-udev-rules")) - %base-packages)) + specification->package+output) + '("netcat-openbsd" + "nss-certs" + "trezord" + "trezord-udev-rules")) + %base-packages)) (services (cons* ssh-service - (service cups-service-type - (cups-configuration (extensions `(,cups-filters - ,epson-inkjet-printer-escpr)) - (web-interface? #t))) - (service tor-service-type - (tor-configuration (config-file (local-file "torrc")) - (control-socket? #t))) - (udev-rules-service 'trezord trezord-udev-rules) - (modify-services %desktop-services - (elogind-service-type - configuration => - (elogind-configuration - (inherit configuration) - (handle-lid-switch 'ignore))) - (delete gdm-service-type)))) + (service cups-service-type + (cups-configuration (extensions `(,cups-filters + ,epson-inkjet-printer-escpr)) + (web-interface? #t))) + (service tor-service-type + (tor-configuration (config-file (local-file "torrc")) + (control-socket? #t))) + (udev-rules-service 'trezord trezord-udev-rules) + (modify-services %desktop-services + (elogind-service-type + configuration => + (elogind-configuration + (inherit configuration) + (handle-lid-switch 'ignore))) + (delete gdm-service-type)))) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sda")) - (keyboard-layout keyboard-layout))) + (targets '("/dev/sda")) + (keyboard-layout keyboard-layout))) (swap-devices `(,(swap-space (target (uuid "73bed3f9-be07-40ad-a228-577cd24f2e1d"))))) - (mapped-devices mapped-devices) + (mapped-devices + `(,(mapped-device + (source (uuid "887ac37f-2919-41a0-a62a-e1ff5ea2d6cc")) + (target "aisaka-root") + (type luks-device-mapping)))) (file-systems - (cons* (file-system - (mount-point "/") - (device "/dev/mapper/aisaka-root") - (type "btrfs") - (dependencies mapped-devices)) - (file-system (mount-point "/boot") - (device (uuid "4f77b5fc-56ad-43ae-b6ec-e5adc8c48587")) - (type "ext4")) - %base-file-systems))) + (append %base-file-systems + `(,(file-system + (mount-point "/") + (device "/dev/mapper/aisaka-root") + (type "btrfs") + (dependencies mapped-devices)) + ,(file-system + (mount-point "/boot") + (device (uuid "4f77b5fc-56ad-43ae-b6ec-e5adc8c48587")) + (type "ext4")))))) |