diff mbox series

[bug#40309] system: Move nanorc to XDG_CONFIG_HOME.

Message ID 20200329072238.29850-1-efraim@flashner.co.il
State Accepted
Headers show
Series [bug#40309] system: Move nanorc to XDG_CONFIG_HOME. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Efraim Flashner March 29, 2020, 7:22 a.m. UTC 
* gnu/system/shadow.scm (default-skeletons): Move .nanorc to
.config/nano/nanorc.
---
 gnu/system/shadow.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Marius Bakke March 30, 2020, 11:55 a.m. UTC | #1 
Efraim Flashner <efraim@flashner.co.il> writes:

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

LGTM.
Efraim Flashner March 30, 2020, 12:42 p.m. UTC | #2 
Patch pushed
Leo Famulari March 30, 2020, 8:06 p.m. UTC | #3 
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
diff mbox series

Patch

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@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.
 ;;;
@@ -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)