summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Paśnikowski <marekpasnikowski@protonmail.com>2023-02-07 13:20:04 +0100
committerMarek Paśnikowski <marek@marekpasnikowski.pl>2023-02-07 13:20:04 +0100
commitb48b243873e50395e9954edd4f6b3cfeecc7d57a (patch)
treebad1ccdc2a6c6700b553c9dcc933c7c918aab488
parentc7a1a3562e18fb2bcabc22edee8034bb2d3b36d0 (diff)
Reindent system services
-rw-r--r--aisaka.org37
-rw-r--r--system-configuration.scm61
2 files changed, 50 insertions, 48 deletions
diff --git a/aisaka.org b/aisaka.org
index 9e95266..f447702 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -52,24 +52,25 @@ https://guix.gnu.org/en/manual/devel/en/html_node/System-Configuration.html
"nss-certs"
"ntfs-3g"))
%base-packages))
- (services (cons* <<ssh-system-service>>
- <<trezor-system-packages>>
- (service cups-service-type
- (cups-configuration (extensions `(,cups-filters
- ,epson-inkjet-printer-escpr))
- (web-interface? #t)))
- (service git-daemon-service-type)
- (service gnome-desktop-service-type)
- (service tor-service-type
- (tor-configuration (config-file (local-file "torrc"))
- (control-socket? #t)))
- <<trezor-udev-rules>>
- (modify-services %desktop-services
- (elogind-service-type
- configuration =>
- (elogind-configuration
- (inherit configuration)
- (handle-lid-switch 'ignore))))))
+ (services (cons*
+ <<ssh-system-service>>
+ <<trezor-system-packages>>
+ (service cups-service-type
+ (cups-configuration (extensions `(,cups-filters
+ ,epson-inkjet-printer-escpr))
+ (web-interface? #t)))
+ (service git-daemon-service-type)
+ (service gnome-desktop-service-type)
+ (service tor-service-type
+ (tor-configuration (config-file (local-file "torrc"))
+ (control-socket? #t)))
+ <<trezor-udev-rules>>
+ (modify-services %desktop-services
+ (elogind-service-type
+ configuration =>
+ (elogind-configuration
+ (inherit configuration)
+ (handle-lid-switch 'ignore))))))
(bootloader (bootloader-configuration (bootloader grub-bootloader)
(targets '("/dev/sda"))
(keyboard-layout keyboard-layout)))
diff --git a/system-configuration.scm b/system-configuration.scm
index feeddc4..527d921 100644
--- a/system-configuration.scm
+++ b/system-configuration.scm
@@ -39,36 +39,37 @@
"nss-certs"
"ntfs-3g"))
%base-packages))
- (services (cons* (service openssh-service-type)
- (service
- (service-type
- (name 'trezor-system-packages)
- (extensions
- (list
- (service-extension profile-service-type
- (lambda (_)
- (map specification->package
- (list
- "trezord"
- "trezord-udev-rules"))))))
- (description "TrezorD packages needed by the system.")
- (default-value #f)))
- (service cups-service-type
- (cups-configuration (extensions `(,cups-filters
- ,epson-inkjet-printer-escpr))
- (web-interface? #t)))
- (service git-daemon-service-type)
- (service gnome-desktop-service-type)
- (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))))))
+ (services (cons*
+ (service openssh-service-type)
+ (service
+ (service-type
+ (name 'trezor-system-packages)
+ (extensions
+ (list
+ (service-extension profile-service-type
+ (lambda (_)
+ (map specification->package
+ (list
+ "trezord"
+ "trezord-udev-rules"))))))
+ (description "TrezorD packages needed by the system.")
+ (default-value #f)))
+ (service cups-service-type
+ (cups-configuration (extensions `(,cups-filters
+ ,epson-inkjet-printer-escpr))
+ (web-interface? #t)))
+ (service git-daemon-service-type)
+ (service gnome-desktop-service-type)
+ (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))))))
(bootloader (bootloader-configuration (bootloader grub-bootloader)
(targets '("/dev/sda"))
(keyboard-layout keyboard-layout)))