From f6903fe1fac375631d7e8b973ed9287f3e9116a4 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Mon, 18 Dec 2023 01:27:14 +0100 Subject: [PATCH] . --- config.org | 28 +++++++++++++++------------- config.scm | 14 ++++++++------ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/config.org b/config.org index 7bdfe2d..dda29c1 100644 --- a/config.org +++ b/config.org @@ -43,8 +43,10 @@ This is to be run after setting up the partitions. - gnu - gnu image - gnu packages gnome +- gnu services admin - gnu services authentication - gnu services base +- gnu services configuration - gnu services dbus - gnu services desktop - gnu services linux @@ -166,12 +168,13 @@ This adds the Nonguix channel. (append <> <> + (list polkit-wheel-service) (list <>) (list <>) (list - <>)) + <>) )) #+end_src @@ -180,17 +183,16 @@ This adds the Nonguix channel. These services are unmodified, or have just few settings. #+NAME: root-simple-services -| Service | Options | -|--------------------+------------------------------------------------------| -| tlp | () | -| thermald | ((adaptive? #t)) | -| bluetooth | () | -| earlyoom | ((minimum-available-memory 5) (minimum-free-swap 5)) | -| inputattach | () | -| libvirt | ((unix-sock-group "libvirt")) | -| fstrim | () | -| fprintd | () | -| polkit | ((polkit-wheel-service)) | +| Service | Options | +|-------------+------------------------------------------------------| +| tlp | () | +| thermald | ((adaptive? #t)) | +| bluetooth | () | +| earlyoom | ((minimum-available-memory 5) (minimum-free-swap 5)) | +| inputattach | () | +| libvirt | ((unix-sock-group "libvirt")) | +| fstrim | () | +| fprintd | () | #+NAME: root-simple-service-block #+begin_src scheme :noweb yes :exports none :results output @@ -204,7 +206,7 @@ These services are unmodified, or have just few settings. (service unattended-upgrade-service-type (unattended-upgrade-configuration (schedule "5 12 * * 1") - (channels + #;(channels <>))) #+end_src diff --git a/config.scm b/config.scm index 7f00c72..0bacc32 100644 --- a/config.scm +++ b/config.scm @@ -4,8 +4,10 @@ ;; - gnu ;; - gnu image ;; - gnu packages gnome +;; - gnu services admin ;; - gnu services authentication ;; - gnu services base +;; - gnu services configuration ;; - gnu services dbus ;; - gnu services desktop ;; - gnu services linux @@ -23,8 +25,10 @@ (gnu) (gnu image) (gnu packages gnome) + (gnu services admin) (gnu services authentication) (gnu services base) + (gnu services configuration) (gnu services dbus) (gnu services desktop) (gnu services linux) @@ -173,11 +177,9 @@ (fstrim-configuration)) (service fprintd-service-type - (fprintd-configuration)) - #;(service - polkit-service-type - (polkit-configuration (polkit-wheel-service)))) + (fprintd-configuration))) + (list polkit-wheel-service) (list (service greetd-service-type (greetd-configuration @@ -213,7 +215,7 @@ (service unattended-upgrade-service-type (unattended-upgrade-configuration (schedule "5 12 * * 1") - (channels + #;(channels (cons* (channel (name 'nonguix) (url "https://gitlab.com/nonguix/nonguix") @@ -226,7 +228,7 @@ (channel (name 'ziltis-channel) (url "https://gitea.lyrion.ch/zilti/guixchannel")) - %default-channels)))))) + %default-channels))))) )) (name-service-switch %mdns-host-lookup-nss)) ;; Operating System:1 ends here