mirror of
https://github.com/MillironX/dotfiles.git
synced 2024-11-22 13:29:56 +00:00
Compare commits
2 commits
44b9b80d27
...
24e09bc084
Author | SHA1 | Date | |
---|---|---|---|
24e09bc084 | |||
be48c89689 |
3 changed files with 10 additions and 4 deletions
|
@ -1,6 +1,6 @@
|
||||||
# >>> conda initialize >>>
|
# >>> conda initialize >>>
|
||||||
# !! Contents within this block are managed by 'conda init' !!
|
# !! 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
|
if [ $? -eq 0 ]; then
|
||||||
eval "$__conda_setup"
|
eval "$__conda_setup"
|
||||||
else
|
else
|
||||||
|
@ -18,7 +18,7 @@ fi
|
||||||
# <<< conda initialize <<<
|
# <<< conda initialize <<<
|
||||||
|
|
||||||
{{- if lookPath "direnv" }}
|
{{- if lookPath "direnv" }}
|
||||||
eval "$(direnv hook $(basename $0))"
|
eval "$(direnv hook $(basename $(readlink -f /proc/$$/exe)))"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
if [ -f $HOME/.ion/bin/ion ]; then
|
if [ -f $HOME/.ion/bin/ion ]; then
|
||||||
|
@ -27,8 +27,8 @@ if [ -f $HOME/.ion/bin/ion ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Import GNU parallel
|
# Import GNU parallel
|
||||||
if [ $(command -v env_parallel.$(basename $0)) ]; then
|
if [ $(command -v env_parallel.$(basename $(readlink -f /proc/$$/exe))) ]; then
|
||||||
source $(which env_parallel.$(basename $0))
|
source $(which env_parallel.$(basename $(readlink -f /proc/$$/exe)))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
{{- if eq .machinetype "workstation" }}
|
{{- if eq .machinetype "workstation" }}
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
set -g default-terminal "tmux-256color"
|
set -g default-terminal "tmux-256color"
|
||||||
|
{{- if eq .chezmoi.os "linux" }}
|
||||||
{{ if (eq .chezmoi.osRelease.id "debian") }}
|
{{ if (eq .chezmoi.osRelease.id "debian") }}
|
||||||
source "/usr/share/powerline/bindings/tmux/powerline.conf"
|
source "/usr/share/powerline/bindings/tmux/powerline.conf"
|
||||||
{{ else }}
|
{{ else }}
|
||||||
source "/usr/share/tmux/powerline.conf"
|
source "/usr/share/tmux/powerline.conf"
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
{{- end }}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
{{- if eq .chezmoi.os "linux" }}
|
||||||
{{- if or
|
{{- if or
|
||||||
(eq .machinetype "workstation")
|
(eq .machinetype "workstation")
|
||||||
(eq .chezmoi.osRelease.id "fedora")
|
(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"
|
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||||
fi
|
fi
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
# User specific environment
|
# User specific environment
|
||||||
if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]
|
if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]
|
||||||
|
@ -65,6 +67,7 @@ source $HOME/.envvar
|
||||||
alias zshconfig="$EDITOR ~/.zshrc"
|
alias zshconfig="$EDITOR ~/.zshrc"
|
||||||
source $HOME/.aliases
|
source $HOME/.aliases
|
||||||
|
|
||||||
|
{{- if eq .chezmoi.os "linux" }}
|
||||||
{{ if or
|
{{ if or
|
||||||
(eq .machinetype "workstation")
|
(eq .machinetype "workstation")
|
||||||
(eq .chezmoi.osRelease.id "fedora")
|
(eq .chezmoi.osRelease.id "fedora")
|
||||||
|
@ -73,3 +76,4 @@ source $HOME/.aliases
|
||||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
Loading…
Reference in a new issue