diff options
| -rw-r--r-- | ftplugin/python.vim | 5 | ||||
| -rw-r--r-- | init.vim | 8 | ||||
| -rw-r--r-- | modules/ale.vim | 2 | ||||
| -rw-r--r-- | modules/echodoc.vim | 1 | ||||
| -rw-r--r-- | modules/emmet.vim | 4 | ||||
| -rw-r--r-- | modules/general.vim | 2 | ||||
| -rw-r--r-- | modules/neosnippets.vim | 6 | ||||
| -rw-r--r-- | modules/plugins.vim | 4 | ||||
| -rw-r--r-- | modules/pydocstring.vim | 2 | ||||
| -rw-r--r-- | modules/theme.vim | 2 | ||||
| -rw-r--r-- | modules/vim-which-key.vim | 12 |
11 files changed, 35 insertions, 13 deletions
diff --git a/ftplugin/python.vim b/ftplugin/python.vim index 713a50c1..41dd3ff0 100644 --- a/ftplugin/python.vim +++ b/ftplugin/python.vim @@ -4,3 +4,8 @@ setlocal shiftwidth=4 setlocal expandtab setlocal autoindent setlocal smarttab + +nnoremap <C-h> <C-w>h +nnoremap <C-j> <C-w>j +nnoremap <C-k> <C-w>k +nnoremap <C-l> <C-w>l @@ -19,13 +19,21 @@ source $HOME/.config/nvim/modules/emmet.vim source $HOME/.config/nvim/modules/colorizer.vim source $HOME/.config/nvim/modules/rainbow.vim source $HOME/.config/nvim/modules/vim-which-key.vim +source $HOME/.config/nvim/modules/echodoc.vim " Special test file " source $HOME/.config/nvim/modules/test.vim +set conceallevel=0 "TODO" "change install script to install pyls in base and clone base instead" "npm i -g bash-language-server "npm install -g javascript-typescript-langserver +"fix ctrl+l in python +" fixed use :map to see what things are mapped to if behavior is wonky "install ripgrep" for gutentags to ignore .gitignore "install universal ctags" " TODO add this to script npm i -g bash-language-server +nnoremap <C-h> <C-w>h +nnoremap <C-j> <C-w>j +nnoremap <C-k> <C-w>k +nnoremap <C-l> <C-w>l diff --git a/modules/ale.vim b/modules/ale.vim index 0c72d685..ce2680d4 100644 --- a/modules/ale.vim +++ b/modules/ale.vim @@ -3,7 +3,7 @@ let g:ale_linters = { \ 'cpp' : ['gcc'], \ 'c' : ['gcc'], \ 'vim' : ['vint'], - \ 'python': ['pydocstyle', 'pycodestyle'], + \ 'python': ['pyls','pydocstyle', 'pycodestyle'], \ 'javascript': [] \} diff --git a/modules/echodoc.vim b/modules/echodoc.vim new file mode 100644 index 00000000..e2ba0c4b --- /dev/null +++ b/modules/echodoc.vim @@ -0,0 +1 @@ +let g:echodoc#enable_at_startup=1 diff --git a/modules/emmet.vim b/modules/emmet.vim index 6b936b6a..f12fdf95 100644 --- a/modules/emmet.vim +++ b/modules/emmet.vim @@ -1,2 +1,4 @@ " You will need to press , after this key -let g:user_emmet_leader_key='C-z' +let g:user_emmet_leader_key=',' +let g:user_emmet_mode='n' "only enable normal mode functions. + diff --git a/modules/general.vim b/modules/general.vim index 2b27b8fc..c00b2b34 100644 --- a/modules/general.vim +++ b/modules/general.vim @@ -11,11 +11,13 @@ xmap <space> \ syntax enable " Enables syntax highlighing set hidden " Required for specific actions that require multiple buffers +set conceallevel=0 set nowrap " display long lines as just one line set encoding=utf-8 " The encoding displayed set pumheight=10 " Makes popup menu smaller set fileencoding=utf-8 " The encoding written to file set ruler " show the cursor position all the time +set cmdheight=2 set iskeyword+=- " treat dash separated words as a word text object" set mouse=a " Enable your mouse set splitbelow " Horizontal splits will automatically be below diff --git a/modules/neosnippets.vim b/modules/neosnippets.vim index 8f626ab6..bbb5fc2a 100644 --- a/modules/neosnippets.vim +++ b/modules/neosnippets.vim @@ -17,6 +17,6 @@ smap <expr><TAB> neosnippet#expandable_or_jumpable() ? \ "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>" " For conceal markers. -if has('conceal') - set conceallevel=2 concealcursor=niv -endif +""if has('conceal') +"" set conceallevel=2 concealcursor=niv +""endif diff --git a/modules/plugins.vim b/modules/plugins.vim index 7882e2d0..7a7fbbc6 100644 --- a/modules/plugins.vim +++ b/modules/plugins.vim @@ -82,7 +82,9 @@ if dein#load_state('~/.config/nvim/dein') call dein#add('Shougo/neosnippet.vim') call dein#add('Shougo/neosnippet-snippets') call dein#add('mattn/emmet-vim') - " Colorizer " + "echo doc + call dein#add('Shougo/echodoc.vim') + "Colorizer " call dein#add('chrisbra/Colorizer') " Python docstring " call dein#add('heavenshell/vim-pydocstring') diff --git a/modules/pydocstring.vim b/modules/pydocstring.vim index c0200b76..34ce0e64 100644 --- a/modules/pydocstring.vim +++ b/modules/pydocstring.vim @@ -1,2 +1,2 @@ -"nmap <silent> <leader>doc <Plug>(pydocstring) +nmap <silent> <leader>doc <Plug>(pydocstring) diff --git a/modules/theme.vim b/modules/theme.vim index e302aee9..164e7356 100644 --- a/modules/theme.vim +++ b/modules/theme.vim @@ -10,7 +10,7 @@ colorscheme codedark "color space-vim-dark " gray comments -hi Comment guifg=#5C6370 ctermfg=59 +""hi Comment guifg=#5C6370 ctermfg=59 " this will show italics if your terminal supports that hi Comment cterm=italic diff --git a/modules/vim-which-key.vim b/modules/vim-which-key.vim index 0bfb55cf..7d3cb4cf 100644 --- a/modules/vim-which-key.vim +++ b/modules/vim-which-key.vim @@ -33,13 +33,14 @@ let g:which_key_map['/'] = [ '<Plug>NERDCommenterToggle','commenter' ] let g:which_key_map['p'] = [ 'pclose','close-preview' ] let g:which_key_map['q'] = [ 'q','quit' ] let g:which_key_map['s'] = [ 'w','save' ] +let g:which_key_map['f'] = [ 'Denite file','files' ] let g:which_key_map.t = { \ 'name' : '+toggle' , - \ 'f' : ['NERDTreeToggle' , 'file-explorer'] , + \ 'e' : ['NERDTreeToggle' , 'file-explorer'] , \ 'b' : ['TagbarToggle' , 'tagbar'] , - \ 'l' : ['set nonumber!' , 'line-numbers'] , - \ 's' : ['nohlsearch' , 'remove-search-highlight'] , + \ 'n' : ['set nonumber!' , 'line-numbers'] , + \ 's' : [':nohlsearch' , 'remove-search-highlight'] , \ 'c' : ['ColorToggle' , 'remove-color'] , \ } @@ -48,14 +49,15 @@ let g:which_key_map.h = { \ 's' : ['nohlsearch' , 'remove-search-highlight'] , \ 'c' : ['ColorToggle' , 'remove-color'] , \ } - + "<Plug>(ale_hover)` "\ 'f' : ['LanguageClient#textDocument_formatting()' , 'formatting'] , + "\ 'h' : ['LanguageClient#textDocument_hover()' , 'hover'] , let g:which_key_map.l = { \ 'name' : '+lsp' , \ 'c' : ['LanguageClient_contextMenu()' , 'context_menu'] , \ 'f' : ['ALEFix' , 'formatting'] , \ 'i' : ['ALEInfo' , 'info'] , - \ 'h' : ['LanguageClient#textDocument_hover()' , 'hover'] , + \ 'h' : ['<Plug>(ale_hover)' , 'hover'] , \ 'r' : ['LanguageClient#textDocument_references()' , 'references'] , \ 'R' : ['LanguageClient#textDocument_rename()' , 'rename'] , \ 's' : ['LanguageClient#textDocument_documentSymbol()' , 'document-symbol'] , |