unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Efraim Flashner <efraim@flashner.co.il>
To: 40309@debbugs.gnu.org
Cc: Efraim Flashner <efraim@flashner.co.il>, leo@famulari.name
Subject: [bug#40309] [PATCH v2] system: Move nanorc to XDG_CONFIG_HOME.
Date: Tue, 31 Mar 2020 21:18:36 +0300	[thread overview]
Message-ID: <20200331181836.19521-1-efraim@flashner.co.il> (raw)
In-Reply-To: <20200329072238.29850-1-efraim@flashner.co.il>

* 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

  parent reply	other threads:[~2020-03-31 18:20 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-29  7:22 [bug#40309] [PATCH] system: Move nanorc to XDG_CONFIG_HOME Efraim Flashner
2020-03-30 11:55 ` Marius Bakke
2020-03-30 12:42   ` bug#40309: " Efraim Flashner
2020-03-30 20:06 ` [bug#40309] " Leo Famulari
2020-03-31 18:18 ` Efraim Flashner [this message]
2020-03-31 19:00   ` [bug#40309] [PATCH v2] " Leo Famulari
2020-04-01  4:51     ` Efraim Flashner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200331181836.19521-1-efraim@flashner.co.il \
    --to=efraim@flashner.co.il \
    --cc=40309@debbugs.gnu.org \
    --cc=leo@famulari.name \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).