Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:purohit/config

  • Loading branch information...
commit 6edb0300bc62509e5fd4733dfe148b00135b0b39 2 parents 69e556c + 128abb5
Ashwin Purohit authored
Showing with 7 additions and 0 deletions.
  1. +3 −0  .gitmodules
  2. +1 −0  .vim/bundle/vim-less
  3. +3 −0  .vimrc
View
3  .gitmodules
@@ -31,3 +31,6 @@
[submodule ".vim/bundle/julia"]
path = .vim/bundle/julia
url = git://github.com/JuliaLang/julia-vim.git
+[submodule ".vim/bundle/vim-less"]
+ path = .vim/bundle/vim-less
+ url = https://github.com/groenewege/vim-less.git
1  .vim/bundle/vim-less
@@ -0,0 +1 @@
+Subproject commit aaf0c284adbda66e3b3c590615a6b6bde3870e43
View
3  .vimrc
@@ -78,6 +78,7 @@ au BufRead,BufNewFile *.def set filetype=config
au BufRead,BufNewFile *.dtml set filetype=htmldjango
au BufRead,BufNewFile *.*xml set filetype=xml
au! FileType htmldjango set ft=htmldjango.html
+autocmd BufNewFile,BufRead *.json set ft=javascript
" Easier window navigation
map <C-k> <C-w><Up>
@@ -100,6 +101,8 @@ nmap <silent> <leader>e :! p4 edit %<CR><CR>
nmap <silent> <leader>d :! p4 diff %<CR><CR>
nmap <silent> <leader>nu :set number!<CR>
nmap <silent> <leader>k :set spell!<CR>
+" (Clean windows bullshit line endings)
+nmap <silent> <leader>K :%s/\r\(\n\)/\1/g<CR>
nmap <silent> <leader>V :source ~/.vimrc<CR>:filetype detect<CR>:exe ":echo '.vimrc reloaded'"<CR>
nmap <leader>ne :NERDTree<cr>
" Strip trailing whitespace
Please sign in to comment.
Something went wrong with that request. Please try again.