Refresh vim submodules, add tagbar

pengwynn · Jan 13, 2013 · 6aa2e52 · 6aa2e52
1 parent 03caad3
commit 6aa2e52
Show file tree

Hide file tree

Showing 25 changed files with 40 additions and 21 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -132,3 +132,6 @@
 [submodule "vim/vim.symlink/bundle/vim-tomdoc"]
 	path = vim/vim.symlink/bundle/vim-tomdoc
 	url = https://github.com/jc00ke/vim-tomdoc.git
+[submodule "vim/vim.symlink/bundle/tagbar"]
+	path = vim/vim.symlink/bundle/tagbar
+	url = https://github.com/majutsushi/tagbar.git
diff --git a/ctags/ctags.symlink b/ctags/ctags.symlink
@@ -0,0 +1,8 @@
+--languages=-javascript,sql
+--exclude=.git
+--langdef=css
+--langmap=css:.css
+--regex-css=/^[ \t]*([^\t {][^{]{1,100})(\t| )*{/\1/d,definition/
+--langdef=scss
+--langmap=scss:.scss
+--regex-scss=/^[ \t]*([^\t {][^{]{1,100})(\t| )*{/| \1/d,definition/
diff --git a/git/git_template.symlink/hooks/ctags b/git/git_template.symlink/hooks/ctags
@@ -1,3 +1,3 @@
 #!/bin/sh
 rm -f .git/tags
-ctags --tag-relative -Rf.git/tags --exclude=.git --languages=-javascript,sql
+ctags --tag-relative -Rf.git/tags 
diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
@@ -24,6 +24,7 @@
   # remove all local branches included in the current branch
   cleanup = !sh -c 'git branch --merged | grep -E "^[^*]" --exclude "^\\s*master" | xargs -n1 git branch -d'
   co = checkout
+  ctags = !.git/hooks/ctags
   # Show the diff between the latest commit and the current state
   d = !"git diff-index --quiet HEAD -- || clear; git diff --patch-with-stat"
   # `git di $number` shows the diff between the state `$number` revisions ago and the current state
@@ -80,4 +81,4 @@
 
 # vim: ft=gitconfig
 [credential]
-	helper = osxkeychain
+  helper = osxkeychain
diff --git a/vim/vim.symlink/bundle/ctrlp b/vim/vim.symlink/bundle/ctrlp
diff --git a/vim/vim.symlink/bundle/gist-vim b/vim/vim.symlink/bundle/gist-vim
diff --git a/vim/vim.symlink/bundle/gitv b/vim/vim.symlink/bundle/gitv
diff --git a/vim/vim.symlink/bundle/nerdcommenter b/vim/vim.symlink/bundle/nerdcommenter
diff --git a/vim/vim.symlink/bundle/nerdtree b/vim/vim.symlink/bundle/nerdtree
diff --git a/vim/vim.symlink/bundle/supertab b/vim/vim.symlink/bundle/supertab
diff --git a/vim/vim.symlink/bundle/tlib_vim b/vim/vim.symlink/bundle/tlib_vim
diff --git a/vim/vim.symlink/bundle/ultisnips-snippets b/vim/vim.symlink/bundle/ultisnips-snippets
diff --git a/vim/vim.symlink/bundle/vim-colors-solarized b/vim/vim.symlink/bundle/vim-colors-solarized
diff --git a/vim/vim.symlink/bundle/vim-commentary b/vim/vim.symlink/bundle/vim-commentary
diff --git a/vim/vim.symlink/bundle/vim-fugitive b/vim/vim.symlink/bundle/vim-fugitive
diff --git a/vim/vim.symlink/bundle/vim-haml b/vim/vim.symlink/bundle/vim-haml
diff --git a/vim/vim.symlink/bundle/vim-pathogen b/vim/vim.symlink/bundle/vim-pathogen
diff --git a/vim/vim.symlink/bundle/vim-rails b/vim/vim.symlink/bundle/vim-rails
diff --git a/vim/vim.symlink/bundle/vim-rake b/vim/vim.symlink/bundle/vim-rake
diff --git a/vim/vim.symlink/bundle/vim-ruby b/vim/vim.symlink/bundle/vim-ruby
diff --git a/vim/vim.symlink/bundle/vim-surround b/vim/vim.symlink/bundle/vim-surround
diff --git a/vim/vim.symlink/bundle/vimux b/vim/vim.symlink/bundle/vimux
diff --git a/vim/vim.symlink/bundle/webapi-vim b/vim/vim.symlink/bundle/webapi-vim
diff --git a/vim/vim.symlink/common.vim b/vim/vim.symlink/common.vim
@@ -1,3 +1,4 @@
+
 " Navigation
 " ==========
 " Move between wrapped lines as though they were physical lines.
@@ -27,6 +28,11 @@ set showmode
 " Toggle case
 nmap <F9> :set ignorecase! ignorecase?<CR>
 
+" Tagbar
+let g:tagbar_ctags_bin = '/opt/github/homebrew/bin/ctags'
+" Toggle tagbar
+nmap <Leader>t :TagbarToggle<CR>
+
 " Yank from cursor to end of line
 nnoremap Y y$
 

diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
@@ -36,6 +36,7 @@ syntax enable
 set t_Co=256
 colorscheme solarized
 set background=dark
+" let g:solarized_termcolors=256
 
 " General Config
 " ==============