update bundles, mappings and software used, major update

8 years ago · d3d30959bb
parent 59bd9b3420
commit d3d30959bb
16 changed files with 70 additions and 88 deletions
--- a/install/_install.sh
+++ b/install/_install.sh
@ -20,10 +20,15 @@ brew install brew-cask
 brew install clipper
 brew install coreutils
 brew install git
-brew install macvim --with-cscope --with-lua --HEAD
 brew install tmux
 brew install zsh

+# install macvim and neobundle for vim
+brew install macvim --with-cscope --with-lua --HEAD
+mkdir ~/.vim/bundle
+git clone https://github.com/Shougo/neobundle.vim ~/.vim/bundle/neobundle.vim
+
+# this is the minimal software used
 brew cask install forklift
 brew cask install iterm2

--- a/install/brew.sh
+++ b/install/brew.sh
@ -32,10 +32,8 @@ brew cask install adium
 brew cask install alfred
 brew cask install amadeus-pro
 brew cask install bartender
-brew cask install betterzipql
 brew cask install carbon-copy-cloner
 brew cask install doxie
-brew cask install dropbox
 brew cask install firefox
 brew cask install flux
 brew cask install google-chrome
--- a/install/node.sh
+++ b/install/node.sh
@ -2,18 +2,15 @@

 brew uninstall node
 brew update
-brew install node --without-npm
+brew install node
 brew unlink node
 brew link node
-curl -L https://npmjs.org/install.sh | sh

 npm install -g babel
-npm install -g browser-run
 npm install -g browserify
 npm install -g caniuse-cmd
 npm install -g dploy
 npm install -g eslint
-npm install -g faucet
 npm install -g fkill-cli
 npm install -g frontend-md
 npm install -g grunt-cli
@ -26,6 +23,5 @@ npm install -g pure-prompt
 npm install -g recursive-blame
 npm install -g stylestats
 npm install -g svgo
-npm install -g tape
 npm install -g trash
 npm install -g vtop
--- a/install/ruby.sh
+++ b/install/ruby.sh
@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-rbenv install 2.2.2
+rbenv install 2.3.0
 gem install bundler --no-document
 gem install capistrano --no-document
 gem install sass --no-document
--- a/iterm/com.googlecode.iterm2.plist
+++ b/iterm/com.googlecode.iterm2.plist
@ -652,9 +652,9 @@
 	<key>NSWindow Frame NSFontPanel</key>
 	<string>831 374 445 270 0 0 1280 778 </string>
 	<key>NSWindow Frame Preferences</key>
-	<string>906 264 924 485 0 0 1920 1080 </string>
+	<string>324 130 924 485 0 0 1280 778 </string>
 	<key>NSWindow Frame iTerm Window 0</key>
-	<string>0 402 1130 656 0 0 1920 1080 </string>
+	<string>3 102 1130 656 0 0 1280 778 </string>
 	<key>NSWindow Frame iTerm Window 1</key>
 	<string>94 42 1130 656 0 0 1280 778 </string>
 	<key>NSWindow Frame iTerm Window 2</key>
@ -680,11 +680,11 @@
 			<key>Ansi 1 Color</key>
 			<dict>
 				<key>Blue Component</key>
-				<real>0.14145712554454803</real>
+				<real>0.14145714044570923</real>
 				<key>Green Component</key>
-				<real>0.10840645432472229</real>
+				<real>0.10840655118227005</real>
 				<key>Red Component</key>
-				<real>0.81926983594894409</real>
+				<real>0.81926977634429932</real>
 			</dict>
 			<key>Ansi 10 Color</key>
 			<dict>
@ -797,11 +797,11 @@
 			<key>Ansi 8 Color</key>
 			<dict>
 				<key>Blue Component</key>
-				<real>0.15170273184776306</real>
+				<real>0.5859375</real>
 				<key>Green Component</key>
-				<real>0.11783610284328461</real>
+				<real>0.578125</real>
 				<key>Red Component</key>
-				<real>0.0</real>
+				<real>0.51171875</real>
 			</dict>
 			<key>Ansi 9 Color</key>
 			<dict>
@ -819,11 +819,11 @@
 			<key>Background Color</key>
 			<dict>
 				<key>Blue Component</key>
-				<real>0.86405980587005615</real>
+				<real>0.15170273184776306</real>
 				<key>Green Component</key>
-				<real>0.95794391632080078</real>
+				<real>0.11783610284328461</real>
 				<key>Red Component</key>
-				<real>0.98943418264389038</real>
+				<real>0.0</real>
 			</dict>
 			<key>Background Image Is Tiled</key>
 			<false/>
@ -842,11 +842,11 @@
 			<key>Bold Color</key>
 			<dict>
 				<key>Blue Component</key>
-				<real>0.38298487663269043</real>
+				<real>0.56363654136657715</real>
 				<key>Green Component</key>
-				<real>0.35665956139564514</real>
+				<real>0.56485837697982788</real>
 				<key>Red Component</key>
-				<real>0.27671992778778076</real>
+				<real>0.50599193572998047</real>
 			</dict>
 			<key>Character Encoding</key>
 			<integer>4</integer>
@ -859,20 +859,20 @@
 			<key>Cursor Color</key>
 			<dict>
 				<key>Blue Component</key>
-				<real>0.43850564956665039</real>
+				<real>0.51685798168182373</real>
 				<key>Green Component</key>
-				<real>0.40717673301696777</real>
+				<real>0.50962930917739868</real>
 				<key>Red Component</key>
-				<real>0.32436618208885193</real>
+				<real>0.44058024883270264</real>
 			</dict>
 			<key>Cursor Text Color</key>
 			<dict>
 				<key>Blue Component</key>
-				<real>0.79781103134155273</real>
+				<real>0.19370138645172119</real>
 				<key>Green Component</key>
-				<real>0.89001238346099854</real>
+				<real>0.15575926005840302</real>
 				<key>Red Component</key>
-				<real>0.91611063480377197</real>
+				<real>0.0</real>
 			</dict>
 			<key>Cursor Type</key>
 			<integer>2</integer>
@ -893,11 +893,11 @@
 			<key>Foreground Color</key>
 			<dict>
 				<key>Blue Component</key>
-				<real>0.43850564956665039</real>
+				<real>0.51685798168182373</real>
 				<key>Green Component</key>
-				<real>0.40717673301696777</real>
+				<real>0.50962930917739868</real>
 				<key>Red Component</key>
-				<real>0.32436618208885193</real>
+				<real>0.44058024883270264</real>
 			</dict>
 			<key>Guid</key>
 			<string>AF193C6A-267D-401F-96A5-28DBBB598B19</string>
@ -1232,20 +1232,20 @@
 			<key>Selected Text Color</key>
 			<dict>
 				<key>Blue Component</key>
-				<real>0.38298487663269043</real>
+				<real>0.56363654136657715</real>
 				<key>Green Component</key>
-				<real>0.35665956139564514</real>
+				<real>0.56485837697982788</real>
 				<key>Red Component</key>
-				<real>0.27671992778778076</real>
+				<real>0.50599193572998047</real>
 			</dict>
 			<key>Selection Color</key>
 			<dict>
 				<key>Blue Component</key>
-				<real>0.79781103134155273</real>
+				<real>0.19370138645172119</real>
 				<key>Green Component</key>
-				<real>0.89001238346099854</real>
+				<real>0.15575926005840302</real>
 				<key>Red Component</key>
-				<real>0.91611063480377197</real>
+				<real>0.0</real>
 			</dict>
 			<key>Semantic History</key>
 			<dict>
@ -2117,7 +2117,7 @@
 	<key>NoSyncTimeOfLastPromo</key>
 	<real>453214263.015971</real>
 	<key>NoSyncTimeOfLastPromoDownload</key>
-	<real>470760209.60246497</real>
+	<real>470933011.22990698</real>
 	<key>OnlyWhenMoreTabs</key>
 	<false/>
 	<key>OpenArrangementAtStartup</key>
@ -2184,7 +2184,7 @@
 	<key>SUHasLaunchedBefore</key>
 	<true/>
 	<key>SULastCheckTime</key>
-	<date>2015-12-02T14:03:37Z</date>
+	<date>2015-12-04T14:03:45Z</date>
 	<key>SavePasteHistory</key>
 	<false/>
 	<key>Show Toolbelt</key>
--- a/tmux.conf
+++ b/tmux.conf
@ -56,10 +56,8 @@ bind -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"


 # Mouse support
-set -g mode-mouse on
-set -g mouse-select-pane on
-set -g mouse-select-window on
-set -g mouse-resize-pane on
+set -g mouse-utf8 on
+set -g mouse on

 # counting panes starts at 1
 set -g base-index 1
--- a/vim/config/bundles.vim
+++ b/vim/config/bundles.vim
@ -1,48 +1,48 @@
 " All bundles, syntaxes and plugins
 "======================================================================
 "
-NeoBundle 'Shougo/vimproc.vim', {
-    \ 'build': {
-    \     'mac': 'make -f make_mac.mak',
-    \     'linux': 'make',
-    \     'unix': 'gmake'
-    \    }
-    \ }
-
 NeoBundle 'Shougo/neocomplete'
 NeoBundle 'Shougo/neosnippet'
 NeoBundle 'Shougo/unite.vim'
 NeoBundle 'altercation/vim-colors-solarized'
-NeoBundle 'beyondwords/vim-twig'
-NeoBundle 'cakebaker/scss-syntax.vim'
+" NeoBundle 'cakebaker/scss-syntax.vim'
 NeoBundle 'christoomey/vim-tmux-navigator'
-NeoBundle 'cohama/lexima.vim'
 NeoBundle 'editorconfig/editorconfig-vim'
-NeoBundle 'elzr/vim-json'
 NeoBundle 'gcmt/wildfire.vim'
-NeoBundle 'godlygeek/tabular'
-NeoBundle 'hail2u/vim-css3-syntax'
 NeoBundle 'haya14busa/incsearch.vim'
 NeoBundle 'itchyny/lightline.vim'
-NeoBundle 'joshtronic/php.vim'
 NeoBundle 'justinmk/vim-sneak'
 NeoBundle 'moll/vim-node'
-NeoBundle 'othree/html5.vim'
-NeoBundle 'othree/javascript-libraries-syntax.vim'
-NeoBundle 'othree/yajs.vim'
 NeoBundle 'scrooloose/syntastic'
-NeoBundle 'tomtom/tcomment_vim'
+NeoBundle 'sheerun/vim-polyglot'
+NeoBundle 'tpope/vim-commentary'
 NeoBundle 'tpope/vim-fugitive'
-NeoBundle 'tpope/vim-git'
-NeoBundle 'tpope/vim-markdown'
 NeoBundle 'tpope/vim-ragtag'
 NeoBundle 'tpope/vim-repeat'
 NeoBundle 'tpope/vim-surround'
 NeoBundle 'tpope/vim-unimpaired'
 NeoBundle 'tpope/vim-vinegar'
-NeoBundle 'vim-scripts/matchit.zip'
+NeoBundle 'matchit.zip'
 NeoBundle 'webgefrickel/vim-snippets'
 NeoBundle 'wellle/tmux-complete.vim'

+
+NeoBundle 'Shougo/vimproc.vim', {
+    \ 'build': {
+    \     'mac': 'make -f make_mac.mak',
+    \     'linux': 'make',
+    \     'unix': 'gmake'
+    \    }
+    \ }
+
+
+NeoBundle 'matchit.zip', {
+    \ 'on_map' : ['%', 'g%']
+    \ }
+let bundle = neobundle#get('matchit.zip')
+function! bundle.hooks.on_post_source(bundle)
+  silent! execute 'doautocmd Filetype' &filetype
+endfunction
+
 " end neobundle config
 call neobundle#end()
--- a/vim/config/defaultconfig.vim
+++ b/vim/config/defaultconfig.vim
@ -4,6 +4,8 @@
 filetype plugin indent on
 syntax on

+NeoBundleCheck
+
 set autoread                               " Automatically read a file that has changed on disk
 set backspace=indent,eol,start             " Allow backspacing over everything in insert mode
 set cursorline                             " highlight current line
--- a/vim/config/leaderkeys.vim
+++ b/vim/config/leaderkeys.vim
@ -21,9 +21,6 @@ nnoremap <leader>o :e <C-R>=expand("%:p:h") . "/" <CR>
 " Yank to clipboard with clipper -- see https://github.com/wincent/clipper
 nnoremap <leader>y :call system('nc localhost 8377', @0)<CR>

-" reset search
-nnoremap <leader><space> :noh<cr>
-
 " Find merge conflict markers
 nnoremap <leader>g /\v^[<\|=>]{7}( .*\|$)<CR>

--- a/vim/config/plugins/tabularize.vim
+++ b/vim/config/plugins/tabularize.vim
@ -1,7 +0,0 @@
-" Tabularize
-"======================================================================
-
-vmap <Leader>t= :Tabularize /=<CR>
-vmap <Leader>t{ :Tabularize /{<CR>
-vmap <Leader>t: :Tabularize /:<CR>
-vmap <Leader>t, :Tabularize /,<CR>
--- a/vim/config/plugins/tcomment.vim
+++ b/vim/config/plugins/tcomment.vim
@ -1,6 +0,0 @@
-" TComment
-"======================================================================
-
-nnoremap <leader>/ :TComment<CR>
-vnoremap <leader>/ :TComment<CR>
-inoremap <leader>/ <Esc>:TComment<CR>
--- a/2
+++ b/2
@ -31,8 +31,6 @@ source ~/.vim/config/plugins/lightline.vim
 source ~/.vim/config/plugins/neocomplete.vim
 source ~/.vim/config/plugins/neosnippet.vim
 source ~/.vim/config/plugins/syntastic.vim
-source ~/.vim/config/plugins/tabularize.vim
-source ~/.vim/config/plugins/tcomment.vim
 source ~/.vim/config/plugins/unite.vim
 source ~/.vim/config/plugins/sneak.vim
 source ~/.vim/config/plugins/wildfire.vim
--- a/zsh/dircolors-solarized
+++ b/zsh/dircolors-solarized
@ -1 +1 @@
-Subproject commit 704b2feb7f43446112d064622add413f5351ff13
+Subproject commit e6fa8d4c0f64d9758e7ff32fe8d10f9800396d3c
--- a/zsh/exports
+++ b/zsh/exports
@ -6,6 +6,7 @@ export HOMEBREW_CASK_OPTS="--appdir=/Applications"

 # paths
 export PATH=$HOME/.rbenv/shims:$PATH
+export PATH=$HOME/.composer/vendor/bin:$PATH
 export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH
 export NODE_PATH=/usr/local/lib/jsctags/:$NODE_PATH
@ -34,7 +35,7 @@ export LESS="-R"
 export LC_CTYPE=$LANG

 # ruby
-export RBENV_VERSION="2.2.2"
+export RBENV_VERSION="2.3.0"

 # docker -- boot2docker config
 export DOCKER_TLS_VERIFY=1
--- a/zsh/zsh-completions
+++ b/zsh/zsh-completions
@ -1 +1 @@
-Subproject commit 68c949470eaa87c5d67080d32fb2b69c8b837eb4
+Subproject commit 99cc7ea060637884293f38efb0d192828adcf8ff
--- a/zsh/zsh-syntax-highlighting
+++ b/zsh/zsh-syntax-highlighting
@ -1 +1 @@
-Subproject commit 3dc574190071ef59054f6d693132410b37aa3ae4
+Subproject commit e500ca246286e15789869de98dfa70d78574cdb0