From 8b13299e5ba7ddc2c81ebed8b9e5ea9d4092a7e0 Mon Sep 17 00:00:00 2001 From: Inhji Date: Sun, 17 May 2020 21:41:50 +0200 Subject: [PATCH] clean up, add asdf submodule --- .gitmodules | 3 +++ asdf | 1 + config/zshrc | 30 ++++++++---------------------- 3 files changed, 12 insertions(+), 22 deletions(-) create mode 160000 asdf diff --git a/.gitmodules b/.gitmodules index 86c1875..245a843 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "z"] path = z url = https://github.com/rupa/z.git +[submodule "asdf"] + path = asdf + url = https://github.com/asdf-vm/asdf.git diff --git a/asdf b/asdf new file mode 160000 index 0000000..a7252e6 --- /dev/null +++ b/asdf @@ -0,0 +1 @@ +Subproject commit a7252e687ab65fc8dd04cfaa2be09446c84e312a diff --git a/config/zshrc b/config/zshrc index f6788e4..32749a0 100644 --- a/config/zshrc +++ b/config/zshrc @@ -1,6 +1,6 @@ # Path to your oh-my-zsh configuration. export DOTFILES=$HOME/.dotfiles -export PATH=$HOME/.local/bin:$HOME/.mix/escripts:/usr/local/go/bin:$HOME/.local/share/flatpak/exports/bin:$PATH +export PATH=$HOME/.local/bin:$HOME/.mix/escripts:$PATH if [[ -n $SSH_CONNECTION ]]; then export EDITOR='vim' @@ -8,25 +8,14 @@ else export EDITOR='subl' fi -if [[ -d $HOME/.cargo ]]; then - source $HOME/.cargo/env -fi - -if [[ -d /home/linuxbrew ]]; then - eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv) -fi - if [[ -f $HOME/.zsh-custom ]]; then source $HOME/.zsh-custom fi +# Load Pure fpath=("$HOME/.zfunctions" $fpath) - autoload -U promptinit; promptinit - -# optionally define some options PURE_CMD_MAX_EXEC_TIME=10 - prompt pure # Load z @@ -35,14 +24,11 @@ prompt pure # Load aliases . $DOTFILES/config/zsh/aliases.zsh +# Load asdf +. $DOTFILES/asdf/asdf.sh +fpath=($DOTFILES/asdf/completions $fpath) +autoload -Uz compinit +compinit + # Load dircolors eval $( dircolors -b $DOTFILES/config/zsh/dircolors.zsh ) - -# Pyenv -if [[ -d $HOME/.pyenv ]]; then - export PATH="$HOME/.pyenv/bin:$PATH" - eval "$(pyenv init -)" - eval "$(pyenv virtualenv-init -)" -fi - -