From patchwork Sat Mar 12 22:05:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: angry rectangle X-Patchwork-Id: 37763 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 B579E27BBEA; Sat, 12 Mar 2022 22:10:16 +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=unavailable 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 7C3B827BBE9 for ; Sat, 12 Mar 2022 22:10:16 +0000 (GMT) Received: from localhost ([::1]:44598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nT9wF-0001b0-Kk for patchwork@mira.cbaines.net; Sat, 12 Mar 2022 17:10:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nT9w2-0001ar-Hl for guix-patches@gnu.org; Sat, 12 Mar 2022 17:10:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nT9w2-0004xw-8H for guix-patches@gnu.org; Sat, 12 Mar 2022 17:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nT9w1-0006f4-VC for guix-patches@gnu.org; Sat, 12 Mar 2022 17:10:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54356] [PATCH] home: services: Fix bash aliases without guix-defaults. References: <878rteg9vo.fsf@cock.li> In-Reply-To: <878rteg9vo.fsf@cock.li> Resent-From: angry rectangle Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Mar 2022 22:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54356 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54356@debbugs.gnu.org Received: via spool by 54356-submit@debbugs.gnu.org id=B54356.164712294425516 (code B ref 54356); Sat, 12 Mar 2022 22:10:01 +0000 Received: (at 54356) by debbugs.gnu.org; 12 Mar 2022 22:09:04 +0000 Received: from localhost ([127.0.0.1]:41018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nT9v6-0006dT-CU for submit@debbugs.gnu.org; Sat, 12 Mar 2022 17:09:04 -0500 Received: from [37.120.193.123] (port=39668 helo=mail.cock.li) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nT9v4-0006co-IY for 54356@debbugs.gnu.org; Sat, 12 Mar 2022 17:09:03 -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=1647122932; bh=0zZ09bHklvQolrNynLdb/F0y7vK+fwRfgxWnu6/llTk=; h=From:To:Subject:Date:From; b=UF8JTq59Tfo0xIzZAcPpasSEg0U3bKs9kr0PRYPstkz6TGIJsGupes82geNfc86eu bpHB8jvcNu3JFQz9K96shsJ35dgZHLhSbDRqJ9Z78xYg7Q0ErfoERb/uXJEP5Iq1Ew OMFpZVG8RZ+z7hk7KKKBnYo8BIh1HpNdIrgRVhyq9lQIKVSRPP+SibjIoyPdAHfbAq 0gicHZ6issHcdIxfraSX8d3EgViTJC/wPSmgJhmY50ZGgLFm0HKrJ3jsak/P93lEt6 2bWMSkmtl+Lpyw0jFu6F+zmTtliBYKAxjWGqNTikfXa+uS6SVQ6dsCCUAqJqXGWeVl DgH1aJd6L7fLA== From: angry rectangle Date: Sat, 12 Mar 2022 17:05:35 -0500 Message-ID: <87zgluesct.fsf@cock.li> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches Oops, the patch was wrapped. I'll try again. If this doesn't work, the original patch can be fixed by removing the ">" and moving the "of" that's on its own line to the previous one. 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