From patchwork Fri Dec 15 00:36:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Shu X-Patchwork-Id: 57609 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EB9F027BBEA; Fri, 15 Dec 2023 00:37:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4B39827BBE2 for ; Fri, 15 Dec 2023 00:37:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDwCO-0005Wx-Tt; Thu, 14 Dec 2023 19:37:04 -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 1rDwCN-0005Wo-6h for guix-patches@gnu.org; Thu, 14 Dec 2023 19:37:03 -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 1rDwCM-0000ya-UP for guix-patches@gnu.org; Thu, 14 Dec 2023 19:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDwCM-0004O7-EH for guix-patches@gnu.org; Thu, 14 Dec 2023 19:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67831] [PATCH v2] services: xorg: Find sessions from guix home directory. Resent-From: Feng Shu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Dec 2023 00:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67831 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67831@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches" Received: via spool by submit@debbugs.gnu.org id=B.170260061916856 (code B ref -1); Fri, 15 Dec 2023 00:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Dec 2023 00:36:59 +0000 Received: from localhost ([127.0.0.1]:51233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDwCJ-0004Nn-CS for submit@debbugs.gnu.org; Thu, 14 Dec 2023 19:36:59 -0500 Received: from lists.gnu.org ([2001:470:142::17]:38184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDwCF-0004NS-1C for submit@debbugs.gnu.org; Thu, 14 Dec 2023 19:36:57 -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 1rDwC9-0005W7-Dx for guix-patches@gnu.org; Thu, 14 Dec 2023 19:36:49 -0500 Received: from m15.mail.163.com ([45.254.50.219]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDwC6-0000wx-Lg for guix-patches@gnu.org; Thu, 14 Dec 2023 19:36:49 -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=J/xV3NL/I4tpGMurlDwbWh45mWLduQgR05ON8DFFVXI=; b=oNNgq6YC4trPNqians3bXL1tBaJkBk+ykOJS7RcnyXUxs7kypb7Z9JGCpPlvZt Li5e89PXtIrff5oUdSY3UOFhWUwb3fZa6gt6Z8g85usjFVy8FNZIgew7Sfqf2uRr N45a1GF3wZTMpb7oebM71k8M13i773NyzyWXOoFFX5vt0= Received: from Tumashu (unknown [218.92.14.78]) by zwqz-smtp-mta-g2-4 (Coremail) with SMTP id _____wCHDjeSn3tlBXxxFg--.23410S2; Fri, 15 Dec 2023 08:36:34 +0800 (CST) From: Feng Shu Date: Fri, 15 Dec 2023 08:36:34 +0800 Message-ID: <87o7ess3n1.fsf@163.com> MIME-Version: 1.0 Content-Disposition: inline; filename=v2-0001-services-xorg-Find-sessions-from-guix-home-direct.patch Content-Description: [PATCH v2] services: xorg: Find sessions from guix home directory. X-CM-TRANSID: _____wCHDjeSn3tlBXxxFg--.23410S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU4Z2-UUUUU X-Originating-IP: [218.92.14.78] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/xtbBcRdH1FetjoNNIAAAsv Received-SPF: pass client-ip=45.254.50.219; envelope-from=tumashu@163.com; helo=m15.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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