From 689ee928a61fe95f3d9fca1a40bd81173b1c2e25 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Thu, 5 Feb 2026 22:57:19 +0800 Subject: [PATCH] system: skeleton-directory: Remove special cases of directory creation. Directories have been supported in skeleton names since d9ea94dc4487fb668f98e512f96506a5eaf566c2. * gnu/system/shadow.scm (default-skeletons): Add directories to skeleton names. (skeleton-directory): Remove special cases of directory creation. Change-Id: I7918498c2ff115ad8d1f5e3472678da1db8b4f2e Signed-off-by: Hilton Chain --- gnu/system/shadow.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 4cff5fd867..6cb1a23253 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -304,10 +304,10 @@ home-config")) ;; 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" ,%default-nanorc) + (".config/nano/nanorc" ,%default-nanorc) (".Xdefaults" ,xdefaults) (".guile" ,%default-dotguile) - (".gdbinit" ,gdbinit) + (".config/gdb/gdbinit" ,gdbinit) ("guix-home-config.scm" ,%default-skeleton-home-config)))) (define (skeleton-directory skeletons) @@ -328,15 +328,7 @@ home-config")) ((target source) (mkdir-p (dirname target)) (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")) - (when (file-exists? ".gdbinit") - (mkdir-p ".config/gdb") - (rename-file ".gdbinit" ".config/gdb/gdbinit")) - #t)))) + '#$skeletons))))) (define (find-duplicates list) "Find duplicate entries in @var{list}.