Added Packages and removed stuff I did not use.
This commit is contained in:
parent
c67580c1c7
commit
0be1cd8680
2 changed files with 37 additions and 45 deletions
|
|
@ -11,7 +11,8 @@
|
||||||
"basepath": "",
|
"basepath": "",
|
||||||
"parameter": "",
|
"parameter": "",
|
||||||
"class": "",
|
"class": "",
|
||||||
"config": "def openconfig(configfile):\n\twith open(configfile, \"r\", encoding=\"utf-8\") as currentconfigfile:\n\t\treturn json.load(currentconfigfile)\n\n\ndef saveconfig(configfile, newcontent):\n\twith open(configfile, \"w\", encoding=\"utf-8\") as currentconfigfile:\n\t\tjson.dump(newcontent, currentconfigfile, indent=4, sort_keys=True)"
|
"config": "def openconfig(configfile):\n\twith open(configfile, \"r\", encoding=\"utf-8\") as currentconfigfile:\n\t\treturn json.load(currentconfigfile)\n\n\ndef saveconfig(configfile, newcontent):\n\twith open(configfile, \"w\", encoding=\"utf-8\") as currentconfigfile:\n\t\tjson.dump(newcontent, currentconfigfile, indent=4, sort_keys=True)",
|
||||||
|
"pdb": "import ipdb as pdb; pdb.set_trace()"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"java": {
|
"java": {
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,6 @@ call vundle#begin()
|
||||||
|
|
||||||
" let Vundle manage Vundle, required
|
" let Vundle manage Vundle, required
|
||||||
|
|
||||||
"Plugin 'lervag/vimtex'
|
|
||||||
"Plugin 'vim-syntastic/syntastic'
|
|
||||||
Plugin 'airblade/vim-gitgutter'
|
Plugin 'airblade/vim-gitgutter'
|
||||||
Plugin 'artur-shaik/vim-javacomplete2'
|
Plugin 'artur-shaik/vim-javacomplete2'
|
||||||
Plugin 'ctrlpvim/ctrlp.vim'
|
Plugin 'ctrlpvim/ctrlp.vim'
|
||||||
|
|
@ -55,28 +53,10 @@ Plugin 'Townk/vim-autoclose'
|
||||||
Plugin 'tpope/vim-fugitive'
|
Plugin 'tpope/vim-fugitive'
|
||||||
Plugin 'tpope/vim-surround'
|
Plugin 'tpope/vim-surround'
|
||||||
Plugin 'vim-airline/vim-airline'
|
Plugin 'vim-airline/vim-airline'
|
||||||
Plugin 'vim-scripts/TaskList.vim'
|
Plugin 'chauncey-garrett/vim-tasklist'
|
||||||
Plugin 'Vimjas/vim-python-pep8-indent'
|
Plugin 'Vimjas/vim-python-pep8-indent'
|
||||||
Plugin 'VundleVim/Vundle.vim'
|
Plugin 'VundleVim/Vundle.vim'
|
||||||
|
|
||||||
|
|
||||||
" The following are examples of different formats supported.
|
|
||||||
" Keep Plugin commands between vundle#begin/end.
|
|
||||||
" plugin on GitHub repo
|
|
||||||
"Plugin 'tpope/vim-fugitive'
|
|
||||||
" plugin from http://vim-scripts.org/vim/scripts.html
|
|
||||||
" Plugin 'L9'
|
|
||||||
" Git plugin not hosted on GitHub
|
|
||||||
"Plugin 'git://git.wincent.com/command-t.git'
|
|
||||||
" git repos on your local machine (i.e. when working on your own plugin)
|
|
||||||
"Plugin 'file:///home/gmarik/path/to/plugin'
|
|
||||||
" The sparkup vim script is in a subdirectory of this repo called vim.
|
|
||||||
" Pass the path to set the runtimepath properly.
|
|
||||||
"Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
|
|
||||||
" Install L9 and avoid a Naming conflict if you've already installed a
|
|
||||||
" different version somewhere else.
|
|
||||||
" Plugin 'ascenator/L9', {'name': 'newL9'}
|
|
||||||
|
|
||||||
" All of your Plugins must be added before the following line
|
" All of your Plugins must be added before the following line
|
||||||
call vundle#end() " required
|
call vundle#end() " required
|
||||||
filetype plugin indent on " required
|
filetype plugin indent on " required
|
||||||
|
|
@ -186,31 +166,19 @@ autocmd FileType python setlocal textwidth=80 colorcolumn=+1
|
||||||
set number
|
set number
|
||||||
set numberwidth=5
|
set numberwidth=5
|
||||||
|
|
||||||
" Tab completion
|
" Autocomplete menu for command mode
|
||||||
" will insert tab at beginning of line,
|
set wildmenu
|
||||||
" will use completion if not at beginning
|
set wildmode=longest:full,full
|
||||||
|
|
||||||
"set wildmode=list:longest,list:full
|
|
||||||
function! InsertTabWrapper()
|
|
||||||
let col = col('.') - 1
|
|
||||||
if !col || getline('.')[col - 1] !~ '\k'
|
|
||||||
return "\<Tab>"
|
|
||||||
else
|
|
||||||
return "\<C-p>"
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
inoremap <Tab> <C-r>=InsertTabWrapper()<CR>
|
|
||||||
inoremap <S-Tab> <C-n>
|
|
||||||
|
|
||||||
" Open new split panes to right and bottom, which feels more natural
|
" Open new split panes to right and bottom, which feels more natural
|
||||||
set splitbelow
|
set splitbelow
|
||||||
set splitright
|
set splitright
|
||||||
|
|
||||||
" Quicker window movement
|
" Quicker window movement
|
||||||
"nnoremap <C-j> <C-w>j
|
nnoremap <C-j> <C-w>j
|
||||||
"nnoremap <C-k> <C-w>k
|
nnoremap <C-k> <C-w>k
|
||||||
"nnoremap <C-h> <C-w>h
|
nnoremap <C-h> <C-w>h
|
||||||
"nnoremap <C-l> <C-w>l
|
nnoremap <C-l> <C-w>l
|
||||||
|
|
||||||
" Autocomplete with dictionary words when spell check is on
|
" Autocomplete with dictionary words when spell check is on
|
||||||
set complete+=kspell
|
set complete+=kspell
|
||||||
|
|
@ -294,8 +262,11 @@ let g:peekaboo_window = 'vert bo 65new'
|
||||||
autocmd FileType java setlocal omnifunc=javacomplete#Complete
|
autocmd FileType java setlocal omnifunc=javacomplete#Complete
|
||||||
|
|
||||||
|
|
||||||
" tasklist Keywords
|
" tasklist settings
|
||||||
let g:tlTokenList = ["FIXME", "TODO", "todo"]
|
let g:tlTokenList = ["FIXME", "TODO", "todo"]
|
||||||
|
let g:tlWindowPosition = 1 "Open window on bottom, 0 would be top
|
||||||
|
let g:tlRememberPosition = 0
|
||||||
|
map <leader>t <Plug>TaskList
|
||||||
|
|
||||||
" nerdtree settings
|
" nerdtree settings
|
||||||
map <C-n> :NERDTreeToggle<CR>
|
map <C-n> :NERDTreeToggle<CR>
|
||||||
|
|
@ -329,7 +300,27 @@ function! s:SwitchColorscheme()
|
||||||
endfunction
|
endfunction
|
||||||
map <silent> <F4> :call <SID>SwitchColorscheme()<CR>
|
map <silent> <F4> :call <SID>SwitchColorscheme()<CR>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
colorscheme darcula
|
colorscheme darcula
|
||||||
|
|
||||||
|
" Highlight whole todo comment, not just the keyword itself:
|
||||||
|
|
||||||
|
augroup myTodo
|
||||||
|
autocmd!
|
||||||
|
autocmd Syntax * syntax match myTodo /\v\_.<(TODO|FIXME|todo|fixme).*/hs=s+1 containedin=.*Comment
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
highlight link myTodo Todo
|
||||||
|
|
||||||
|
|
||||||
|
" Highlight "self." in different color in python files:
|
||||||
|
|
||||||
|
augroup python_syntax_extra
|
||||||
|
autocmd!
|
||||||
|
autocmd! Syntax python :syn keyword Keyword self
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
" Bind ctrl+u to jump list jump (opposite of ctrl+o)
|
||||||
|
nnoremap <C-u> <C-i>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue