all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#59983] [PATCH] home: Let user configure XDG base directories.
@ 2022-12-12  3:00 Antero Mejr via Guix-patches via
  2022-12-13  4:25 ` Andrew Tropin
  0 siblings, 1 reply; 4+ messages in thread
From: Antero Mejr via Guix-patches via @ 2022-12-12  3:00 UTC (permalink / raw)
  To: 59983; +Cc: Antero Mejr, ludo

* gnu/home.scm (home-environment)[base-xdg-configuration]: New field.
* gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation): Make
XDG_RUNTIME_DIR directory if the configuration changes it from the default.
---
Allows making a runtime dir at ~/.local/runtime (or any other dir),
so users don't have to set up elogind or other greeters/PAM modules.

 gnu/home.scm              | 9 +++++++--
 gnu/home/services/xdg.scm | 7 ++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/home.scm b/gnu/home.scm
index c95d1e0818..f100b575e3 100644
--- a/gnu/home.scm
+++ b/gnu/home.scm
@@ -39,6 +39,7 @@ (define-module (gnu home)
             home-environment-essential-services
             home-environment-services
             home-environment-location
+            home-environment-base-xdg-configuration
 
             home-environment-with-provenance
 
@@ -71,7 +72,10 @@ (define-record-type* <home-environment> home-environment
   (location           home-environment-location            ; <location>
                       (default (and=> (current-source-location)
                                       source-properties->location))
-                      (innate)))
+                      (innate))
+
+  (base-xdg-configuration home-environment-base-xdg-configuration
+                          (default (home-xdg-base-directories-configuration))))
 
 (define (home-environment-default-essential-services he)
   "Return the list of essential services for home environment."
@@ -83,7 +87,8 @@ (define (home-environment-default-essential-services he)
    (service home-symlink-manager-service-type)
 
    (service home-fontconfig-service-type)
-   (service home-xdg-base-directories-service-type)
+   (service home-xdg-base-directories-service-type
+            (home-environment-base-xdg-configuration he))
    (service home-shell-profile-service-type)
 
    (service home-service-type)
diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
index 865f8b81d7..b62580461e 100644
--- a/gnu/home/services/xdg.scm
+++ b/gnu/home/services/xdg.scm
@@ -133,7 +133,12 @@ (define (ensure-xdg-base-dirs-on-activation config)
                         (configuration-field-name field) 'upper))))
                  ;; XDG_RUNTIME_DIR shouldn't be created during activation
                  ;; and will be provided by elogind or other service.
-                 (and (not (string=? "XDG_RUNTIME_DIR" variable))
+                 ;; But if the user changes the value from the default,
+                 ;; then we can make XDG_RUNTIME_DIR.
+                 (and (or (not (string=? "XDG_RUNTIME_DIR" variable))
+                          (not (string=? ((configuration-field-getter field)
+                                          config)
+                                         "${XDG_RUNTIME_DIR:-/run/user/$UID}")))
                       variable)))
              home-xdg-base-directories-configuration-fields)))
 
-- 
2.38.1





^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-08-07  6:58 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-12  3:00 [bug#59983] [PATCH] home: Let user configure XDG base directories Antero Mejr via Guix-patches via
2022-12-13  4:25 ` Andrew Tropin
2022-12-13 15:53   ` Antero Mejr via Guix-patches via
2023-08-07  6:57     ` Andrew Tropin

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.