GNU bug report logs - #40309
[PATCH] system: Move nanorc to XDG_CONFIG_HOME.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40309 in the body.
You can then email your comments to 40309 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: guix-patches <at> gnu.org
Cc: Efraim Flashner <efraim <at> flashner.co.il>
Subject: [PATCH] system: Move nanorc to XDG_CONFIG_HOME.
Date: Sun, 29 Mar 2020 10:22:38 +0300

* gnu/system/shadow.scm (default-skeletons): Move .nanorc to
.config/nano/nanorc.
---
 gnu/system/shadow.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 46efdfddab..9bee3d1693 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 <at> gnu.org>
 ;;; Copyright © 2016 Alex Griffin <a <at> ajgrf.com>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke <at> gnu.org>
+;;; Copyright © 2020 Efraim Flashner <efraim <at> flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -172,7 +173,7 @@ set auto-load safe-path /gnu/store/*/lib\n")))
       ;; after ~/.zshrc.  To avoid interfering with any customizations a user
       ;; may have made in their ~/.zshrc, put this in .zprofile, not .zlogin.
       (".zprofile" ,zprofile)
-      (".nanorc" ,(plain-file "nanorc" "\
+      (".config/nano/nanorc" ,(plain-file "nanorc" "\
 # Include all the syntax highlighting modules.
 include /run/current-system/profile/share/nano/*.nanorc\n"))
       (".Xdefaults" ,xdefaults)
-- 
2.26.0

Message #8 received at 40309 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Efraim Flashner <efraim <at> flashner.co.il>, 40309 <at> debbugs.gnu.org
Cc: Efraim Flashner <efraim <at> flashner.co.il>
Subject: Re: [bug#40309] [PATCH] system: Move nanorc to XDG_CONFIG_HOME.
Date: Mon, 30 Mar 2020 13:55:56 +0200

[Message part 1 (text/plain, inline)]

Efraim Flashner <efraim <at> flashner.co.il> writes:

> * gnu/system/shadow.scm (default-skeletons): Move .nanorc to
> .config/nano/nanorc.

LGTM.

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 40309 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: 40309 <at> debbugs.gnu.org
Subject: Re: [bug#40309] [PATCH] system: Move nanorc to XDG_CONFIG_HOME.
Date: Mon, 30 Mar 2020 16:06:46 -0400

On Sun, Mar 29, 2020 at 10:22:38AM +0300, Efraim Flashner wrote:
> * gnu/system/shadow.scm (default-skeletons): Move .nanorc to
> .config/nano/nanorc.

Unfortunately it caused reconfiguration to fail so I reverted this
change in commit 49d20d51e9f0b2944b0e13366d042950554ca931

------
building /gnu/store/y1x8asbzw624ywgkpin35p1i4bqnyfy2-skel.drv...
Backtrace:
           4 (primitive-load "/gnu/store/2x7d0jsbgf2ndb5fsk0nj07rhsx?")
In ice-9/eval.scm:
    619:8  3 (_ #f)
In ice-9/boot-9.scm:
   260:13  2 (for-each #<procedure 7ffff6ad8100 at ice-9/eval.scm:3?> ?)
In guix/build/utils.scm:
   343:27  1 (_ "/gnu/store/ajrgkj1s9vdcq00drn703f4zj9dvfrsv-nanorc" ?)
In unknown file:
           0 (copy-file "/gnu/store/ajrgkj1s9vdcq00drn703f4zj9dvfrs?" ?)

ERROR: In procedure copy-file:
In procedure copy-file: No such file or directory
`/gnu/store/v1grsca743phw41lyf63dzmh9nz5jlpn-bash_profile' -> `.bash_profile'
`/gnu/store/xdsaw0mj6axj427hyi6ysrnsxi21n7d5-bashrc' -> `.bashrc'
`/gnu/store/6i0b236dyar78zc5k5hrj5dv3vr4zb9w-zprofile' -> `.zprofile'
`/gnu/store/ajrgkj1s9vdcq00drn703f4zj9dvfrsv-nanorc' -> `.config/nano/nanorc'
builder for `/gnu/store/y1x8asbzw624ywgkpin35p1i4bqnyfy2-skel.drv' failed with exit code 1
build of /gnu/store/y1x8asbzw624ywgkpin35p1i4bqnyfy2-skel.drv failed
------

https://git.savannah.gnu.org/cgit/guix.git/commit/?id=49d20d51e9f0b2944b0e13366d042950554ca931

Message #16 received at 40309-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 40309-done <at> debbugs.gnu.org
Subject: Re: [bug#40309] [PATCH] system: Move nanorc to XDG_CONFIG_HOME.
Date: Mon, 30 Mar 2020 15:42:52 +0300

[Message part 1 (text/plain, inline)]

Patch pushed

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Message #19 received at 40309 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: 40309 <at> debbugs.gnu.org
Cc: Efraim Flashner <efraim <at> flashner.co.il>, leo <at> famulari.name
Subject: [PATCH v2] system: Move nanorc to XDG_CONFIG_HOME.
Date: Tue, 31 Mar 2020 21:18:36 +0300

* 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 <at> gnu.org>
 ;;; Copyright © 2016 Alex Griffin <a <at> ajgrf.com>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke <at> gnu.org>
+;;; Copyright © 2020 Efraim Flashner <efraim <at> 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

Message #22 received at 40309 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: 40309 <at> debbugs.gnu.org
Subject: Re: [PATCH v2] system: Move nanorc to XDG_CONFIG_HOME.
Date: Tue, 31 Mar 2020 15:00:31 -0400

On Tue, Mar 31, 2020 at 09:18:36PM +0300, Efraim Flashner wrote:
> * gnu/system/shadow.scm (skeleton-directory): Move .nanorc to
> .config/nano/nanorc.

Works for me, thanks!

Message #25 received at 40309-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Leo Famulari <leo <at> famulari.name>
Cc: 40309-done <at> debbugs.gnu.org
Subject: Re: [PATCH v2] system: Move nanorc to XDG_CONFIG_HOME.
Date: Wed, 1 Apr 2020 07:51:28 +0300

[Message part 1 (text/plain, inline)]

On Tue, Mar 31, 2020 at 03:00:31PM -0400, Leo Famulari wrote:
> On Tue, Mar 31, 2020 at 09:18:36PM +0300, Efraim Flashner wrote:
> > * gnu/system/shadow.scm (skeleton-directory): Move .nanorc to
> > .config/nano/nanorc.
> 
> Works for me, thanks!

Patch pushed

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.