mirror of
https://github.com/LunarVim/LunarVim.git
synced 2025-08-31 23:20:08 +02:00
fixed C-l in pydoc overriding my window move mapping, some toggle cammands still don't work, also fixed backticks not appearing
This commit is contained in:
parent
718b37578c
commit
1b5b78fdac
11 changed files with 35 additions and 13 deletions
|
@ -4,3 +4,8 @@ setlocal shiftwidth=4
|
||||||
setlocal expandtab
|
setlocal expandtab
|
||||||
setlocal autoindent
|
setlocal autoindent
|
||||||
setlocal smarttab
|
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
|
||||||
|
|
8
init.vim
8
init.vim
|
@ -19,13 +19,21 @@ source $HOME/.config/nvim/modules/emmet.vim
|
||||||
source $HOME/.config/nvim/modules/colorizer.vim
|
source $HOME/.config/nvim/modules/colorizer.vim
|
||||||
source $HOME/.config/nvim/modules/rainbow.vim
|
source $HOME/.config/nvim/modules/rainbow.vim
|
||||||
source $HOME/.config/nvim/modules/vim-which-key.vim
|
source $HOME/.config/nvim/modules/vim-which-key.vim
|
||||||
|
source $HOME/.config/nvim/modules/echodoc.vim
|
||||||
" Special test file "
|
" Special test file "
|
||||||
source $HOME/.config/nvim/modules/test.vim
|
source $HOME/.config/nvim/modules/test.vim
|
||||||
|
|
||||||
|
set conceallevel=0
|
||||||
"TODO"
|
"TODO"
|
||||||
"change install script to install pyls in base and clone base instead"
|
"change install script to install pyls in base and clone base instead"
|
||||||
"npm i -g bash-language-server
|
"npm i -g bash-language-server
|
||||||
"npm install -g javascript-typescript-langserver
|
"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 ripgrep" for gutentags to ignore .gitignore
|
||||||
"install universal ctags"
|
"install universal ctags"
|
||||||
" TODO add this to script npm i -g bash-language-server
|
" 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
|
||||||
|
|
|
@ -3,7 +3,7 @@ let g:ale_linters = {
|
||||||
\ 'cpp' : ['gcc'],
|
\ 'cpp' : ['gcc'],
|
||||||
\ 'c' : ['gcc'],
|
\ 'c' : ['gcc'],
|
||||||
\ 'vim' : ['vint'],
|
\ 'vim' : ['vint'],
|
||||||
\ 'python': ['pydocstyle', 'pycodestyle'],
|
\ 'python': ['pyls','pydocstyle', 'pycodestyle'],
|
||||||
\ 'javascript': []
|
\ 'javascript': []
|
||||||
\}
|
\}
|
||||||
|
|
||||||
|
|
1
modules/echodoc.vim
Normal file
1
modules/echodoc.vim
Normal file
|
@ -0,0 +1 @@
|
||||||
|
let g:echodoc#enable_at_startup=1
|
|
@ -1,2 +1,4 @@
|
||||||
" You will need to press , after this key
|
" 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.
|
||||||
|
|
||||||
|
|
|
@ -11,11 +11,13 @@ xmap <space> \
|
||||||
|
|
||||||
syntax enable " Enables syntax highlighing
|
syntax enable " Enables syntax highlighing
|
||||||
set hidden " Required for specific actions that require multiple buffers
|
set hidden " Required for specific actions that require multiple buffers
|
||||||
|
set conceallevel=0
|
||||||
set nowrap " display long lines as just one line
|
set nowrap " display long lines as just one line
|
||||||
set encoding=utf-8 " The encoding displayed
|
set encoding=utf-8 " The encoding displayed
|
||||||
set pumheight=10 " Makes popup menu smaller
|
set pumheight=10 " Makes popup menu smaller
|
||||||
set fileencoding=utf-8 " The encoding written to file
|
set fileencoding=utf-8 " The encoding written to file
|
||||||
set ruler " show the cursor position all the time
|
set ruler " show the cursor position all the time
|
||||||
|
set cmdheight=2
|
||||||
set iskeyword+=- " treat dash separated words as a word text object"
|
set iskeyword+=- " treat dash separated words as a word text object"
|
||||||
set mouse=a " Enable your mouse
|
set mouse=a " Enable your mouse
|
||||||
set splitbelow " Horizontal splits will automatically be below
|
set splitbelow " Horizontal splits will automatically be below
|
||||||
|
|
|
@ -17,6 +17,6 @@ smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
|
||||||
\ "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
|
\ "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
|
||||||
|
|
||||||
" For conceal markers.
|
" For conceal markers.
|
||||||
if has('conceal')
|
""if has('conceal')
|
||||||
set conceallevel=2 concealcursor=niv
|
"" set conceallevel=2 concealcursor=niv
|
||||||
endif
|
""endif
|
||||||
|
|
|
@ -82,7 +82,9 @@ if dein#load_state('~/.config/nvim/dein')
|
||||||
call dein#add('Shougo/neosnippet.vim')
|
call dein#add('Shougo/neosnippet.vim')
|
||||||
call dein#add('Shougo/neosnippet-snippets')
|
call dein#add('Shougo/neosnippet-snippets')
|
||||||
call dein#add('mattn/emmet-vim')
|
call dein#add('mattn/emmet-vim')
|
||||||
" Colorizer "
|
"echo doc
|
||||||
|
call dein#add('Shougo/echodoc.vim')
|
||||||
|
"Colorizer "
|
||||||
call dein#add('chrisbra/Colorizer')
|
call dein#add('chrisbra/Colorizer')
|
||||||
" Python docstring "
|
" Python docstring "
|
||||||
call dein#add('heavenshell/vim-pydocstring')
|
call dein#add('heavenshell/vim-pydocstring')
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
"nmap <silent> <leader>doc <Plug>(pydocstring)
|
nmap <silent> <leader>doc <Plug>(pydocstring)
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ colorscheme codedark
|
||||||
"color space-vim-dark
|
"color space-vim-dark
|
||||||
|
|
||||||
" gray comments
|
" gray comments
|
||||||
hi Comment guifg=#5C6370 ctermfg=59
|
""hi Comment guifg=#5C6370 ctermfg=59
|
||||||
" this will show italics if your terminal supports that
|
" this will show italics if your terminal supports that
|
||||||
hi Comment cterm=italic
|
hi Comment cterm=italic
|
||||||
|
|
||||||
|
|
|
@ -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['p'] = [ 'pclose','close-preview' ]
|
||||||
let g:which_key_map['q'] = [ 'q','quit' ]
|
let g:which_key_map['q'] = [ 'q','quit' ]
|
||||||
let g:which_key_map['s'] = [ 'w','save' ]
|
let g:which_key_map['s'] = [ 'w','save' ]
|
||||||
|
let g:which_key_map['f'] = [ 'Denite file','files' ]
|
||||||
|
|
||||||
let g:which_key_map.t = {
|
let g:which_key_map.t = {
|
||||||
\ 'name' : '+toggle' ,
|
\ 'name' : '+toggle' ,
|
||||||
\ 'f' : ['NERDTreeToggle' , 'file-explorer'] ,
|
\ 'e' : ['NERDTreeToggle' , 'file-explorer'] ,
|
||||||
\ 'b' : ['TagbarToggle' , 'tagbar'] ,
|
\ 'b' : ['TagbarToggle' , 'tagbar'] ,
|
||||||
\ 'l' : ['set nonumber!' , 'line-numbers'] ,
|
\ 'n' : ['set nonumber!' , 'line-numbers'] ,
|
||||||
\ 's' : ['nohlsearch' , 'remove-search-highlight'] ,
|
\ 's' : [':nohlsearch' , 'remove-search-highlight'] ,
|
||||||
\ 'c' : ['ColorToggle' , 'remove-color'] ,
|
\ 'c' : ['ColorToggle' , 'remove-color'] ,
|
||||||
\ }
|
\ }
|
||||||
|
|
||||||
|
@ -48,14 +49,15 @@ let g:which_key_map.h = {
|
||||||
\ 's' : ['nohlsearch' , 'remove-search-highlight'] ,
|
\ 's' : ['nohlsearch' , 'remove-search-highlight'] ,
|
||||||
\ 'c' : ['ColorToggle' , 'remove-color'] ,
|
\ 'c' : ['ColorToggle' , 'remove-color'] ,
|
||||||
\ }
|
\ }
|
||||||
|
"<Plug>(ale_hover)`
|
||||||
"\ 'f' : ['LanguageClient#textDocument_formatting()' , 'formatting'] ,
|
"\ 'f' : ['LanguageClient#textDocument_formatting()' , 'formatting'] ,
|
||||||
|
"\ 'h' : ['LanguageClient#textDocument_hover()' , 'hover'] ,
|
||||||
let g:which_key_map.l = {
|
let g:which_key_map.l = {
|
||||||
\ 'name' : '+lsp' ,
|
\ 'name' : '+lsp' ,
|
||||||
\ 'c' : ['LanguageClient_contextMenu()' , 'context_menu'] ,
|
\ 'c' : ['LanguageClient_contextMenu()' , 'context_menu'] ,
|
||||||
\ 'f' : ['ALEFix' , 'formatting'] ,
|
\ 'f' : ['ALEFix' , 'formatting'] ,
|
||||||
\ 'i' : ['ALEInfo' , 'info'] ,
|
\ 'i' : ['ALEInfo' , 'info'] ,
|
||||||
\ 'h' : ['LanguageClient#textDocument_hover()' , 'hover'] ,
|
\ 'h' : ['<Plug>(ale_hover)' , 'hover'] ,
|
||||||
\ 'r' : ['LanguageClient#textDocument_references()' , 'references'] ,
|
\ 'r' : ['LanguageClient#textDocument_references()' , 'references'] ,
|
||||||
\ 'R' : ['LanguageClient#textDocument_rename()' , 'rename'] ,
|
\ 'R' : ['LanguageClient#textDocument_rename()' , 'rename'] ,
|
||||||
\ 's' : ['LanguageClient#textDocument_documentSymbol()' , 'document-symbol'] ,
|
\ 's' : ['LanguageClient#textDocument_documentSymbol()' , 'document-symbol'] ,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue