From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:58814)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jJLUZ-0006cP-6n
 for guix-patches@gnu.org; Tue, 31 Mar 2020 14:20:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jJLUY-0000n8-5v
 for guix-patches@gnu.org; Tue, 31 Mar 2020 14:20:03 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:53684)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1jJLUY-0000my-25
 for guix-patches@gnu.org; Tue, 31 Mar 2020 14:20:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jJLUX-0005qH-TF
 for guix-patches@gnu.org; Tue, 31 Mar 2020 14:20:01 -0400
Subject: [bug#40309] [PATCH v2] system: Move nanorc to XDG_CONFIG_HOME.
References: <20200329072238.29850-1-efraim@flashner.co.il>
In-Reply-To: <20200329072238.29850-1-efraim@flashner.co.il>
Resent-Message-ID: <handler.40309.B40309.158567875822361@debbugs.gnu.org>
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 31 Mar 2020 21:18:36 +0300
Message-Id: <20200331181836.19521-1-efraim@flashner.co.il>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: 40309@debbugs.gnu.org
Cc: Efraim Flashner <efraim@flashner.co.il>, leo@famulari.name

* gnu/system/shadow.scm (skeleton-directory): Move .nanorc to
.config/nano/nanorc.
---

This time I've tested the patch by running './pre-inst-env guix system
build --no-grafts gnu/system/examples/bare-bones.tmpl' as-is and with
(gnu system shadow) edited to remove .nanorc completely from
default-skeletons.

---
 gnu/system/shadow.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 46efdfddab..42480e823c 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -215,6 +216,10 @@ for a colorful Guile experience.\\n\\n\"))))\n"))
                                    ((target source)
                                     (copy-recursively source target)))
                                  '#$skeletons)
+                       ;; Make nanorc respect XDG_CONFIG_HOME.
+                       (when (file-exists? ".nanorc")
+                         (mkdir-p ".config/nano")
+                         (rename-file ".nanorc" ".config/nano/nanorc"))
                        #t))))
 
 (define (assert-valid-users/groups users groups)
-- 
2.26.0