diff options
Diffstat (limited to 'gnu/home')
| -rw-r--r-- | gnu/home/services/desktop.scm | 2 | ||||
| -rw-r--r-- | gnu/home/services/shells.scm | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gnu/home/services/desktop.scm b/gnu/home/services/desktop.scm index 626918fd9e..c4da116100 100644 --- a/gnu/home/services/desktop.scm +++ b/gnu/home/services/desktop.scm @@ -172,7 +172,7 @@ format.")) ;; FIXME: This fails to start if Home is first activated from a ;; non-X11 session. (start #~(make-forkexec-constructor - (list #$(file-append redshift "/bin/redshift") + (list #$(file-append (home-redshift-configuration-redshift config) "/bin/redshift") "-c" #$config-file))) (stop #~(make-kill-destructor)) (actions (list (shepherd-configuration-action config-file)))))) diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index 7960590e7c..9dd56f634a 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -183,7 +183,8 @@ another process for example).")) (mixed-text-file "zshenv" (zsh-serialize-field config 'zshenv) - (zsh-serialize-field config 'environment-variables))) + (zsh-serialize-field config 'environment-variables) + "[ -n \"$SSH_CLIENT\" ] && source /etc/profile")) (define (zsh-file-zprofile config) (mixed-text-file @@ -209,9 +210,7 @@ source ~/.profile (define (zsh-get-configuration-files config) `((".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)) ;; Always non-empty ,@(if (zsh-field-not-empty? config 'zshrc) `((".zshrc" ,(zsh-file-by-field config 'zshrc))) '()) ,@(if (zsh-field-not-empty? config 'zlogin) |