diff --git a/dot_envvar.tmpl b/dot_envvar.tmpl index 620d511..42346d3 100644 --- a/dot_envvar.tmpl +++ b/dot_envvar.tmpl @@ -4,12 +4,14 @@ if [ $(command -v pipx) ]; then fi # Preferred editor for local and remote sessions -if [ $(command -v nano) ]; then +if [ $(command -v nvim) ]; then + export EDITOR=nvim +elif [ $(command -v nano) ]; then export EDITOR=nano -elif [ $(command -v emacs) ]; then - export EDITOR='emacs -nw' elif [ $(command -v vim) ]; then export EDITOR=vim +elif [ $(command -v emacs) ]; then + export EDITOR='emacs -nw' fi if [ $(command -v kate) ]; then diff --git a/dot_hooks b/dot_hooks deleted file mode 100644 index a7d3a2b..0000000 --- a/dot_hooks +++ /dev/null @@ -1,10 +0,0 @@ -if [ -f $HOME/.rbenv/bin/rbenv ]; then - export PATH="$HOME/.rbenv/bin:$PATH" - eval "$(rbenv init -)" - export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH" -fi - -if [ $(command -v n) ]; then - export N_PREFIX=$HOME/.n - export PATH="$HOME/.n/bin:$PATH" -fi diff --git a/dot_hooks.tmpl b/dot_hooks.tmpl new file mode 100644 index 0000000..7af0c42 --- /dev/null +++ b/dot_hooks.tmpl @@ -0,0 +1,21 @@ +if [ -f $HOME/.rbenv/bin/rbenv ]; then + export PATH="$HOME/.rbenv/bin:$PATH" + eval "$(rbenv init -)" + export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH" +fi + +if [ $(command -v n) ]; then + export N_PREFIX=$HOME/.n + export PATH="$HOME/.n/bin:$PATH" +fi + +if [ -f $HOME/.ion/bin/ion ]; then + export PATH="$HOME/.ion/bin/ion:$PATH" + export FPATH="$HOME/.ion/completions:$FPATH" +fi + +{{- if eq .machinetype "workstation" }} +export GPG_TTY="$(tty)" +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +gpgconf --launch gpg-agent +{{- end }} diff --git a/dot_profile b/dot_profile index af1c378..17df7a2 100644 --- a/dot_profile +++ b/dot_profile @@ -7,6 +7,19 @@ if [ -d $HOME/.julia/juliaup/bin ]; then export PATH="$HOME/.julia/juliaup/bin:$PATH" fi +# >>> juliaup initialize >>> + +# !! Contents within this block are managed by juliaup !! + +case ":$PATH:" in + *:/home/millironx/.juliaup/bin:*) + ;; + *) + export PATH=/home/millironx/.juliaup/bin${PATH:+:${PATH}} + ;; +esac +# <<< juliaup initialize <<< + # Linuxbrew setup if [ -d $HOME/../linuxbrew/.linuxbrew ]; then BREWPATH=$HOME/../linuxbrew/.linuxbrew diff --git a/dot_tmux.conf b/dot_tmux.conf deleted file mode 100644 index 029f1db..0000000 --- a/dot_tmux.conf +++ /dev/null @@ -1,2 +0,0 @@ -set -g default-terminal "tmux-256color" -source "/usr/share/tmux/powerline.conf" diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl new file mode 100644 index 0000000..1c3c442 --- /dev/null +++ b/dot_tmux.conf.tmpl @@ -0,0 +1,6 @@ +set -g default-terminal "tmux-256color" +{{- if (eq .chezmoi.osRelease.id "debian") }} +source "/usr/share/powerline/bindings/tmux/powerline.conf" +{{- else -}} +source "/usr/share/tmux/powerline.conf" +{{- end }} diff --git a/executable_dot_gitconfig.tmpl b/executable_dot_gitconfig.tmpl index 78279d0..35a2da7 100644 --- a/executable_dot_gitconfig.tmpl +++ b/executable_dot_gitconfig.tmpl @@ -1,9 +1,9 @@ [user] - name = {{ .name }} - email = {{ .email }} - signingkey = {{ .pubkey }} + name = "Thomas A. Christensen II" + email = "25492070+MillironX@users.noreply.github.com" + signingkey = 0xD5F50D10552A4BEC [core] - editor = nano + editor = nvim [credential] helper = store [color] @@ -14,9 +14,11 @@ user = MillironX [pull] rebase = false +[safe] + directory = /var/docker +{{- if eq .machinetype "workstation" }} [commit] gpgsign = true -{{- if eq .chezmoi.osRelease.id "fedora" }} [diff] tool = kdiff3 [merge] diff --git a/executable_dot_zshrc.tmpl b/executable_dot_zshrc.tmpl index 87f0427..a9f0d6e 100644 --- a/executable_dot_zshrc.tmpl +++ b/executable_dot_zshrc.tmpl @@ -21,7 +21,7 @@ fi if [[ ! -f "$HOME/antigen.zsh" ]]; then curl -L git.io/antigen > $HOME/antigen.zsh fi -source "$HOME/.antigen.zsh" +source "$HOME/antigen.zsh" # Load the oh-my-zsh library antigen use oh-my-zsh