From bd71818df31364bbd04f3f13b3bbb251636748b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 10:10:38 +0300 Subject: system: Move nanorc to XDG_CONFIG_HOME. * gnu/system/shadow.scm (default-skeletons): Move .nanorc to .config/nano/nanorc. --- gnu/system/shadow.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/system/shadow.scm') 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 ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Efraim Flashner ;;; ;;; 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) -- cgit v1.2.3 From 49d20d51e9f0b2944b0e13366d042950554ca931 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 30 Mar 2020 16:01:40 -0400 Subject: Revert "system: Move nanorc to XDG_CONFIG_HOME." This reverts commit bd71818df31364bbd04f3f13b3bbb251636748b4. This changed caused system reconfiguration to fail like this: ------ 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 # ?) 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 ------ --- gnu/system/shadow.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/system/shadow.scm') diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 9bee3d1693..46efdfddab 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -2,7 +2,6 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen -;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -173,7 +172,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) - (".config/nano/nanorc" ,(plain-file "nanorc" "\ + (".nanorc" ,(plain-file "nanorc" "\ # Include all the syntax highlighting modules. include /run/current-system/profile/share/nano/*.nanorc\n")) (".Xdefaults" ,xdefaults) -- cgit v1.2.3 From f12bd0bedde4fb6476064c5e2b32642c49857510 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Mar 2020 21:10:47 +0300 Subject: system: Move nanorc to XDG_CONFIG_HOME. * gnu/system/shadow.scm (skeleton-directory): Move .nanorc to .config/nano/nanorc. --- gnu/system/shadow.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/system/shadow.scm') 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 ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Efraim Flashner ;;; ;;; 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) -- cgit v1.2.3