millironx/dotfiles
1
0
Fork 0
mirror of https://github.com/MillironX/dotfiles.git synced 2024-11-22 21:39:55 +00:00
Code Issues Releases Packages Activity

Compare commits

base: millironx:24e09bc0840ec90bf348dfec938bff56eb27306a
Branches Tags
millironx:master
millironx:chezmoi
..
compare: millironx:44b9b80d27441fed56f8cd9dfa18a81b3af44208
Branches Tags
millironx:master
millironx:chezmoi

No commits in common. "24e09bc0840ec90bf348dfec938bff56eb27306a" and "44b9b80d27441fed56f8cd9dfa18a81b3af44208" have entirely different histories.
24e09bc084 ... 44b9b80d27

3 changed files with 4 additions and 10 deletions
Show stats Expand all files Collapse all files

8
dot_hooks.tmpl
View file

@ -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 $(readlink -f /proc/$$/exe)) 'hook' 2> /dev/null)" __conda_setup="$($HOME/miniconda3/bin/conda shell.$(basename $0) '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 $(readlink -f /proc/$$/exe)))" eval "$(direnv hook $(basename $0))"
{{- 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 $(readlink -f /proc/$$/exe))) ]; then if [ $(command -v env_parallel.$(basename $0)) ]; then
source $(which env_parallel.$(basename $(readlink -f /proc/$$/exe))) source $(which env_parallel.$(basename $0))
fi fi
{{- if eq .machinetype "workstation" }} {{- if eq .machinetype "workstation" }}

2
dot_tmux.conf.tmpl
View file

@ -1,8 +1,6 @@
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 }}

4
executable_dot_zshrc.tmpl
View file

@ -1,4 +1,3 @@
{{- 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")
@ -11,7 +10,6 @@ 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:" ]]
@ -67,7 +65,6 @@ 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")
@ -76,4 +73,3 @@ 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 }}