mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
home: symlink-manager: Remove appending of leading dot.
* gnu/home/services.scm (xdg-configuration-files-directory): Add leading dot. * gnu/home/services.scm (xdg-configuration-files-service-type): Change name. * gnu/home/services/shells.scm (add-shell-profile-file, zsh-get-configuration-files, add-zsh-dot-configuration, add-zsh-xdg-configuration, add-bash-configuration): Add leading dots. * gnu/home/services/symlink-manager.scm (update-symlinks-script): Remove leading dot. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
868da34d54
commit
5832d9fb60
4 changed files with 16 additions and 16 deletions
|
@ -285,10 +285,10 @@ (define home-files-service-type
|
|||
(description "Files that will be put in
|
||||
@file{~~/.guix-home/files}, and further processed during activation.")))
|
||||
|
||||
(define xdg-configuration-files-directory "config")
|
||||
(define xdg-configuration-files-directory ".config")
|
||||
|
||||
(define (xdg-configuration-files files)
|
||||
"Add config/ prefix to each file-path in FILES."
|
||||
"Add .config/ prefix to each file-path in FILES."
|
||||
(map (match-lambda
|
||||
((file-path . rest)
|
||||
(cons (string-append xdg-configuration-files-directory "/" file-path)
|
||||
|
@ -296,7 +296,7 @@ (define (xdg-configuration-files files)
|
|||
files))
|
||||
|
||||
(define home-xdg-configuration-files-service-type
|
||||
(service-type (name 'home-files)
|
||||
(service-type (name 'home-xdg-configuration)
|
||||
(extensions
|
||||
(list (service-extension home-files-service-type
|
||||
xdg-configuration-files)))
|
||||
|
@ -304,7 +304,7 @@ (define home-xdg-configuration-files-service-type
|
|||
(extend append)
|
||||
(default-value '())
|
||||
(description "Files that will be put in
|
||||
@file{~~/.guix-home/files/config}, and further processed during activation.")))
|
||||
@file{~~/.guix-home/files/.config}, and further processed during activation.")))
|
||||
|
||||
(define %initialize-gettext
|
||||
#~(begin
|
||||
|
|
|
@ -77,7 +77,7 @@ (define-configuration home-shell-profile-configuration
|
|||
really know what you do."))
|
||||
|
||||
(define (add-shell-profile-file config)
|
||||
`(("profile"
|
||||
`((".profile"
|
||||
,(mixed-text-file
|
||||
"shell-profile"
|
||||
"\
|
||||
|
@ -211,16 +211,16 @@ (define (zsh-file-by-field config field)
|
|||
(zsh-serialize-field config field)))))
|
||||
|
||||
(define (zsh-get-configuration-files config)
|
||||
`(("zprofile" ,(zsh-file-by-field config 'zprofile)) ;; Always non-empty
|
||||
`((".zprofile" ,(zsh-file-by-field config 'zprofile)) ;; Always non-empty
|
||||
,@(if (or (zsh-field-not-empty? config 'zshenv)
|
||||
(zsh-field-not-empty? config 'environment-variables))
|
||||
`(("zshenv" ,(zsh-file-by-field config 'zshenv))) '())
|
||||
`((".zshenv" ,(zsh-file-by-field config 'zshenv))) '())
|
||||
,@(if (zsh-field-not-empty? config 'zshrc)
|
||||
`(("zshrc" ,(zsh-file-by-field config 'zshrc))) '())
|
||||
`((".zshrc" ,(zsh-file-by-field config 'zshrc))) '())
|
||||
,@(if (zsh-field-not-empty? config 'zlogin)
|
||||
`(("zlogin" ,(zsh-file-by-field config 'zlogin))) '())
|
||||
`((".zlogin" ,(zsh-file-by-field config 'zlogin))) '())
|
||||
,@(if (zsh-field-not-empty? config 'zlogout)
|
||||
`(("zlogout" ,(zsh-file-by-field config 'zlogout))) '())))
|
||||
`((".zlogout" ,(zsh-file-by-field config 'zlogout))) '())))
|
||||
|
||||
(define (zsh-home-files config)
|
||||
(define zshenv-auxiliary-file
|
||||
|
@ -230,14 +230,14 @@ (define zshenv-auxiliary-file
|
|||
"[[ -f $ZDOTDIR/.zshenv ]] && source $ZDOTDIR/.zshenv\n"))
|
||||
|
||||
(if (home-zsh-configuration-xdg-flavor? config)
|
||||
`(("zshenv" ,zshenv-auxiliary-file))
|
||||
`((".zshenv" ,zshenv-auxiliary-file))
|
||||
(zsh-get-configuration-files config)))
|
||||
|
||||
(define (zsh-xdg-configuration-files config)
|
||||
(if (home-zsh-configuration-xdg-flavor? config)
|
||||
(map
|
||||
(lambda (lst)
|
||||
(cons (string-append "zsh/." (car lst))
|
||||
(cons (string-append "zsh/" (car lst))
|
||||
(cdr lst)))
|
||||
(zsh-get-configuration-files config))
|
||||
'()))
|
||||
|
@ -430,7 +430,7 @@ (define* (file-if-not-empty field #:optional (extra-content #f))
|
|||
(field-obj (car (filter-fields field))))
|
||||
(if (or extra-content
|
||||
(not (null? ((configuration-field-getter field-obj) config))))
|
||||
`(,(object->snake-case-string file-name)
|
||||
`(,(string-append "." (object->snake-case-string file-name))
|
||||
,(apply mixed-text-file
|
||||
(object->snake-case-string file-name)
|
||||
(append (or extra-content '())
|
||||
|
@ -439,7 +439,7 @@ (define* (file-if-not-empty field #:optional (extra-content #f))
|
|||
|
||||
(filter
|
||||
(compose not null?)
|
||||
`(("bash_profile"
|
||||
`((".bash_profile"
|
||||
,(mixed-text-file
|
||||
"bash_profile"
|
||||
"\
|
||||
|
|
|
@ -67,7 +67,7 @@ (define (preprocess-file file)
|
|||
(1+ (string-length home-directory)))
|
||||
(substring file
|
||||
(string-length #$xdg-configuration-files-directory)))
|
||||
(string-append "." file)))
|
||||
file))
|
||||
|
||||
(define (target-file file)
|
||||
;; Return the target of FILE, a config file name sans leading dot
|
||||
|
|
|
@ -421,7 +421,7 @@ (define (home-xdg-mime-applications-files config)
|
|||
(define (add-xdg-desktop-entry-file entry)
|
||||
(let ((file (first entry))
|
||||
(config (second entry)))
|
||||
(list (format #f "local/share/applications/~a" file)
|
||||
(list (format #f ".local/share/applications/~a" file)
|
||||
(apply mixed-text-file
|
||||
(format #f "xdg-desktop-~a-entry" file)
|
||||
config))))
|
||||
|
|
Loading…
Reference in a new issue