diff --git a/dot_hooks.tmpl b/dot_hooks.tmpl index 29097e0..a025c71 100644 --- a/dot_hooks.tmpl +++ b/dot_hooks.tmpl @@ -1,6 +1,6 @@ # >>> conda initialize >>> # !! Contents within this block are managed by 'conda init' !! -__conda_setup="$($HOME/miniconda3/bin/conda shell.$(basename $0) 'hook' 2> /dev/null)" +__conda_setup="$($HOME/miniconda3/bin/conda shell.$(basename $(readlink -f /proc/$$/exe)) 'hook' 2> /dev/null)" if [ $? -eq 0 ]; then eval "$__conda_setup" else @@ -18,7 +18,7 @@ fi # <<< conda initialize <<< {{- if lookPath "direnv" }} -eval "$(direnv hook $(basename $0))" +eval "$(direnv hook $(basename $(readlink -f /proc/$$/exe)))" {{- end }} if [ -f $HOME/.ion/bin/ion ]; then @@ -27,8 +27,8 @@ if [ -f $HOME/.ion/bin/ion ]; then fi # Import GNU parallel -if [ $(command -v env_parallel.$(basename $0)) ]; then - source $(which env_parallel.$(basename $0)) +if [ $(command -v env_parallel.$(basename $(readlink -f /proc/$$/exe))) ]; then + source $(which env_parallel.$(basename $(readlink -f /proc/$$/exe))) fi {{- if eq .machinetype "workstation" }} diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl index 4f55050..28546d2 100644 --- a/dot_tmux.conf.tmpl +++ b/dot_tmux.conf.tmpl @@ -1,6 +1,8 @@ set -g default-terminal "tmux-256color" +{{- if eq .chezmoi.os "linux" }} {{ if (eq .chezmoi.osRelease.id "debian") }} source "/usr/share/powerline/bindings/tmux/powerline.conf" {{ else }} source "/usr/share/tmux/powerline.conf" {{ end }} +{{- end }} diff --git a/executable_dot_zshrc.tmpl b/executable_dot_zshrc.tmpl index 4bf3d42..4529d6f 100644 --- a/executable_dot_zshrc.tmpl +++ b/executable_dot_zshrc.tmpl @@ -1,3 +1,4 @@ +{{- if eq .chezmoi.os "linux" }} {{- if or (eq .machinetype "workstation") (eq .chezmoi.osRelease.id "fedora") @@ -10,6 +11,7 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" fi {{- end }} +{{- end }} # User specific environment if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]] @@ -65,6 +67,7 @@ source $HOME/.envvar alias zshconfig="$EDITOR ~/.zshrc" source $HOME/.aliases +{{- if eq .chezmoi.os "linux" }} {{ if or (eq .machinetype "workstation") (eq .chezmoi.osRelease.id "fedora") @@ -73,3 +76,4 @@ source $HOME/.aliases # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh {{- end }} +{{- end }}