Update
This commit is contained in:
parent
d414c3617f
commit
49b73220c3
3 changed files with 29 additions and 17 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
{
|
{
|
||||||
|
"suggest.noselect": true,
|
||||||
"languageserver": {
|
"languageserver": {
|
||||||
"rescript": {
|
"rescript": {
|
||||||
"enable": true,
|
"enable": true,
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
|
|
||||||
|
|
||||||
call plug#begin('~/.local/share/nvim/plugged')
|
call plug#begin('~/.local/share/nvim/plugged')
|
||||||
Plug 'wjsetzer/freepascal-vim'
|
|
||||||
Plug 'rust-lang/rust.vim'
|
Plug 'rust-lang/rust.vim'
|
||||||
Plug 'jyapayne/nim.vim'
|
Plug 'jyapayne/nim.vim'
|
||||||
Plug 'tpope/vim-fugitive'
|
Plug 'tpope/vim-fugitive'
|
||||||
|
|
@ -16,7 +15,7 @@ Plug 'hdima/python-syntax'
|
||||||
Plug 'hail2u/vim-css3-syntax'
|
Plug 'hail2u/vim-css3-syntax'
|
||||||
Plug 'mxw/vim-jsx'
|
Plug 'mxw/vim-jsx'
|
||||||
Plug 'ryanoasis/vim-devicons'
|
Plug 'ryanoasis/vim-devicons'
|
||||||
Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
|
Plug 'johnstef99/vim-nerdtree-syntax-highlight'
|
||||||
Plug 'jistr/vim-nerdtree-tabs'
|
Plug 'jistr/vim-nerdtree-tabs'
|
||||||
Plug 'mustache/vim-mustache-handlebars'
|
Plug 'mustache/vim-mustache-handlebars'
|
||||||
Plug 'vim-scripts/errormarker.vim'
|
Plug 'vim-scripts/errormarker.vim'
|
||||||
|
|
@ -54,7 +53,7 @@ Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
|
||||||
Plug 'junegunn/fzf.vim'
|
Plug 'junegunn/fzf.vim'
|
||||||
Plug 'jremmen/vim-ripgrep'
|
Plug 'jremmen/vim-ripgrep'
|
||||||
Plug 'rescript-lang/vim-rescript'
|
Plug 'rescript-lang/vim-rescript'
|
||||||
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
Plug 'neoclide/coc.nvim', {'branch': 'master', 'do': 'yarn install --frozen-lockfile'}
|
||||||
Plug 'kassio/neoterm'
|
Plug 'kassio/neoterm'
|
||||||
Plug 'reasonml-editor/vim-reason-plus'
|
Plug 'reasonml-editor/vim-reason-plus'
|
||||||
Plug 'jyapayne/vim-code-dark'
|
Plug 'jyapayne/vim-code-dark'
|
||||||
|
|
@ -86,7 +85,10 @@ call plug#end()
|
||||||
" map <ESC>[1;5C <C-Right>
|
" map <ESC>[1;5C <C-Right>
|
||||||
" map <ESC>[1;5D <C-Left>
|
" map <ESC>[1;5D <C-Left>
|
||||||
nnoremap gm m
|
nnoremap gm m
|
||||||
|
nnoremap <Tab> <C-w>w
|
||||||
let g:ale_shell="/bin/bash"
|
let g:ale_shell="/bin/bash"
|
||||||
|
let g:lsp_log_verbose = 1
|
||||||
|
let g:lsp_log_file = expand('/tmp/vim-lsp.log')
|
||||||
|
|
||||||
" Live updating substitution!
|
" Live updating substitution!
|
||||||
set inccommand=nosplit
|
set inccommand=nosplit
|
||||||
|
|
@ -98,7 +100,7 @@ let maplocalleader = "\<Space>"
|
||||||
let g:syntastic_c_compiler_options = "-std=c99"
|
let g:syntastic_c_compiler_options = "-std=c99"
|
||||||
set guicursor=
|
set guicursor=
|
||||||
|
|
||||||
inoremap vmark ✓
|
" inoremap vmark ✓
|
||||||
|
|
||||||
augroup Binary
|
augroup Binary
|
||||||
au!
|
au!
|
||||||
|
|
@ -603,16 +605,18 @@ else
|
||||||
endif
|
endif
|
||||||
au FileType python let b:coc_root_patterns = ['.git', '.env', 'venv', '.venv', 'setup.cfg', 'setup.py', 'pyrightconfig.json', 'env']
|
au FileType python let b:coc_root_patterns = ['.git', '.env', 'venv', '.venv', 'setup.cfg', 'setup.py', 'pyrightconfig.json', 'env']
|
||||||
|
|
||||||
" Use tab for trigger completion with characters ahead and navigate.
|
|
||||||
" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
|
|
||||||
" other plugin before putting this into your config.
|
|
||||||
inoremap <silent><expr> <TAB>
|
inoremap <silent><expr> <TAB>
|
||||||
\ pumvisible() ? "\<C-n>" :
|
\ coc#pum#visible() ? coc#pum#next(1) :
|
||||||
\ <SID>check_back_space() ? "\<TAB>" :
|
\ CheckBackspace() ? "\<Tab>" :
|
||||||
\ coc#refresh()
|
\ coc#refresh()
|
||||||
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
|
inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
|
||||||
|
|
||||||
function! s:check_back_space() abort
|
" Make <CR> to accept selected completion item or notify coc.nvim to format
|
||||||
|
" <C-g>u breaks current undo, please make your own choice.
|
||||||
|
inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm()
|
||||||
|
\: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
|
||||||
|
|
||||||
|
function! CheckBackspace() abort
|
||||||
let col = col('.') - 1
|
let col = col('.') - 1
|
||||||
return !col || getline('.')[col - 1] =~# '\s'
|
return !col || getline('.')[col - 1] =~# '\s'
|
||||||
endfunction
|
endfunction
|
||||||
|
|
@ -624,10 +628,6 @@ else
|
||||||
inoremap <silent><expr> <c-@> coc#refresh()
|
inoremap <silent><expr> <c-@> coc#refresh()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" Make <CR> auto-select the first completion item and notify coc.nvim to
|
|
||||||
" format on enter, <cr> could be remapped by other vim plugin
|
|
||||||
inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
|
|
||||||
\: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
|
|
||||||
|
|
||||||
" Use `[g` and `]g` to navigate diagnostics
|
" Use `[g` and `]g` to navigate diagnostics
|
||||||
" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
|
" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
|
||||||
|
|
@ -765,7 +765,12 @@ highlight SignColumn ctermbg=darkgrey guibg=#212121
|
||||||
" highlight TabLineFill guibg=none guifg=none gui=none
|
" highlight TabLineFill guibg=none guifg=none gui=none
|
||||||
" highlight TabLineSel guibg=#353535 guifg=none
|
" highlight TabLineSel guibg=#353535 guifg=none
|
||||||
" highlight TabLine guibg=none guifg=none
|
" highlight TabLine guibg=none guifg=none
|
||||||
highlight CocHighlightText ctermbg=lightblue guibg=#002c4b
|
highlight CocFadeOut ctermfg=lightgrey guifg=#8B8C92
|
||||||
|
highlight CocHintVirtualText guifg=blue ctermbg=none guibg=none
|
||||||
|
highlight CocHintHighlight guifg=blue ctermbg=none guibg=none
|
||||||
|
highlight CocHintSign guifg=#647644 ctermfg=lightblue ctermbg=darkgrey guibg=#212121
|
||||||
|
highlight CocErrorSign guifg=red ctermfg=red ctermbg=darkgrey guibg=#212121
|
||||||
|
highlight CocInlayHint guifg=#3D7671 ctermfg=lightblue ctermbg=darkgrey guibg=none
|
||||||
|
|
||||||
|
|
||||||
hi Normal ctermbg=none guibg=none
|
hi Normal ctermbg=none guibg=none
|
||||||
|
|
@ -990,3 +995,7 @@ nmap <F1> :CocCommand java.debug.vimspector.start<CR>
|
||||||
" nnoremap <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
|
" nnoremap <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
|
||||||
" \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
|
" \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
|
||||||
" \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
|
" \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
|
||||||
|
|
||||||
|
|
||||||
|
" Nim: replace comment above with comment below
|
||||||
|
let @t = '/^proc
?^\_[\n]##
V/\_[€kb€kb€kb^\_[\n\€kb]prc€kboc
m/\.}
pdd'
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
[user]
|
[user]
|
||||||
# Please adapt and uncomment the following lines:
|
# Please adapt and uncomment the following lines:
|
||||||
name = Joey Yakimowich-Payne
|
name = Joey Yakimowich-Payne
|
||||||
email = jyapayne@gmail.com
|
email = jyapayne@pm.me
|
||||||
[core]
|
[core]
|
||||||
editor = nvim
|
editor = nvim
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
|
|
@ -21,3 +21,5 @@
|
||||||
# (better for interactive use)
|
# (better for interactive use)
|
||||||
stat = !bash -c 'source $HOME/.bashrc && git diff --stat $(git merge-base HEAD \"$(git basebranch)\")'
|
stat = !bash -c 'source $HOME/.bashrc && git diff --stat $(git merge-base HEAD \"$(git basebranch)\")'
|
||||||
review = !nvim -p $(git files) +\"tabdo Gdiff $(git basebranch)\" +\"let g:gitgutter_diff_base = '$(git basebranch)'\"
|
review = !nvim -p $(git files) +\"tabdo Gdiff $(git basebranch)\" +\"let g:gitgutter_diff_base = '$(git basebranch)'\"
|
||||||
|
[commit]
|
||||||
|
gpgsign = true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue