diff --git a/home/.profile b/home/.profile index 18c2c78..3e06719 100644 --- a/home/.profile +++ b/home/.profile @@ -1,7 +1,6 @@ export EDITOR=vim export PS1='[\h:\w]\$ ' -export PATH=./bin:~/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin -export PATH=$PATH:$HOME/bin:$HOME/node_modules/.bin +export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:$HOME/node_modules/.bin alias l='ls -GhHl' alias la='ls -aGhHl' @@ -10,5 +9,6 @@ alias clear='clear && printf "\e[3J"' [[ -e "$HOME/.profile.local" ]] && source $HOME/.profile.local export PYTHONSTARTUP="$(python -m jedi repl)" +export PYTHONPATH=./src source ~/bin/git-completion.sh diff --git a/home/.vimrc b/home/.vimrc index 3cc27fd..e9d5d36 100644 --- a/home/.vimrc +++ b/home/.vimrc @@ -32,9 +32,9 @@ call plug#end() " Execute Basic Setup Commands ######################################################################################### set background=dark -silent! colorscheme bvemu -" abra alduin badwolf Benokai birds-of-paradise black-angus brogrammer bvemu cabin camo chlordane coffee -" corporation dark-robin feral golden greens kellys liquidcarbon night_vision obsidian solarized zmrok +silent! colorscheme gruvbox +" abra alduin badwolf Benokai birds-of-paradise black-angus brogrammer bvemu cabin camo chlordane coffee corporation +" dark-robin feral golden greens gruvbox kellys liquidcarbon molokai night_vision obsidian solarized zmrok filetype plugin indent on hi ColorColumn ctermbg=8 @@ -136,6 +136,8 @@ map :cn map :tselect map :!ctags -R src test +nmap ; :BufExplorer + " Local Overrides ###################################################################################################### if !empty(glob("$HOME/.vimrc.local")) diff --git a/install.sh b/install.sh index db2b71d..abcd58a 100755 --- a/install.sh +++ b/install.sh @@ -21,6 +21,13 @@ pushd $HOME >/dev/null done popd >/dev/null +echo "Setting up Git configuration..." +git config --global user.name "Andrew Miner" +EMAIL=$(git config --global user.email) +read -p "Git email address ($EMAIL): " RESPONSE +[[ "$RESPONSE" == "" ]] || EMAIL="$RESPONSE" +git config --global user.email $EMAIL + echo "Updating brew, one moment..." brew update @@ -29,16 +36,16 @@ which -s ag || brew install ag which -s ctags || brew install ctags which -s fswatch || brew install fswatch which -s gcc || brew install gcc -which -s python || brew install python # must preceed macvim -which -s gvim || brew install macvim +which -s python3 || brew install python3 # must preceed macvim +which -s gvim || brew install macvim --with-python3 which -s node || brew install node which -s rbenv || brew install rbenv which -s watch || brew install watch which -s wget || brew install wget pushd /usr/local/bin >/dev/null - ln -sf pip2 pip - ln -sf python2 python + ln -sf pip3 pip + ln -sf python3 python popd >/dev/null pushd /usr >/dev/null