Merge branch 'master' of ssh://git.lyte.dev:2222/lytedev/dotfiles

This commit is contained in:
Daniel Flanagan 2019-11-04 11:58:55 -06:00
commit 522937a647
3 changed files with 3 additions and 11 deletions

View file

@ -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

4
setup
View file

@ -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/"

View file

@ -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"