diff --git a/apps/git/config b/apps/git/config index 7242050..f4343b7 100644 --- a/apps/git/config +++ b/apps/git/config @@ -49,5 +49,5 @@ branch = false diff = nvim -c 'silent %sm/\\e.\\{-}m//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile' -c 'goto 1' - -[url "git@github.com:"] - insteadOf = https://github.com/ +[url "git@github.com:postmates"] + insteadOf = https://github.com/postmates diff --git a/setup b/setup index 52c4326..1465e2a 100755 --- a/setup +++ b/setup @@ -103,9 +103,7 @@ links=( ) mkdir -p "$edfp/" -if [[ ! -L "$HOME/.env" ]]; then - ln -s "$edfp/" "$HOME/.env/" -fi +[[ ! -e "$HOME/.env" ]] && ln -s "$edfp/" "$HOME/.env" mkdir -p "$edfp/bash.d/" mkdir -p "$edfp/bin/" mkdir -p "$edfp/x/" diff --git a/shell/bash/bashrc b/shell/bash/bashrc index 62cc1ab..2543424 100644 --- a/shell/bash/bashrc +++ b/shell/bash/bashrc @@ -120,9 +120,3 @@ export ERL_AFLAGS="-kernel shell_history enabled -kernel shell_history_file_byte _make_paths [ -f ~/.fzf.bash ] && source ~/.fzf.bash - -export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion - -[[ -s "/home/daniel/usr/.gvm/scripts/gvm" ]] && source "/home/daniel/usr/.gvm/scripts/gvm"