submodules, and lot's of other stuff

12 years ago · 5c5f7d2921
parent 0605a99b4a
commit 5c5f7d2921
24 changed files with 29 additions and 31 deletions
--- a/3
+++ b/3
@ -6,10 +6,11 @@
 --ignore-dir=log
 --ignore-dir=tmp
 --ignore-dir=_srcs
+--ignore-dir=node_modules
 --ignore-dir=.sass-cache

 # we only want to search in scss/sass dirs
--ignore-dir=css
+# --ignore-dir=css

 --sort-files

--- a/com.googlecode.iterm2.plist
+++ b/com.googlecode.iterm2.plist
@ -458,9 +458,9 @@
 	<key>NSWindow Frame NSFontPanel</key>
 	<string>831 50 445 270 0 0 1280 778 </string>
 	<key>NSWindow Frame Preferences</key>
-	<string>169 228 924 485 0 0 1280 800 </string>
+	<string>473 415 924 485 0 0 1920 1058 </string>
 	<key>NSWindow Frame iTerm Window 0</key>
-	<string>131 73 1130 656 0 0 1280 800 </string>
+	<string>2123 257 1130 656 1920 0 1920 1080 </string>
 	<key>New Bookmarks</key>
 	<array>
 		<dict>
@ -1245,13 +1245,13 @@
 	<key>SUHasLaunchedBefore</key>
 	<true/>
 	<key>SULastCheckTime</key>
-	<date>2012-09-22T14:30:34Z</date>
+	<date>2012-10-24T21:04:09Z</date>
 	<key>SavePasteHistory</key>
 	<false/>
 	<key>ShowBookmarkName</key>
 	<false/>
 	<key>ShowFullScreenTabBar</key>
-	<true/>
+	<false/>
 	<key>ShowPaneTitles</key>
 	<true/>
 	<key>SmartPlacement</key>
--- a/7
+++ b/7
@ -3,7 +3,7 @@

 [core]
  excludesfile = ~/.gitignore
-  editor = mvim -f
+  editor = vim
  autocrlf = input
  eol = lf
  pager = less -FXRS -x2
@ -46,11 +46,8 @@

 [diff]
  tool = vimdiff
-  guitool = mvimdiff
+  guitool = vimdiff

 [mergetool]
  prompt = false
  keepBackup = false
-
-[difftool "mvimdiff"]
-  cmd = /usr/local/bin/mvimdiff -f "$LOCAL" "$MERGED" "$REMOTE"
--- a/vim/bundle/ack
+++ b/vim/bundle/ack
@ -1 +1 @@
-Subproject commit 9895285042a2fd5691b2f6582aa979e4d1bdffea
+Subproject commit fd9632b40ac07b39adb270311cde2c460c9ba6da
--- a/vim/bundle/ctrlp
+++ b/vim/bundle/ctrlp
@ -1 +1 @@
-Subproject commit be5842a376f16c16c5dc4cc1879d7168a074f7de
+Subproject commit 7251d9dce85e45b41dab00d7d7032713847ed5ea
--- a/vim/bundle/fugitive
+++ b/vim/bundle/fugitive
@ -1 +1 @@
-Subproject commit 31dead6d8088dc7073d0e2645517ebc68d6de06b
+Subproject commit 003f38c6a4d8e3d527e4e1dfeab6fdf05c8ff149
--- a/vim/bundle/gist
+++ b/vim/bundle/gist
@ -1 +1 @@
-Subproject commit b41d650e38828c908e5c86d32745c5068e694a03
+Subproject commit f94abc65592874bd2fc78730ce896cfd61cac543
--- a/vim/bundle/git
+++ b/vim/bundle/git
@ -1 +1 @@
-Subproject commit 75bc1628833ee1f1d8ecb8a66c5df852554c9a19
+Subproject commit 4bc24f694d12bea02f8a97a02efc2987a5cb66f9
--- a/vim/bundle/html5
+++ b/vim/bundle/html5
@ -1 +1 @@
-Subproject commit d89cdd355c10335d02531e83eb0c699304914e1e
+Subproject commit 020d440eeb2a65800b1a0087bb8a7196b6cec4db
--- a/vim/bundle/jellybeans
+++ b/vim/bundle/jellybeans
@ -1 +1 @@
-Subproject commit 2737231a45b02e54c53c1912ba06d7e77502cb46
+Subproject commit 20975570a6f1f952e19ae3293ce44b9d73fd48bd
--- a/vim/bundle/markdown
+++ b/vim/bundle/markdown
@ -1 +1 @@
-Subproject commit dcdab0cd55da5e0b8655c000d99d96624cd6404c
+Subproject commit 9407dae6609ef9751acc8eedc30f52999018eb47
--- a/vim/bundle/mw-utils
+++ b/vim/bundle/mw-utils
@ -1 +1 @@
-Subproject commit a1b611ab22745f8b877d8de4f09985a0ddf3acfd
+Subproject commit 0c5612fa31ee434ba055e21c76f456244b3b5109
--- a/vim/bundle/nerdtree
+++ b/vim/bundle/nerdtree
@ -1 +1 @@
-Subproject commit bf79e223aefe0665bcc62b5dcc4c2c23c6f23fc5
+Subproject commit 1dc3891f960c25aa3f23aa46f5afc8d41db38233
--- a/vim/bundle/powerline
+++ b/vim/bundle/powerline
@ -1 +1 @@
-Subproject commit 20ab08c9a8fe6cdfb7c303aa3063f211d72f8b2f
+Subproject commit 2af074850fde676743f655775e3e151925751adf
--- a/vim/bundle/repeat
+++ b/vim/bundle/repeat
@ -1 +1 @@
-Subproject commit 613eb1c81261adfa5dead315089c432ff6dbbc51
+Subproject commit f1d0fbbdf4d77b73ba47146bada375223b3d733a
--- a/vim/bundle/snipmate
+++ b/vim/bundle/snipmate
@ -1 +1 @@
-Subproject commit 220347a0ddfa6ad4365b2f307518d2b33d080411
+Subproject commit e77388ca26d2455c3bec32a827c5c91daac4e960
--- a/vim/bundle/supertab
+++ b/vim/bundle/supertab
@ -1 +1 @@
-Subproject commit 7152e361e78d08857c577b1161fe6f6235b8a9aa
+Subproject commit e2990372442fdf026cc1ef458abdf9a1a4e891ef
--- a/vim/bundle/syntastic
+++ b/vim/bundle/syntastic
@ -1 +1 @@
-Subproject commit 2e7d73305b70a456abb20b1754e094cccfefa3d3
+Subproject commit d448f180e4a0c0ecd4c80cac62fa84d8403e6efa
--- a/vim/bundle/tabular
+++ b/vim/bundle/tabular
@ -1 +1 @@
-Subproject commit ad2a5a1d54443ab27f1282c5617f55b8e0819623
+Subproject commit 7f6f1723a27fe3948ea7d2bb8465e3bf28f63f56
--- a/vim/bundle/tcomment
+++ b/vim/bundle/tcomment
@ -1 +1 @@
-Subproject commit ef6b4443d7bf1f3194692272f54c50ee4c61e400
+Subproject commit 3ad639fcd815ae28fbec65a32c3a74871bce41c5
--- a/vim/bundle/tlib
+++ b/vim/bundle/tlib
@ -1 +1 @@
-Subproject commit 992c21804d003faffcaec0014a5f61e2ce76f57e
+Subproject commit 3ac0fde75b79aad302abaa2f367f8a48deddbd41
--- a/vim/bundle/unimpaired
+++ b/vim/bundle/unimpaired
@ -1 +1 @@
-Subproject commit e8013727a008a68664a789fe0d2b5c2ab2ecf657
+Subproject commit 9507b80198acd1dd5da10fb01f69fa735c163800
--- a/2
+++ b/2
@ -276,7 +276,7 @@ let g:tagbar_compact=1
 let g:ctrlp_map = '<leader>t'
 let g:ctrlp_working_path_mode = 0
 let g:ctrlp_max_height = 12
-let g:ctrlp_custom_ignore = { 'dir':  '\v[\/](\.git|\.hg|\.svn|\.sass-cache)$',
+let g:ctrlp_custom_ignore = { 'dir':  '\v[\/](\.git|\.hg|\.svn|node_modules|\.sass-cache)$',
                            \ 'file': '\.exe$\|\.so$\|\.dll$\|\.psd$\|\.png$\|\.jpg$\|\.gif$',
                            \ }
 " easier split screens
--- a/2
+++ b/2
@ -9,7 +9,7 @@ source $ZSH/oh-my-zsh.sh
 unsetopt correct_all

 # paths
-export PATH=/usr/local/bin:/usr/local/sbin:/usr/local/share/npm/bin:$HOME/.rvm/bin:$PATH
+export PATH=/usr/local/bin:/usr/local/sbin:$HOME/.rvm/bin:$PATH
 export MANPATH=/usr/local/share/man:$MANPATH

 # disable stupid ._ and dsstore files