Commit 606b95a3 authored by Murukesh Mohanan's avatar Murukesh Mohanan

merge lab

parents f2754eb7 b72ae7b3
...@@ -45,3 +45,6 @@ ...@@ -45,3 +45,6 @@
[submodule "bundle/vim-fugitive"] [submodule "bundle/vim-fugitive"]
path = bundle/vim-fugitive path = bundle/vim-fugitive
url = https://github.com/tpope/vim-fugitive.git url = https://github.com/tpope/vim-fugitive.git
[submodule "bundle/AnsiEsc.vim"]
path = bundle/AnsiEsc.vim
url = https://github.com/vim-scripts/AnsiEsc.vim
setlocal nolist
setlocal readonly
setlocal buftype=nofile
setlocal bufhidden=hide
setlocal noswapfile
setlocal nomodifiable
function! PrepManPager()
setlocal modifiable
if !empty ($MAN_PN)
silent %! col -b
file $MAN_PN
endif
setlocal nomodified
setlocal nomodifiable
endfunction
autocmd BufEnter $MAN_PN call PrepManPager()
nnoremap q :q!<CR>
AnsiEsc.vim @ d2bb7878
Subproject commit d2bb7878622e4c16203acf1c92a0f4bc7ac58003
colorschemes @ 28a989b2
Subproject commit 81c6dd7ce3169e5ad9ba92422ba6e1ce5b074e36 Subproject commit 28a989b28457e38df620e4c7ab23e224aff70efe
diffchar.vim @ 890b3fd9
Subproject commit 5a124d56a2684dea1d37d26dd4a2d90d56399a88 Subproject commit 890b3fd9918ee6ce9a8cf930a8eaa9c3b29b7d2e
nerdtree @ bcf3de4f
Subproject commit 86e2e40af161e65a3ad671214f16f23af360a5a7 Subproject commit bcf3de4fdffae45fc7c85b6b84a01b37177924aa
supertab @ 43b98dd2
Subproject commit c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7 Subproject commit 43b98dd2c74977a02473d923c159d4110c94273e
syntastic @ 47c70b3e
Subproject commit 76ec53f186d1e68a01c1470eec6ae50bfcedd64f Subproject commit 47c70b3e1e388d8f9cc7c6d9687efc047df843ac
vim-fugitive @ b319b694
Subproject commit 7c4a90614792cf4b74e0f3386cc6b14046419312 Subproject commit b319b694539017dcd789dc2c42f784a30d7b28b8
vim-surround @ 2d05440a
Subproject commit 772ab9587b7d1e2c3bae75395c9123803059ba8a Subproject commit 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c
autocmd BufNewFile,BufRead *.pro set filetype=prolog
autocmd BufNewFile,BufRead *.md set filetype=markdown
autocmd BufNewFile,BufRead */debian/rules.d/* set filetype=make
setlocal spell textwidth=72
let g:airline#extensions#tabline#enabled = 1
...@@ -13,7 +13,6 @@ arity ...@@ -13,7 +13,6 @@ arity
NTRU NTRU
cyrptosystems cyrptosystems
teleportation teleportation
Ubuntu
Guwahati Guwahati
Karuna Karuna
Kalita Kalita
...@@ -29,3 +28,28 @@ Gitlab ...@@ -29,3 +28,28 @@ Gitlab
LDAP LDAP
Debian Debian
plugin plugin
Django
playlist
Bodhitree
CSS
API
foo
Debian
LDAP
Ubuntu
Roshan
plugin
plugins
PPA
PPAs
CLI
hostgroup
hostgroups
Gooner
Facebook
murukesh
mohanan
IIT
Firefox
Github
URLs
...@@ -62,10 +62,10 @@ noremap > :tabn<CR> ...@@ -62,10 +62,10 @@ noremap > :tabn<CR>
noremap <leader>, :bp<CR> noremap <leader>, :bp<CR>
noremap <leader>. :bn<CR> noremap <leader>. :bn<CR>
command! C let @/="" command! C let @/=""
cmap w!! w !sudo tee >/dev/null % cnoremap w!! w !sudo tee >/dev/null %
noremap cy "*y noremap <leader>P "*p
noremap cp "*p
noremap <leader>p "+p noremap <leader>p "+p
noremap <leader>Y "*y
noremap <leader>y "+y noremap <leader>y "+y
inoremap <Down> <C-o>gj inoremap <Down> <C-o>gj
inoremap <Up> <C-o>gk inoremap <Up> <C-o>gk
...@@ -73,17 +73,20 @@ nnoremap <Down> gj ...@@ -73,17 +73,20 @@ nnoremap <Down> gj
nnoremap <Up> gk nnoremap <Up> gk
execute pathogen#infect() execute pathogen#infect()
autocmd Bufenter,BufNew *.pro set syntax=prolog
autocmd Filetype gitcommit setlocal spell textwidth=72
autocmd Bufenter *.hs compiler ghc
colorscheme molokai colorscheme molokai
if !empty($MAN_PN)
autocmd StdinReadPost * set ft=man | file $MAN_PN
endif
" From http://vi.stackexchange.com/questions/258/ " From http://vi.stackexchange.com/questions/258/
autocmd BufWritePre *.sh if !filereadable(expand('%')) | let b:is_new = 1 | endif autocmd BufWritePre *.sh if !filereadable(expand('%')) | let b:is_new = 1 | endif
autocmd BufWritePost *.sh if get(b:, 'is_new', 0) | silent execute '!chmod +x %' | endif autocmd BufWritePost *.sh if get(b:, 'is_new', 0) | silent execute '!chmod +x %' | endif
autocmd FileType help wincmd L
let g:SuperTabDefaultCompletionType = "context" let g:SuperTabDefaultCompletionType = "context"
let g:SuperTabClosePreviewOnPopupClose = 1
set omnifunc=syntaxcomplete#Complete set omnifunc=syntaxcomplete#Complete
set foldmethod=syntax set foldmethod=syntax
let g:syntastic_cpp_compiler_options = ' -std=c++11' let g:syntastic_cpp_compiler_options = ' -std=c++11'
...@@ -98,31 +101,33 @@ let g:ctrlp_prompt_mappings = { ...@@ -98,31 +101,33 @@ let g:ctrlp_prompt_mappings = {
\ 'AcceptSelection("e")': ['<c-t>'], \ 'AcceptSelection("e")': ['<c-t>'],
\ 'AcceptSelection("t")': ['<cr>', '<2-LeftMouse>'], \ 'AcceptSelection("t")': ['<cr>', '<2-LeftMouse>'],
\ } \ }
let g:DiffColors = 100
let g:DiffUnit="Word3"
let g:DiffUpdate=1
if has('cscope') " if has('cscope')
set cscopetag cscopeverbose " set cscopetag cscopeverbose
"
if has('quickfix') " if has('quickfix')
set cscopequickfix=s-,c-,d-,i-,t-,e- " set cscopequickfix=s-,c-,d-,i-,t-,e-
endif " endif
"
cnoreabbrev csa cs add " cnoreabbrev csa cs add
cnoreabbrev csf cs find " cnoreabbrev csf cs find
cnoreabbrev csk cs kill " cnoreabbrev csk cs kill
cnoreabbrev csr cs reset " cnoreabbrev csr cs reset
" cnoreabbrev css cs show " " cnoreabbrev css cs show
cnoreabbrev csh cs help " cnoreabbrev csh cs help
"
command -nargs=0 Cscope cs add $VIMSRC/src/cscope.out $VIMSRC/src " command -nargs=0 Cscope cs add $VIMSRC/src/cscope.out $VIMSRC/src
endif " endif
" From http://vi.stackexchange.com/questions/239/ " From http://vi.stackexchange.com/questions/239/
if @% == "" && getcwd() == "/tmp" " with exception for reading manpages
:silent edit test.sh if empty($MAN_PN) && @% == "" && getcwd() == "/tmp"
silent find test.*
endif endif
let g:DiffColors = 100
" function LookupFiles () " function LookupFiles ()
" python <<EOF " python <<EOF
" from os.path import * " from os.path import *
...@@ -147,6 +152,10 @@ let g:DiffColors = 100 ...@@ -147,6 +152,10 @@ let g:DiffColors = 100
" From http://vi.stackexchange.com/questions/2009/ " From http://vi.stackexchange.com/questions/2009/
function! FindInPath(name) function! FindInPath(name)
" Force creation of new file for paths beginning with ./
"if expand('%') =~ '^\./'
" return 0
"endif
let path=&path let path=&path
" Add any extra directories to the normal search path " Add any extra directories to the normal search path
set path+=~,~/.vim,/etc set path+=~,~/.vim,/etc
...@@ -166,6 +175,4 @@ autocmd FileType * exec("setlocal dictionary+=".$HOME."/.vim/dictionary/".expand ...@@ -166,6 +175,4 @@ autocmd FileType * exec("setlocal dictionary+=".$HOME."/.vim/dictionary/".expand
set completeopt+=menuone,longest,preview set completeopt+=menuone,longest,preview
set complete+=k set complete+=k
if !empty($CONFLOCAL) runtime local/$CONFLOCAL.vim
source $HOME/.vim/local/$CONFLOCAL.vim
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment