From c74e7caadad8da5b36882a81dc5c634703795236 Mon Sep 17 00:00:00 2001
From: "Adam A.G. Shamblin" <adam.shamblin@gmail.com>
Date: Tue, 23 Jan 2018 20:16:46 -0700
Subject: [PATCH] Local cleanup on home machine

---
 .gitmodules                  |  6 ++---
 dotbash_profile              | 50 ++++++++++++++++++++----------------
 dotvim/bundle/vim-javascript |  1 +
 dotvim/bundle/vim-solidity   |  1 -
 dotvimrc                     | 29 +++------------------
 5 files changed, 35 insertions(+), 52 deletions(-)
 create mode 160000 dotvim/bundle/vim-javascript
 delete mode 160000 dotvim/bundle/vim-solidity

diff --git a/.gitmodules b/.gitmodules
index fceefd4..693eb34 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,6 +22,6 @@
 [submodule "dotvim/bundle/typescript-vim"]
 	path = dotvim/bundle/typescript-vim
 	url = https://github.com/leafgarland/typescript-vim.git
-[submodule "dotvim/bundle/vim-solidity"]
-	path = dotvim/bundle/vim-solidity
-	url = git@github.com:tomlion/vim-solidity.git
+[submodule "dotvim/bundle/vim-javascript"]
+	path = dotvim/bundle/vim-javascript
+	url = git@github.com:pangloss/vim-javascript.git
diff --git a/dotbash_profile b/dotbash_profile
index 7106bdf..0ed7800 100644
--- a/dotbash_profile
+++ b/dotbash_profile
@@ -4,7 +4,6 @@ export PYTHONPATH="/usr/local/lib/python2.7/site-packages:$PYTHONPATH"
 export PYTHON_ENV_PATH=$HOME/env
 export PIP_REQUIRE_VIRTUALENV=true
 export POSTGRES_PATH=/Applications/Postgres.app/Contents/Versions/latest/bin
-export ANT_HOME=$HOME"/projects/winston/build-support/apache-ant"
 export PATH=/usr/local/bin:~/bin:$PATH:$POSTGRES_PATH
 export EDITOR=/usr/bin/vi
 export TERM=xterm-256color
@@ -64,7 +63,6 @@ export PS1='\[$ORANGE\]\u\[$RESET\] @ \[$YELLOW\]\h\[$RESET\] in \[$GREEN\]\w\[$
 #
 ##################################################
 
-#export PYTHON_VIRTUALENV="${BLUE}[`basename \"$VIRTUAL_ENV\"`]${RESET} "
 function activate () {
     command source $PYTHON_ENV_PATH/$1/bin/activate
 }
@@ -85,6 +83,10 @@ function _envdir () {
 }
 complete -F _envdir activate
 
+# Setting PATH for Python 3.6
+PATH="/Library/Frameworks/Python.framework/Versions/3.6/bin:${PATH}"
+export PATH
+
 ##################################################
 #
 #   Ruby Stuffs
@@ -114,10 +116,33 @@ export PATH=$PATH:$(go env GOPATH)/bin
 
 ##################################################
 #
-#   SSH hosts autocomplete
+#   Rust Stuffs
+#
+##################################################
+
+export PATH="$HOME/.cargo/bin:$PATH"
+
+##################################################
+#
+#   Node Stuffs
 #
 ##################################################
 
+export PATH="~/.npm-global/bin:$PATH"
+
+##################################################
+#
+#   SSH stuffs
+#
+##################################################
+
+export GPG_TTY=$(tty)
+if [ -f "${HOME}/.gpg-agent-info" ]; then
+  . "${HOME}/.gpg-agent-info"
+  export GPG_AGENT_INFO
+  export SSH_AUTH_SOCK
+fi
+
 function _ssh_hosts () {
     local cur prev opts
     COMPREPLY=()
@@ -137,25 +162,6 @@ complete -F _ssh_hosts ssh
 #
 ##################################################
 
-if ![[ hash pbcopy 2>/dev/null ]]; then
-    alias pbcopy='xsel --clipboard --input'
-    alias pbpaste='xsel --clipboard --output'
-fi
-
-alias jsoncb="pbpaste | python -mjson.tool | gvim -"
 alias grep="grep --color=auto"
 
-# Setting PATH for Python 3.5
-# The orginal version is saved in .bash_profile.pysave
-PATH="/Library/Frameworks/Python.framework/Versions/3.5/bin:${PATH}"
-export PATH
-
 [[ -s "$HOME/.profile" ]] && source "$HOME/.profile"
-
-# Setting PATH for Python 3.6
-# The original version is saved in .bash_profile.pysave
-PATH="/Library/Frameworks/Python.framework/Versions/3.6/bin:${PATH}"
-export PATH
-
-export PATH="$HOME/.cargo/bin:$PATH"
-export PATH="~/.npm-global/bin:$PATH"
diff --git a/dotvim/bundle/vim-javascript b/dotvim/bundle/vim-javascript
new file mode 160000
index 0000000..4c0a554
--- /dev/null
+++ b/dotvim/bundle/vim-javascript
@@ -0,0 +1 @@
+Subproject commit 4c0a554423df72ecb8d13b143afa7a4cfcb994ec
diff --git a/dotvim/bundle/vim-solidity b/dotvim/bundle/vim-solidity
deleted file mode 160000
index 3375398..0000000
--- a/dotvim/bundle/vim-solidity
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 33753985e7a8c4bda8f8f93a0cc4ea181547becd
diff --git a/dotvimrc b/dotvimrc
index a59cf69..ba3a4e4 100644
--- a/dotvimrc
+++ b/dotvimrc
@@ -24,9 +24,9 @@ set backupdir=~/.saves
 set noswapfile
 set expandtab
 set smartindent
-set softtabstop=4
-set tabstop=4
-set shiftwidth=4
+set softtabstop=2
+set tabstop=2
+set shiftwidth=2
 set noerrorbells
 set visualbell
 set vb
@@ -45,7 +45,6 @@ map <C-S-tab> :tabprevious<cr>
 set wildignore+=**/node_modules,**/node_modules/*,**/target,**/target/*,coverage/*,*.log,test/output
 
 let mapleader=","
-"let g:CommandTAcceptSelectionTabMap='<CR>'
 let NERDTreeRespectWildIgnore=1
 let NERDTreeShowHidden=1
 let NERDTreeIgnore=['\.pyc$', '__pycache__']
@@ -56,26 +55,6 @@ map <leader>b :Gblame<cr>
 map <leader>d :Gdiff<cr>
 map <leader>t :tag<cr>
 
-" Setup project/team-specific configurations
-function! SetupEnvironment()
-    let l:path = expand('%:p')
-    " MapQuest
-    if l:path =~ '/Users/ashamblin14/workspace'
-        if &filetype == "javascript"
-            setlocal tabstop=2 softtabstop=2 shiftwidth=2
-        endif
-        if &filetype == "less"
-            setlocal tabstop=2 softtabstop=2 shiftwidth=2
-        endif
-        if &filetype == "css"
-            setlocal tabstop=2 softtabstop=2 shiftwidth=2
-        endif
-        if &filetype == "html"
-            setlocal tabstop=2 softtabstop=2 shiftwidth=2
-        endif
-    endif
-endfunction
-
 function! RestoreRegister()
     let @" = s:restore_reg
     return ''
@@ -103,8 +82,6 @@ au BufWritePost *.go :GoLint
 au BufNewFile,BufRead *.dat setlocal noexpandtab
 au BufNewFile,BufRead *.jade setlocal noexpandtab
 
-au BufNewFile,BufRead * call SetupEnvironment()
-
 vmap <silent> <expr> p <sid>Repl()
 
 let localrc = expand("~/.vim.local")
-- 
2.39.5