diff options
| author | Hilton Chain <hako@ultrarare.space> | 2026-02-05 22:57:19 +0800 |
|---|---|---|
| committer | Hilton Chain <hako@ultrarare.space> | 2026-02-06 19:14:44 +0800 |
| commit | 689ee928a61fe95f3d9fca1a40bd81173b1c2e25 (patch) | |
| tree | 61c4049fdfee9d2ce737c500b4735955113624ed /gnu | |
| parent | 965b5537cf01303fd1287d1e4945c17c38224d65 (diff) | |
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 <hako@ultrarare.space>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/system/shadow.scm | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 4cff5fd867b..6cb1a23253f 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm | |||
| @@ -304,10 +304,10 @@ home-config")) | |||
| 304 | ;; after ~/.zshrc. To avoid interfering with any customizations a user | 304 | ;; after ~/.zshrc. To avoid interfering with any customizations a user |
| 305 | ;; may have made in their ~/.zshrc, put this in .zprofile, not .zlogin. | 305 | ;; may have made in their ~/.zshrc, put this in .zprofile, not .zlogin. |
| 306 | (".zprofile" ,zprofile) | 306 | (".zprofile" ,zprofile) |
| 307 | (".nanorc" ,%default-nanorc) | 307 | (".config/nano/nanorc" ,%default-nanorc) |
| 308 | (".Xdefaults" ,xdefaults) | 308 | (".Xdefaults" ,xdefaults) |
| 309 | (".guile" ,%default-dotguile) | 309 | (".guile" ,%default-dotguile) |
| 310 | (".gdbinit" ,gdbinit) | 310 | (".config/gdb/gdbinit" ,gdbinit) |
| 311 | ("guix-home-config.scm" ,%default-skeleton-home-config)))) | 311 | ("guix-home-config.scm" ,%default-skeleton-home-config)))) |
| 312 | 312 | ||
| 313 | (define (skeleton-directory skeletons) | 313 | (define (skeleton-directory skeletons) |
| @@ -328,15 +328,7 @@ home-config")) | |||
| 328 | ((target source) | 328 | ((target source) |
| 329 | (mkdir-p (dirname target)) | 329 | (mkdir-p (dirname target)) |
| 330 | (copy-recursively source target))) | 330 | (copy-recursively source target))) |
| 331 | '#$skeletons) | 331 | '#$skeletons))))) |
| 332 | ;; Make nanorc respect XDG_CONFIG_HOME. | ||
| 333 | (when (file-exists? ".nanorc") | ||
| 334 | (mkdir-p ".config/nano") | ||
| 335 | (rename-file ".nanorc" ".config/nano/nanorc")) | ||
| 336 | (when (file-exists? ".gdbinit") | ||
| 337 | (mkdir-p ".config/gdb") | ||
| 338 | (rename-file ".gdbinit" ".config/gdb/gdbinit")) | ||
| 339 | #t)))) | ||
| 340 | 332 | ||
| 341 | (define (find-duplicates list) | 333 | (define (find-duplicates list) |
| 342 | "Find duplicate entries in @var{list}. | 334 | "Find duplicate entries in @var{list}. |
