Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mattly/dotfiles
base: f0c6fab80f
...
head fork: mattly/dotfiles
compare: ff61d2b038
  • 5 commits
  • 33 files changed
  • 0 commit comments
  • 1 contributor
Showing with 52 additions and 38 deletions.
  1. +3 −0  .gitmodules
  2. +1 −1  vim/bundle/ctrlp.vim.git
  3. +1 −0  vim/bundle/gitv.git
  4. +1 −1  vim/bundle/mustache.vim.git
  5. +1 −1  vim/bundle/supertab.git
  6. +1 −1  vim/bundle/surround.git
  7. +1 −1  vim/bundle/syntastic.git
  8. +1 −1  vim/bundle/tcomment_vim.git
  9. +1 −1  vim/bundle/vim-abolish.git
  10. +1 −1  vim/bundle/vim-autoclose.git
  11. +1 −1  vim/bundle/vim-coffee-script.git
  12. +1 −1  vim/bundle/vim-endwise.git
  13. +1 −1  vim/bundle/vim-eunuch.git
  14. +1 −1  vim/bundle/vim-fugitive.git
  15. +1 −1  vim/bundle/vim-git.git
  16. +1 −1  vim/bundle/vim-haml.git/ftdetect/haml.vim
  17. +1 −1  vim/bundle/vim-haml.git/indent/haml.vim
  18. +13 −7 vim/bundle/vim-haml.git/syntax/sass.vim
  19. +1 −1  vim/bundle/vim-jade.git
  20. +1 −1  vim/bundle/vim-javascript.git
  21. +1 −1  vim/bundle/vim-les.git
  22. +1 −1  vim/bundle/vim-markdown.git
  23. +1 −1  vim/bundle/vim-pathogen.git
  24. +1 −1  vim/bundle/vim-ragtag.git
  25. +0 −1  vim/bundle/vim-rails.git
  26. +1 −1  vim/bundle/vim-rake.git
  27. +1 −1  vim/bundle/vim-repeat.git
  28. +0 −1  vim/bundle/vim-slim.git
  29. +1 −1  vim/bundle/vim-stylus.git
  30. +1 −1  vim/bundle/vim-unimpaired.git
  31. +1 −1  vim/bundle/zencoding-vim.git
  32. 0  vim/{bundle → bundle_disabled}/nerdtree.git
  33. +9 −3 vimrc
View
3  .gitmodules
@@ -109,3 +109,6 @@
[submodule "vim/bundle/vim-tmux.git"]
path = vim/bundle/vim-tmux.git
url = https://github.com/tsaleh/vim-tmux.git
+[submodule "vim/bundle/gitv.git"]
+ path = vim/bundle/gitv.git
+ url = https://github.com/gregsexton/gitv.git
2  vim/bundle/ctrlp.vim.git
@@ -1 +1 @@
-Subproject commit bcc55dabc9da2626d5ff9d43608fb85cc3b90b47
+Subproject commit 4d5b39c0cf005bc48e6d5916e631c0b444ebc419
1  vim/bundle/gitv.git
@@ -0,0 +1 @@
+Subproject commit 582e32b9e387dd6f2d8f69ceb5416b555efb80e3
2  vim/bundle/mustache.vim.git
@@ -1 +1 @@
-Subproject commit 9c119016faf2e3e6c9077cf8bb9a7df400c2c400
+Subproject commit c3ee501a2dcabb8f145169b7a5df7ff74093104e
2  vim/bundle/supertab.git
@@ -1 +1 @@
-Subproject commit 80ec6539e4139a2e0281a0f1e36d5038d55ad980
+Subproject commit ee35ab6954a11337a2b52003d07fabe442843b68
2  vim/bundle/surround.git
@@ -1 +1 @@
-Subproject commit f6c9d3beb2d11959d22b2555636aeb0c37e66aa1
+Subproject commit 1a73f607f8f5477d6942df2eb6e7245c4864f4d3
2  vim/bundle/syntastic.git
@@ -1 +1 @@
-Subproject commit c8dc739e555f416ac65eab52b0bed4919ad818bb
+Subproject commit e5dfcc3488e407c8e28b308cb6e631336e77d060
2  vim/bundle/tcomment_vim.git
@@ -1 +1 @@
-Subproject commit 9869c70206ba7398a0912e14f968a13cd53d41cf
+Subproject commit 4d55a4b55666a5846956655e1a1ca30004702b06
2  vim/bundle/vim-abolish.git
@@ -1 +1 @@
-Subproject commit 6a633f685c59d80d9b73fb40506fde2e709abe04
+Subproject commit f8829a5f3e5a2a9c5e8a17f322aa9296a0cdb622
2  vim/bundle/vim-autoclose.git
@@ -1 +1 @@
-Subproject commit ac2ca9ba4de085b0c2849363affa81adc1a85f74
+Subproject commit a435a9aed0abbcf2821f812d2f7dd8dd3b97e360
2  vim/bundle/vim-coffee-script.git
@@ -1 +1 @@
-Subproject commit dc1692561461fd0b7642e05b03b7670974112eee
+Subproject commit d6dcb9b0fb5beac9e84cfb84c1917b7e0df5850f
2  vim/bundle/vim-endwise.git
@@ -1 +1 @@
-Subproject commit 9a9d1994eaeae3f2f23da6bb71111782ab70276c
+Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d
2  vim/bundle/vim-eunuch.git
@@ -1 +1 @@
-Subproject commit f8fdf3700fb2f99611828e307b9c87daf0e84855
+Subproject commit fd3da99b62291c6732b264feedc24e3d73f1baa9
2  vim/bundle/vim-fugitive.git
@@ -1 +1 @@
-Subproject commit 22c8ffa2ba3ce30364fef382a7c505826a5c5761
+Subproject commit 0abe1fb12232abe5b7bdfa4d244f04faf3450ba3
2  vim/bundle/vim-git.git
@@ -1 +1 @@
-Subproject commit 291cbe97f2c367f40360949f19b4fa8fb0740e9f
+Subproject commit 2d54fb2b87fe3b74c2fb00edcfaa1f711944e6ea
View
2  vim/bundle/vim-haml.git/ftdetect/haml.vim
@@ -1,3 +1,3 @@
-autocmd BufNewFile,BufRead *.haml setf haml
+autocmd BufNewFile,BufRead *.haml,*.hamlbars setf haml
autocmd BufNewFile,BufRead *.sass setf sass
autocmd BufNewFile,BufRead *.scss setf scss
View
2  vim/bundle/vim-haml.git/indent/haml.vim
@@ -23,7 +23,7 @@ let s:attributes = '\%({.\{-\}}\|\[.\{-\}\]\)'
let s:tag = '\%([%.#][[:alnum:]_-]\+\|'.s:attributes.'\)*[<>]*'
if !exists('g:haml_self_closing_tags')
- let g:haml_self_closing_tags = 'meta|link|img|hr|br'
+ let g:haml_self_closing_tags = 'base|link|meta|br|hr|img|input'
endif
function! GetHamlIndent()
View
20 vim/bundle/vim-haml.git/syntax/sass.vim
@@ -17,8 +17,8 @@ syn cluster sassCssAttributes contains=css.*Attr,scssComment,cssValue.*,cssColor
syn region sassDefinition matchgroup=cssBraces start="{" end="}" contains=TOP
-syn match sassProperty "\%([{};]\s*\|^\)\@<=\%([[:alnum:]-]\|#{[^{}]*}\)\+:" contains=css.*Prop skipwhite nextgroup=sassCssAttribute contained containedin=sassDefinition
-syn match sassProperty "^\s*\zs\s\%(\%([[:alnum:]-]\|#{[^{}]*}\)\+:\|:[[:alnum:]-]\+\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute
+syn match sassProperty "\%([{};]\s*\|^\)\@<=\%([[:alnum:]-]\|#{[^{}]*}\)\+\s*:" contains=css.*Prop skipwhite nextgroup=sassCssAttribute contained containedin=sassDefinition
+syn match sassProperty "^\s*\zs\s\%(\%([[:alnum:]-]\|#{[^{}]*}\)\+\s*:\|:[[:alnum:]-]\+\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute
syn match sassProperty "^\s*\zs\s\%(:\=[[:alnum:]-]\+\s*=\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute
syn match sassCssAttribute +\%("\%([^"]\|\\"\)*"\|'\%([^']\|\\'\)*'\|#{[^{}]*}\|[^{};]\)*+ contained contains=@sassCssAttributes,sassVariable,sassFunction,sassInterpolation
syn match sassDefault "!default\>" contained
@@ -34,15 +34,19 @@ syn match sassFunction "\<\%(unquote\|quote\)\>(\@=" contained
syn match sassFunction "\<\%(percentage\|round\|ceil\|floor\|abs\)\>(\@=" contained
syn match sassFunction "\<\%(type-of\|unit\|unitless\|comparable\)\>(\@=" contained
-syn region sassInterpolation matchgroup=sassInterpolationDelimiter start="#{" end="}" contains=@sassCssAttributes,sassVariable,sassFunction containedin=cssStringQ,cssStringQQ,sassProperty
+syn region sassInterpolation matchgroup=sassInterpolationDelimiter start="#{" end="}" contains=@sassCssAttributes,sassVariable,sassFunction containedin=cssStringQ,cssStringQQ,cssPseudoClass,sassProperty
syn match sassMixinName "[[:alnum:]_-]\+" contained nextgroup=sassCssAttribute
-syn match sassMixin "^=" nextgroup=sassMixinName
+syn match sassMixin "^=" nextgroup=sassMixinName skipwhite
syn match sassMixin "\%([{};]\s*\|^\s*\)\@<=@mixin" nextgroup=sassMixinName skipwhite
syn match sassMixing "^\s\+\zs+" nextgroup=sassMixinName
syn match sassMixing "\%([{};]\s*\|^\s*\)\@<=@include" nextgroup=sassMixinName skipwhite
syn match sassExtend "\%([{};]\s*\|^\s*\)\@<=@extend"
+syn match sassFunctionName "[[:alnum:]_-]\+" contained nextgroup=sassCssAttribute
+syn match sassFunctionDecl "\%([{};]\s*\|^\s*\)\@<=@function" nextgroup=sassFunctionName skipwhite
+syn match sassReturn "\%([{};]\s*\|^\s*\)\@<=@return"
+
syn match sassEscape "^\s*\zs\\"
syn match sassIdChar "#[[:alnum:]_-]\@=" nextgroup=sassId
syn match sassId "[[:alnum:]_-]\+" contained
@@ -53,11 +57,11 @@ syn match sassAmpersand "&"
" TODO: Attribute namespaces
" TODO: Arithmetic (including strings and concatenation)
-syn region sassInclude start="@import" end=";\|$" contains=scssComment,cssURL,cssUnicodeEscape,cssMediaType
+syn region sassInclude start="@import" end=";\|$" contains=scssComment,cssStringQ,cssStringQQ,cssURL,cssUnicodeEscape,cssMediaType
syn region sassDebugLine end=";\|$" matchgroup=sassDebug start="@debug\>" contains=@sassCssAttributes,sassVariable,sassFunction
syn region sassWarnLine end=";\|$" matchgroup=sassWarn start="@warn\>" contains=@sassCssAttributes,sassVariable,sassFunction
-syn region sassControlLine matchgroup=sassControl start="@\%(if\|else\%(\s\+if\)\=\|while\|for\)\>" end="[{};]\@=\|$" contains=sassFor,@sassCssAttributes,sassVariable,sassFunction
-syn keyword sassFor from to through contained
+syn region sassControlLine matchgroup=sassControl start="@\%(if\|else\%(\s\+if\)\=\|while\|for\|each\)\>" end="[{};]\@=\|$" contains=sassFor,@sassCssAttributes,sassVariable,sassFunction
+syn keyword sassFor from to through in contained
syn keyword sassTodo FIXME NOTE TODO OPTIMIZE XXX contained
syn region sassComment start="^\z(\s*\)//" end="^\%(\z1 \)\@!" contains=sassTodo,@Spell
@@ -71,6 +75,8 @@ hi def link sassFunction Function
hi def link sassMixing PreProc
hi def link sassMixin PreProc
hi def link sassExtend PreProc
+hi def link sassFunctionDecl PreProc
+hi def link sassReturn PreProc
hi def link sassTodo Todo
hi def link sassInclude Include
hi def link sassDebug sassControl
2  vim/bundle/vim-jade.git
@@ -1 +1 @@
-Subproject commit 77d83abc6c8e6c18fc91446c7cf2deebd4848a29
+Subproject commit 6a1f80934605cd200bb646c4997b1b0e5d3bcf28
2  vim/bundle/vim-javascript.git
@@ -1 +1 @@
-Subproject commit 9990a767695c78a44611ce33fb2dbc25c83d8827
+Subproject commit 827c47c10b8ce97fc8982329e4236584e73826cf
2  vim/bundle/vim-les.git
@@ -1 +1 @@
-Subproject commit 3c2a265b89d1d9848633cfc1642d2e78ecd73a25
+Subproject commit d605010cab695dca64c5cd9bf8bbcc8db9864815
2  vim/bundle/vim-markdown.git
@@ -1 +1 @@
-Subproject commit ae3a2653f824bb9e969f462c5d77e035a518ea61
+Subproject commit 7b747d0aa4f2ff2239983c05bb4f18ea6e760770
2  vim/bundle/vim-pathogen.git
@@ -1 +1 @@
-Subproject commit 9631019a3eeb4f6e4755a8075748d26d4c1d6a67
+Subproject commit 5e3fdd3a8a3b244e1fedd0f5597f4a9879e16c3b
2  vim/bundle/vim-ragtag.git
@@ -1 +1 @@
-Subproject commit bdc8b580b5b583aeb43efb19aac2ab8ce5566dff
+Subproject commit 2f639ea61ab037e7862228d54a1c292f59c2385f
1  vim/bundle/vim-rails.git
@@ -1 +0,0 @@
-Subproject commit d94405aae64ff10fc10a78807b5e9214c83c60df
2  vim/bundle/vim-rake.git
@@ -1 +1 @@
-Subproject commit 8a93dc7a57308e08f7d3c83f9824a1c43e12c5ba
+Subproject commit fd4cadbd944badba8ebf6b324aac367e78059461
2  vim/bundle/vim-repeat.git
@@ -1 +1 @@
-Subproject commit c4101c205ef9e06bdfeff571a7dbba2576f08974
+Subproject commit d75a544b786710705f0db0d8d8fd66ca4a5a7239
1  vim/bundle/vim-slim.git
@@ -1 +0,0 @@
-Subproject commit 327251a954a12734b6bcd0a631e26017e9c500a1
2  vim/bundle/vim-stylus.git
@@ -1 +1 @@
-Subproject commit fcaddff743140d15371c3f25685144e9b1f78d29
+Subproject commit 9ab38f066ff2b726eb1680da489b184fd17dee50
2  vim/bundle/vim-unimpaired.git
@@ -1 +1 @@
-Subproject commit fe95324a679685054f2db2cc47fe482e9861ee8f
+Subproject commit e8013727a008a68664a789fe0d2b5c2ab2ecf657
2  vim/bundle/zencoding-vim.git
@@ -1 +1 @@
-Subproject commit a386d4138417499f63b1dba0dc6941d3911e8113
+Subproject commit b45b08f5e8f0d4aa2a9798ab0b9e7ab310d96d22
View
0  vim/bundle/nerdtree.git → vim/bundle_disabled/nerdtree.git
File renamed without changes
View
12 vimrc
@@ -189,6 +189,7 @@
" sp - previous misspelling
" ss - toggle spelling
" s? - suggestions
+ " tc - toggle cursor tracking
" tp - toggle paste mode
" y yank to system clipboard, follow with normal yank operations
" , turn off search highlighting
@@ -331,15 +332,20 @@
let g:NERDTreeMapJumpNextSibling="S-j"
let g:NERDTreeMapJumpPrevSibling="S-k"
-" Fugitive and Vim
+" Fugitive and GitV
" =============================================================================
nnoremap <Leader>gs :Gstatus<CR>
nnoremap <silent> <Leader>gd :w<CR>:Gdiff<CR><CR>
nnoremap <Leader>gb :Gblame<CR>
nnoremap <Leader>gw :Gw<CR>
+ nnoremap <Leader>gv :Gitv --all<CR>
+ nnoremap <Leader>gV :Gitv! --all<CR>
+ let g:Gitv_DoNotMapCtrlKey = 1
+
+
" Utilities
-" ==========================================================================================
+" =============================================================================
" just sudo it
cnoremap w!! %!sudo tee > /dev/null %
@@ -405,7 +411,7 @@
endif
redraw
endfunction
- nnoremap <C-Space> :call CursorTrack()<CR>
+ nnoremap <Leader>tc :call CursorTrack()<CR>
" Pasteboard
" =============================================================================

No commit comments for this range

Something went wrong with that request. Please try again.