From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id aMhwNhWie2XWAgAAkFu2QA (envelope-from ) for ; Fri, 15 Dec 2023 01:47:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6Fv7LhWie2V0FAEA62LTzQ (envelope-from ) for ; Fri, 15 Dec 2023 01:47:17 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=DgyhFLdQ; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1702601237; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=9JDFV2lIPkyLU3r/bOscisbBcYXqD0lK3dOFButMJz4=; b=bjrSH+QKtNnk7I5FTvwGK9htu0L43BpcIla1pDzR/EzVh64eqdwLWH1gQVWT9VofvjfFKl gVRS0GI9tlgOQxrQiwuLNGOnnPGWD7ozvsT01/P3EiDRR3SFWYpP/tiBEOMdThJYLFwm6Z 2e4XO0DhfKd+tvJzz5d562VNI6P1RTVsM/0Bv82JD9eeM+SCoyn55TjDe4rgQmX4WFXo+w nmNqwTbj56pEf23DtOfcbBExRd/OtZd5o2VI9mohjCxcBhmO+vSED1q/z0kJwUX6y0UpHc ZxQ3ByUxLX9ogmMIpi3iYHwvnjomt41miP10FmXGGDdllX69gHmHO9K+0nl/Uw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=DgyhFLdQ; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1702601237; a=rsa-sha256; cv=none; b=iBmwV3XVzvh7mc5wTz7UP14yjrubaBRtPmNgNyuIyahUBanToTb+rGkZ/mBzGOj+2ujcW+ LN6KJiQoLG8WcEh/uq3qO322CCPLm1eCO7JLe4F2p9IqK9gilmi656wouBTiEPGYKGaINq KdpKCgtsnN7Aj/CMK7IicjeGexkNvVP/dpw7jmU5ikvty16MbRRdqm3Rtew3UJJrhUP4jX GTolOv8ON5YRRPTzhCgezQEwXUwaLHeozR4loWeBOYtNZ93bqWg2RWGOoEdLuw0rl0GOg5 wTP3bzU3pBc8FTSDufoCcgVcddp62d26vs6YfIp0DNOy2miGAuXAjXIUBegryA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8E79D3F05C for ; Fri, 15 Dec 2023 01:47:17 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDwM4-0006Z8-WB; Thu, 14 Dec 2023 19:47:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDwM2-0006Yi-My for bug-guix@gnu.org; Thu, 14 Dec 2023 19:47:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rDwM2-0004n7-Dw for bug-guix@gnu.org; Thu, 14 Dec 2023 19:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDwM1-0007Dj-UP for bug-guix@gnu.org; Thu, 14 Dec 2023 19:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#67738: [PATCH v2] services: xorg: Find sessions from guix home directory. References: <87bkaysgv1.fsf@163.com> In-Reply-To: <87bkaysgv1.fsf@163.com> Resent-From: Feng Shu Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 15 Dec 2023 00:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67738 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 67738@debbugs.gnu.org Received: via spool by 67738-submit@debbugs.gnu.org id=B67738.170260116927675 (code B ref 67738); Fri, 15 Dec 2023 00:47:01 +0000 Received: (at 67738) by debbugs.gnu.org; 15 Dec 2023 00:46:09 +0000 Received: from localhost ([127.0.0.1]:51246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDwLB-0007CJ-9C for submit@debbugs.gnu.org; Thu, 14 Dec 2023 19:46:09 -0500 Received: from m15.mail.163.com ([45.254.50.220]:33828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDwL8-00077A-2b for 67738@debbugs.gnu.org; Thu, 14 Dec 2023 19:46:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version: Content-Type; bh=9JDFV2lIPkyLU3r/bOscisbBcYXqD0lK3dOFButMJz4=; b=DgyhFLdQt5IsCWKRGrz5RaX96U6btDIwnE36fi+Cy3Hc8uon/tOJtQmmG0Oacy O8GdqOyfRpaBnCIH8bzreYE9HTotoCjVfSh9dIPRfHKgzfPrTvMPKP/EdwTZ44TW 8FozNBJ6axa6ciMlcEzWotCYpR1rHrEGeQIVO0A+kNiQU= Received: from Tumashu (unknown [218.92.14.78]) by zwqz-smtp-mta-g1-3 (Coremail) with SMTP id _____wD33xXIoXtlzhZ9Cg--.47939S2; Fri, 15 Dec 2023 08:46:01 +0800 (CST) From: Feng Shu Date: Fri, 15 Dec 2023 08:46:00 +0800 Message-ID: <87bkass37b.fsf@163.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-CM-TRANSID: _____wD33xXIoXtlzhZ9Cg--.47939S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7XF47tF4rKrW8Zr4fJFWfuFg_yoWkuFc_A3 yxXF48J39xJa4xJw4Yvr1rZF9Yv3y7JrWfCw4agr47tw1xWa1kZF1qgrWjvwn5Gay8Ka4Y q39Iq3yfKr1qgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU1K0PPUUUUU== X-Originating-IP: [218.92.14.78] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/xtbBFwtH1Fgi7iURSQAAsm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -5.05 X-Spam-Score: -5.05 X-Migadu-Queue-Id: 8E79D3F05C X-TUID: WYAJtT7kRrZ5 >From 0e3968aff482ed8ef912f02b744631bb8899f9e4 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Thu, 14 Dec 2023 10:58:02 +0800 Subject: [PATCH v2] services: xorg: Find sessions from guix home directory. * gnu/services/xorg.scm (xinitrc): Find sessions from guix home directory. --- gnu/services/xorg.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index f8cf9f25b6..9235295dd6 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -458,6 +458,11 @@ (define user-profile (lambda (pw) (string-append (passwd:dir pw) "/.guix-profile")))) + (define guix-home-profile + (and=> (getpw (getuid)) + (lambda (pw) + (string-append (passwd:dir pw) "/.guix-home/profile")))) + (define (xsession-command desktop-file) ;; Read from DESKTOP-FILE its X session command and return it as a ;; list. @@ -503,6 +508,7 @@ (define (find-session profile) (apply exec-from-login-shell (or session (find-session user-profile) + (find-session guix-home-profile) (find-session system-profile))))))) (program-file "xinitrc" builder)) -- 2.39.2 --