From 84deca651fec52ac9b5224b82bbf45a37a5deaaa Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Fri, 1 Dec 2023 14:32:56 +0100 Subject: [PATCH] . --- config.org | 4 +++- config.scm | 23 +++++++++++++---------- library.org | 5 +++-- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/config.org b/config.org index 78fa974..3b954f7 100644 --- a/config.org +++ b/config.org @@ -10,6 +10,8 @@ #+NAME: module-list - gnu +- gnu image +- gnu services authentication - gnu services base - gnu services dbus - gnu services desktop @@ -21,7 +23,7 @@ - gnu system nss #+begin_src scheme :noweb yes :exports none :results code pp :tangle config.scm - <> + <> #+end_src ** Service Modules diff --git a/config.scm b/config.scm index aa98fc0..de18800 100644 --- a/config.scm +++ b/config.scm @@ -1,13 +1,16 @@ -(use-modules gnu - (gnu services base) - (gnu services dbus) - (gnu services desktop) - (gnu services linux) - (gnu services networking) - (gnu services pm) - (gnu services virtualization) - (gnu services xorg) - (gnu system nss)) +(use-modules + (gnu) + (gnu image) + (gnu services authentication) + (gnu services base) + (gnu services dbus) + (gnu services desktop) + (gnu services linux) + (gnu services networking) + (gnu services pm) + (gnu services virtualization) + (gnu services xorg) + (gnu system nss)) (use-service-modules desktop xorg) diff --git a/library.org b/library.org index 07e1036..304504f 100644 --- a/library.org +++ b/library.org @@ -7,11 +7,12 @@ This library contains code blocks to be used by other files in this repository. Converting org lists into guix ~use-~ calls. #+NAME: list-to-use -#+begin_src emacs-lisp :var use-call="use-modules" :var entries='() :results code pp +#+begin_src emacs-lisp :var use-call="use-modules" :var entries='() :var all-parens=0 :results code pp `(,(make-symbol use-call) ,@(mapcar (lambda (x) (let ((splits (split-string x))) - (if (length= splits 1) + (if (and (length= splits 1) + (= 0 all-parens)) (make-symbol (car splits)) (mapcar (lambda (y) (make-symbol y)) splits))))