From patchwork Sat Mar 12 20:53:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: angry rectangle X-Patchwork-Id: 37761 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 E081427BBEB; Sat, 12 Mar 2022 21:26:49 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED 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 0BA5E27BBEA for ; Sat, 12 Mar 2022 21:26:48 +0000 (GMT) Received: from localhost ([::1]:59186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nT9GB-0006df-4M for patchwork@mira.cbaines.net; Sat, 12 Mar 2022 16:26:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nT8w7-0005BL-16 for guix-patches@gnu.org; Sat, 12 Mar 2022 16:06:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nT8w6-0001jq-P5 for guix-patches@gnu.org; Sat, 12 Mar 2022 16:06:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nT8w6-0002ox-JJ for guix-patches@gnu.org; Sat, 12 Mar 2022 16:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54356] [PATCH] home: services: Fix bash aliases without guix-defaults. Resent-From: angry rectangle Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Mar 2022 21:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54356 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54356@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164711911710781 (code B ref -1); Sat, 12 Mar 2022 21:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Mar 2022 21:05:17 +0000 Received: from localhost ([127.0.0.1]:40930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nT8vM-0002np-QV for submit@debbugs.gnu.org; Sat, 12 Mar 2022 16:05:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:48786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nT8vK-0002nh-QH for submit@debbugs.gnu.org; Sat, 12 Mar 2022 16:05:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nT8vK-0004p9-0I for guix-patches@gnu.org; Sat, 12 Mar 2022 16:05:14 -0500 Received: from [37.120.193.123] (port=53960 helo=mail.cock.li) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nT8vG-0001Zy-M9 for guix-patches@gnu.org; Sat, 12 Mar 2022 16:05:13 -0500 User-agent: mu4e 1.6.10; emacs 28.0.50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1647119105; bh=2p6wBUXrFgQllnS1ctK0croJSoaV9qJM0Nrg5rCy7ck=; h=From:To:Subject:Date:From; b=U2dj0fuc4/QqZXTWbGU/3d4RzNyDBe6yXoGgh3SzTVnXJDfMA/JMpjBOKm1mzxjkg mJhVvN7Qv6NBKsXooTtVKAmdgx2ixkZEUstY8titMZhLNvUPqXcDz1NhYuyEYbBTHG gINzVEdSyY2HOXCQj60VZ88L9d6HDt833eZZIMxUtuF5HORinQalsup1xKNhkIq52f CEif2y/0o/oSvp/JgnbbFN+ieWUYrwOsT5lNJo0LQrEJAumyGXuaZmQ/oJ3tcSz4LP drgZG/8kE1ohKhM7wp/J0Z+r/keWD86ScVd3hMnD2BGpJjGAZLfNqywjWqfMNo6BFr Us6TmqLXbIlgQ== From: angry rectangle Date: Sat, 12 Mar 2022 15:53:31 -0500 Message-ID: <878rteg9vo.fsf@cock.li> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 37.120.193.123 (failed) Received-SPF: pass client-ip=37.120.193.123; envelope-from=angryrectangle@cock.li; helo=mail.cock.li X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 12 Mar 2022 16:26:35 -0500 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" X-getmail-retrieved-from-mailbox: Patches Because of a typo, aliases aren't included if guix-defaults? is #f. This patch also fixes an inaccuracy in the documentation about placement of defaults. They're actually put at the top, after aliases. Which is good considering it has the "exit if non-interactive" statement. From 0a278853a0b9b33082a8d3164424e8b7d1abb7dd Mon Sep 17 00:00:00 2001 From: angryrectangle Date: Sat, 12 Mar 2022 15:28:15 -0500 Subject: [PATCH] home: services: Fix bash aliases without guix-defaults. * gnu/home/services/shells.scm: Fix bash aliases not being added if guix-defaults? was #f. Also fix inaccuracy in documentation about placement of defaults. --- gnu/home/services/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index ca7f4ac0ad..9a79db484a 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -324,7 +324,7 @@ (define-configuration home-bash-configuration (guix-defaults? (boolean #t) "Add sane defaults like reading @file{/etc/bashrc} and coloring the output of -@command{ls} to the end of the @file{.bashrc} file.") +@command{ls} to the top of the @file{.bashrc} file.") (environment-variables (alist '()) "Association list of environment variables to set for the Bash session. The @@ -448,7 +448,7 @@ (define (add-bash-configuration config) 'bashrc (if (home-bash-configuration-guix-defaults? config) (list (serialize-field 'aliases) guix-bashrc) - (list (serialize-field 'alises)))) + (list (serialize-field 'aliases)))) (file-if-not-empty 'bash-logout))))) (define (add-bash-packages config) -- 2.34.0