From 65af293c3736b2147c0af764414f2efe720e521e Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Thu, 14 Dec 2023 11:02:51 +0800
Subject: services: xorg: ‘dbus-daemon-wrapper’ handles Home profile.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/services/xorg.scm (dbus-daemon-wrapper): Handle Home profile.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Change-Id: Ib2f2330b7ea017ddf33d636de71aaa1c316808cb
---
 gnu/services/xorg.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'gnu')

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index f8cf9f25b6..1ee15ea90c 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -981,6 +981,11 @@ argument.")))
                 (lambda (pw)
                   (string-append (passwd:dir pw) "/.guix-profile"))))
 
+       (define home-profile
+         (and=> (getpw (getuid))
+                (lambda (pw)
+                  (string-append (passwd:dir pw) "/.guix-home/profile"))))
+
        ;; If we are able to find the user's profile, we can add it to
        ;; the search paths set below.  We need to do this so that D-Bus
        ;; can start services installed by the user.  This allows
@@ -988,9 +993,13 @@ argument.")))
        ;; 'evolution') to work even if those services are only available
        ;; in the user's profile.  See <https://bugs.gnu.org/35267>.
        (define profiles
-         (if user-profile
-             (list user-profile system-profile)
-             (list system-profile)))
+         (append (if home-profile
+                     (list home-profile)
+                     '())
+                 (if user-profile
+                     (list user-profile)
+                     '())
+                 (list system-profile)))
 
        (setenv "XDG_CONFIG_DIRS"
                (string-join (map (cut string-append <> "/etc/xdg") profiles)
-- 
cgit v1.2.3

alue='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d0bb5f77e98917649c974c0c47d2908a8858c77c'>root</a>/<a href='/guix/log/gnu?id=d0bb5f77e98917649c974c0c47d2908a8858c77c'>gnu</a>/<a href='/guix/log/gnu/packages?id=d0bb5f77e98917649c974c0c47d2908a8858c77c'>packages</a>/<a href='/guix/log/gnu/packages/lsh.scm?id=d0bb5f77e98917649c974c0c47d2908a8858c77c'>lsh.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/lsh.scm?id=d0bb5f77e98917649c974c0c47d2908a8858c77c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2013-12-01 22:33:23 +0100'>2013-12-01</span></td><td><a href='/guix/commit/gnu/packages/lsh.scm?id=79c311b81cd8b12075f4c8028a65787481ee40c5'>gnu: Synchronize descriptions with 'gnumaint'.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2013-11-03 23:26:42 -0500'>2013-11-03</span></td><td><a href='/guix/commit/gnu/packages/lsh.scm?id=c5916538fdf57c93dc8a5880c9eb4e2ca88aa760'>gnu: liboop: fix deplibs check method for mips64.</a><span class='msg-avail'>...</span></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2013-10-09 16:14:23 +0200'>2013-10-09</span></td><td><a href='/guix/commit/gnu/packages/lsh.scm?id=a22dc0c49aed0babe16ef92ae24847b343b7eb02'>Synchronize package descriptions with the Womb.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2013-07-01 11:43:23 +0200'>2013-07-01</span></td><td><a href='/guix/commit/gnu/packages/lsh.scm?id=82323a80850a205866c83a9399cc76336e30847d'>gnu: liboop: Fix &amp; improve meta-data.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2013-06-27 22:27:26 +0200'>2013-06-27</span></td><td><a href='/guix/commit/gnu/packages/lsh.scm?id=96a8259a9dc8239bd340dc35ea4ebed82ed33d5e'>gnu: lsh: Upgrade to 2.1.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2013-04-17 18:04:25 +0200'>2013-04-17</span></td><td><a href='/guix/commit/gnu/packages/lsh.scm?id=f50d2669e3e624365221cc81918ba55fdce94107'>gnu: Use synopses from the Womb.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2013-01-18 01:07:53 +0100'>2013-01-18</span></td><td><a href='/guix/commit/gnu/packages/lsh.scm?id=59a43334a98babd6c776648967e48d7c44723639'>distro: Rename (distro) to (gnu packages).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2013-01-18 01:07:31 +0100'>2013-01-18</span></td><td><a href='/guix/commit/gnu/packages/lsh.scm?id=1ffa7090b99dfd2f54fa883929c5e78d7852657a'>distro: Change the module name space to (gnu ...).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>