update conf

This commit is contained in:
Jeff Lance 2023-01-02 14:00:47 +01:00
parent 5410f7ecfe
commit d43151c86a
7 changed files with 170 additions and 105 deletions

View File

@ -13,86 +13,96 @@
"
"""""""""""""""""""""
" Use tab for trigger completion with characters ahead and navigate.
" Use tab for trigger completion with characters ahead and navigate
" NOTE: There's always complete item selected by default, you may want to enable
" no select by `"suggest.noselect": true` in your configuration file
" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
" other plugin before putting this into your config.
" other plugin before putting this into your config
inoremap <silent><expr> <TAB>
\ pumvisible() ? "\<C-n>" :
\ <SID>check_back_space() ? "\<TAB>" :
\ coc#pum#visible() ? coc#pum#next(1) :
\ CheckBackspace() ? "\<Tab>" :
\ 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
return !col || getline('.')[col - 1] =~# '\s'
endfunction
" Use <c-space> to trigger completion.
" Use <c-space> to trigger completion
if has('nvim')
inoremap <silent><expr> <c-space> coc#refresh()
else
inoremap <silent><expr> <c-@> coc#refresh()
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 `:CocDiagnostics` to get all diagnostics of current buffer in location list.
" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list
nmap <silent> [g <Plug>(coc-diagnostic-prev)
nmap <silent> ]g <Plug>(coc-diagnostic-next)
" GoTo code navigation.
" GoTo code navigation
nmap <silent> gd <Plug>(coc-definition)
nmap <silent> gy <Plug>(coc-type-definition)
nmap <silent> gi <Plug>(coc-implementation)
nmap <silent> gr <Plug>(coc-references)
" Use K to show documentation in preview window.
nnoremap <silent> K :call <SID>show_documentation()<CR>
" Use K to show documentation in preview window
nnoremap <silent> K :call ShowDocumentation()<CR>
function! s:show_documentation()
if (index(['vim','help'], &filetype) >= 0)
execute 'h '.expand('<cword>')
elseif (coc#rpc#ready())
function! ShowDocumentation()
if CocAction('hasProvider', 'hover')
call CocActionAsync('doHover')
else
execute '!' . &keywordprg . " " . expand('<cword>')
call feedkeys('K', 'in')
endif
endfunction
" Highlight the symbol and its references when holding the cursor.
" Highlight the symbol and its references when holding the cursor
autocmd CursorHold * silent call CocActionAsync('highlight')
" Symbol renaming.
" Symbol renaming
nmap <leader>rn <Plug>(coc-rename)
" Formatting selected code.
" Formatting selected code
xmap <leader>f <Plug>(coc-format-selected)
nmap <leader>f <Plug>(coc-format-selected)
augroup mygroup
autocmd!
" Setup formatexpr specified filetype(s).
" Setup formatexpr specified filetype(s)
autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
" Update signature help on jump placeholder.
" Update signature help on jump placeholder
autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
augroup end
" Applying codeAction to the selected region.
" Applying code actions to the selected code block
" Example: `<leader>aap` for current paragraph
xmap <leader>a <Plug>(coc-codeaction-selected)
nmap <leader>a <Plug>(coc-codeaction-selected)
" Remap keys for applying codeAction to the current buffer.
nmap <leader>ac <Plug>(coc-codeaction)
" Apply AutoFix to problem on the current line.
" Remap keys for applying code actions at the cursor position
nmap <leader>ac <Plug>(coc-codeaction-cursor)
" Remap keys for apply code actions affect whole buffer
nmap <leader>as <Plug>(coc-codeaction-source)
" Apply the most preferred quickfix action to fix diagnostic on the current line
nmap <leader>qf <Plug>(coc-fix-current)
" Remap keys for applying refactor code actions
nmap <silent> <leader>re <Plug>(coc-codeaction-refactor)
xmap <silent> <leader>r <Plug>(coc-codeaction-refactor-selected)
nmap <silent> <leader>r <Plug>(coc-codeaction-refactor-selected)
" Run the Code Lens action on the current line
nmap <leader>cl <Plug>(coc-codelens-action)
" Map function and class text objects
" NOTE: Requires 'textDocument.documentSymbol' support from the language server.
" NOTE: Requires 'textDocument.documentSymbol' support from the language server
xmap if <Plug>(coc-funcobj-i)
omap if <Plug>(coc-funcobj-i)
xmap af <Plug>(coc-funcobj-a)
@ -102,7 +112,7 @@ omap ic <Plug>(coc-classobj-i)
xmap ac <Plug>(coc-classobj-a)
omap ac <Plug>(coc-classobj-a)
" Remap <C-f> and <C-b> for scroll float windows/popups.
" Remap <C-f> and <C-b> to scroll float windows/popups
if has('nvim-0.4.0') || has('patch-8.2.0750')
nnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
@ -112,41 +122,41 @@ if has('nvim-0.4.0') || has('patch-8.2.0750')
vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
endif
" Use CTRL-S for selections ranges.
" Requires 'textDocument/selectionRange' support of language server.
" Use CTRL-S for selections ranges
" Requires 'textDocument/selectionRange' support of language server
nmap <silent> <C-s> <Plug>(coc-range-select)
xmap <silent> <C-s> <Plug>(coc-range-select)
" Add `:Format` command to format current buffer.
command! -nargs=0 Format :call CocAction('format')
" Add `:Format` command to format current buffer
command! -nargs=0 Format :call CocActionAsync('format')
" Add `:Fold` command to fold current buffer.
" Add `:Fold` command to fold current buffer
command! -nargs=? Fold :call CocAction('fold', <f-args>)
" Add `:OR` command for organize imports of the current buffer.
command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport')
" Add `:OR` command for organize imports of the current buffer
command! -nargs=0 OR :call CocActionAsync('runCommand', 'editor.action.organizeImport')
" Add (Neo)Vim's native statusline support.
" Add (Neo)Vim's native statusline support
" NOTE: Please see `:h coc-status` for integrations with external plugins that
" provide custom statusline: lightline.vim, vim-airline.
" provide custom statusline: lightline.vim, vim-airline
set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
" Mappings for CoCList
" Show all diagnostics.
" Show all diagnostics
nnoremap <silent><nowait> <space>a :<C-u>CocList diagnostics<cr>
" Manage extensions.
" Manage extensions
nnoremap <silent><nowait> <space>e :<C-u>CocList extensions<cr>
" Show commands.
" Show commands
nnoremap <silent><nowait> <space>c :<C-u>CocList commands<cr>
" Find symbol of current document.
" Find symbol of current document
nnoremap <silent><nowait> <space>o :<C-u>CocList outline<cr>
" Search workspace symbols.
" Search workspace symbols
nnoremap <silent><nowait> <space>s :<C-u>CocList -I symbols<cr>
" Do default action for next item.
" Do default action for next item
nnoremap <silent><nowait> <space>j :<C-u>CocNext<CR>
" Do default action for previous item.
" Do default action for previous item
nnoremap <silent><nowait> <space>k :<C-u>CocPrev<CR>
" Resume latest coc list.
" Resume latest coc list
nnoremap <silent><nowait> <space>p :<C-u>CocListResume<CR>

View File

@ -30,29 +30,29 @@ local home = os.getenv('HOME')
local db = require('dashboard')
local dotfiles = '\'' .. home .. '/dotfiles\''
db.preview_command = 'cat | lolcat -a'
db.preview_file_path = home .. '/.config/nvim/header1.cat'
db.preview_file_height = 20
db.preview_file_width = 32
-- db.preview_command = 'cat '
-- db.preview_file_path = home .. '/.config/nvim/header1.cat'
-- db.preview_file_height = 20
-- db.preview_file_width = 32
-- db.custom_header = {
-- '',
-- ' ⣿⣿⣷⡁⢆⠈⠕⢕⢂⢕⢂⢕⢂⢔⢂⢕⢄⠂⣂⠂⠆⢂⢕⢂⢕⢂⢕⢂⢕⢂ ',
-- ' ⣿⣿⣿⡷⠊⡢⡹⣦⡑⢂⢕⢂⢕⢂⢕⢂⠕⠔⠌⠝⠛⠶⠶⢶⣦⣄⢂⢕⢂⢕ ',
-- ' ⣿⣿⠏⣠⣾⣦⡐⢌⢿⣷⣦⣅⡑⠕⠡⠐⢿⠿⣛⠟⠛⠛⠛⠛⠡⢷⡈⢂⢕⢂ ',
-- ' ⠟⣡⣾⣿⣿⣿⣿⣦⣑⠝⢿⣿⣿⣿⣿⣿⡵⢁⣤⣶⣶⣿⢿⢿⢿⡟⢻⣤⢑⢂ ',
-- ' ⣾⣿⣿⡿⢟⣛⣻⣿⣿⣿⣦⣬⣙⣻⣿⣿⣷⣿⣿⢟⢝⢕⢕⢕⢕⢽⣿⣿⣷⣔ ',
-- ' ⣿⣿⠵⠚⠉⢀⣀⣀⣈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣗⢕⢕⢕⢕⢕⢕⣽⣿⣿⣿⣿ ',
-- ' ⢷⣂⣠⣴⣾⡿⡿⡻⡻⣿⣿⣴⣿⣿⣿⣿⣿⣿⣷⣵⣵⣵⣷⣿⣿⣿⣿⣿⣿⡿ ',
-- ' ⢌⠻⣿⡿⡫⡪⡪⡪⡪⣺⣿⣿⣿⣿⣿⠿⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃ ',
-- ' ⠣⡁⠹⡪⡪⡪⡪⣪⣾⣿⣿⣿⣿⠋⠐⢉⢍⢄⢌⠻⣿⣿⣿⣿⣿⣿⣿⣿⠏⠈ ',
-- ' ⡣⡘⢄⠙⣾⣾⣾⣿⣿⣿⣿⣿⣿⡀⢐⢕⢕⢕⢕⢕⡘⣿⣿⣿⣿⣿⣿⠏⠠⠈ ',
-- ' ⠌⢊⢂⢣⠹⣿⣿⣿⣿⣿⣿⣿⣿⣧⢐⢕⢕⢕⢕⢕⢅⣿⣿⣿⣿⡿⢋⢜⠠⠈ ',
-- ' ⠄⠁⠕⢝⡢⠈⠻⣿⣿⣿⣿⣿⣿⣿⣷⣕⣑⣑⣑⣵⣿⣿⣿⡿⢋⢔⢕⣿⠠⠈ ',
-- ' ⠨⡂⡀⢑⢕⡅⠂⠄⠉⠛⠻⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⡿⢋⢔⢕⢕⣿⣿⠠⠈ ',
-- ' ⠄⠪⣂⠁⢕⠆⠄⠂⠄⠁⡀⠂⡀⠄⢈⠉⢍⢛⢛⢛⢋⢔⢕⢕⢕⣽⣿⣿⠠⠈ ',
-- '',
-- }
db.custom_header = {
'',
' ⣿⣿⣷⡁⢆⠈⠕⢕⢂⢕⢂⢕⢂⢔⢂⢕⢄⠂⣂⠂⠆⢂⢕⢂⢕⢂⢕⢂⢕⢂ ',
' ⣿⣿⣿⡷⠊⡢⡹⣦⡑⢂⢕⢂⢕⢂⢕⢂⠕⠔⠌⠝⠛⠶⠶⢶⣦⣄⢂⢕⢂⢕ ',
' ⣿⣿⠏⣠⣾⣦⡐⢌⢿⣷⣦⣅⡑⠕⠡⠐⢿⠿⣛⠟⠛⠛⠛⠛⠡⢷⡈⢂⢕⢂ ',
' ⠟⣡⣾⣿⣿⣿⣿⣦⣑⠝⢿⣿⣿⣿⣿⣿⡵⢁⣤⣶⣶⣿⢿⢿⢿⡟⢻⣤⢑⢂ ',
' ⣾⣿⣿⡿⢟⣛⣻⣿⣿⣿⣦⣬⣙⣻⣿⣿⣷⣿⣿⢟⢝⢕⢕⢕⢕⢽⣿⣿⣷⣔ ',
' ⣿⣿⠵⠚⠉⢀⣀⣀⣈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣗⢕⢕⢕⢕⢕⢕⣽⣿⣿⣿⣿ ',
' ⢷⣂⣠⣴⣾⡿⡿⡻⡻⣿⣿⣴⣿⣿⣿⣿⣿⣿⣷⣵⣵⣵⣷⣿⣿⣿⣿⣿⣿⡿ ',
' ⢌⠻⣿⡿⡫⡪⡪⡪⡪⣺⣿⣿⣿⣿⣿⠿⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃ ',
' ⠣⡁⠹⡪⡪⡪⡪⣪⣾⣿⣿⣿⣿⠋⠐⢉⢍⢄⢌⠻⣿⣿⣿⣿⣿⣿⣿⣿⠏⠈ ',
' ⡣⡘⢄⠙⣾⣾⣾⣿⣿⣿⣿⣿⣿⡀⢐⢕⢕⢕⢕⢕⡘⣿⣿⣿⣿⣿⣿⠏⠠⠈ ',
' ⠌⢊⢂⢣⠹⣿⣿⣿⣿⣿⣿⣿⣿⣧⢐⢕⢕⢕⢕⢕⢅⣿⣿⣿⣿⡿⢋⢜⠠⠈ ',
' ⠄⠁⠕⢝⡢⠈⠻⣿⣿⣿⣿⣿⣿⣿⣷⣕⣑⣑⣑⣵⣿⣿⣿⡿⢋⢔⢕⣿⠠⠈ ',
' ⠨⡂⡀⢑⢕⡅⠂⠄⠉⠛⠻⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⡿⢋⢔⢕⢕⣿⣿⠠⠈ ',
' ⠄⠪⣂⠁⢕⠆⠄⠂⠄⠁⡀⠂⡀⠄⢈⠉⢍⢛⢛⢛⢋⢔⢕⢕⢕⣽⣿⣿⠠⠈ ',
'',
}
db.custom_center = {
{

View File

@ -1,4 +1,10 @@
" Customize global settings
" You must set the default ui.
" Note: native ui
" https://github.com/Shougo/ddc-ui-native"
call ddc#custom#patch_global('ui', 'native')
" Use around source.
" https://github.com/Shougo/ddc-around
call ddc#custom#patch_global('sources', ['around'])
@ -30,7 +36,6 @@ call ddc#custom#patch_filetype('markdown', 'sourceParams', {
\ })
" Mappings
" <TAB>: completion.
inoremap <silent><expr> <TAB>
\ ddc#map#pum_visible() ? '<C-n>' :
@ -42,3 +47,6 @@ inoremap <expr><S-TAB> ddc#map#pum_visible() ? '<C-p>' : '<C-h>'
" Use ddc.
call ddc#enable()
" vim:ft=vim

View File

@ -1,7 +1,7 @@
" File : init.vim
" Author : Jeff LANCE <email@jefflance.me>
" Date : 15.04.2015
" Last Modified Date: 17.11.2021
" Last Modified Date: 01.09.2022
" Last Modified By : Jeff LANCE <email@jefflance.me>
""""""""""""""""""""""""""""""""""""""""""""""
@ -305,17 +305,6 @@ autocmd VimEnter *
" \ | Dashboard
\ | endif
" " needed so deoplete can auto select the first suggestion
" set completeopt+=noinsert
" " comment this line to enable autocompletion preview window
" " (displays documentation related to the selected completion option)
" " disabled by default because preview makes the window flicker
" set completeopt-=preview
" " autocompletion of files and commands behaves like shell
" " (complete only the common part, list the options that match)
" " set wildmode=list:longest
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@ -449,7 +438,6 @@ let g:colorizer_auto_filetype='css,html,xml,py,js'
" Commentary {{{
" -----
"
autocmd FileType toml setlocal commentstring=#\ %s
@ -653,6 +641,14 @@ let g:python3_host_prog = '/usr/bin/python3'
" }}}
" Noice {{{
" -----
lua require("noice").setup()
" -----
" }}}
" OCaml {{{
" -----
@ -667,6 +663,15 @@ set rtp^="/home/jeff/.opam/default/share/ocp-indent/vim"
" }}}
" Pum {{{
" -----
source ${HOME}/.config/nvim/pum.vim
" -----
" }}}
" Slime {{{
" -----
let g:slime_target = "tmux"
@ -760,18 +765,24 @@ let g:tex_flavor = 'latex'
" }}}
" Vimwiki {{{
" -----
"""""""""""""""""""""""""""""""""""""""""""""""""
" ____ _____ _ ____ _____ ___ _______ __
" / ___|_ _|/ \ | _ \_ _|_ _| ___\ \ / /
" \___ \ | | / _ \ | |_) || | | || |_ \ V /
" ___) || |/ ___ \| _ < | | | || _| | |
" |____/ |_/_/ \_\_| \_\|_| |___|_| |_|
"
"""""""""""""""""""""""""""""""""""""""""""""""""
let g:vimwiki_list = [{
\ 'path': '~/Projets/web/www.jefflance.me/posts/',
\ 'auto_export': 1,
\ 'automatic_nested_syntaxes': 1,
\ 'path_html': '/home/jeff/Projets/web/www.jefflance.me/posts/',
\ 'nested_syntaxes': {'python': 'python', 'c++': 'cpp'},
\ 'syntax': 'media',
\ 'ext': '.wiki',
\ 'custom_wiki2html': '/home/jeff/bin/web/nikola_build.sh',
\ 'html_filename_parameterization': 1,
\ }]
" Load functions from file
" source ${HOME}/.config/nvim/startscreen.vim
" /home/jeff/.local/bin/vimwiki_markdown
" -----
" }}}

View File

@ -16,6 +16,9 @@
" Custom {{{
" -----
" For COC
verbose imap <tab>
" Disable highlights when you press <leader><cr>:
map <silent> <leader><cr> :noh<cr>
@ -29,12 +32,6 @@ map <leader>s :echom 'Source file' <bar> :so %<cr>
map <leader>; <Esc>
map! <leader>; <Esc>
" Open a current file with sudo
" map <silent> <leader>E :e suda://%<cr>
" Save a current file with sudo
" map <silent> <leader>W :w suda://%<cr>
" Comment the target of a motion
map <silent> <leader>/ :Commentary<cr>
@ -43,7 +40,7 @@ map <silent> <C-]> >>
map <silent> <C-[> <<
" (Re|Un)do
map <silent> <C-u> uu
" map <silent> <C-u> uu
" Save as
map <C-s> :saveas<space>

View File

@ -45,9 +45,11 @@ Plug 'glepnir/dashboard-nvim'
Plug 'vim-denops/denops.vim'
Plug 'Shougo/ddc.vim'
Plug 'Shougo/ddu.vim'
Plug 'Shougo/ddc-around'
Plug 'Shougo/ddc-ui-native'
Plug 'Shougo/ddc-source-around'
Plug 'Shougo/ddc-matcher_head'
Plug 'Shougo/ddc-sorter_rank'
Plug 'Shougo/pum.vim'
" Buffer exploration
Plug 'bagrat/vim-buffet', { 'as': 'buffet' }
@ -56,6 +58,10 @@ Plug 'bagrat/vim-buffet', { 'as': 'buffet' }
Plug 'nvim-lua/plenary.nvim'
Plug 'nvim-telescope/telescope.nvim', { 'tag': '0.1.0' }
" Noice
Plug 'folke/noice.nvim'
Plug 'MunifTanjim/nui.nvim'
" Devicons
Plug 'kyazdani42/nvim-web-devicons'
@ -65,6 +71,9 @@ Plug 'pearofducks/ansible-vim'
" Artify
Plug 'delphinus/artify.nvim'
" Diagram syntax
Plug 'zhaozg/vim-diagram'
" Editorconfig
Plug 'editorconfig/editorconfig-vim'
@ -159,8 +168,8 @@ Plug 'jupyter-vim/jupyter-vim'
" indentLine
Plug 'Yggdroot/indentLine'
" " Mermaid diagram
" Plug 'zhaozg/vim-diagram'
" vim-wiki
Plug 'vimwiki/vimwiki'
" Required {{{
" -----

30
conf.d/nvim/pum.vim Normal file
View File

@ -0,0 +1,30 @@
" File : pum.vim
" Author : Jeff LANCE <email@jefflance.me>
" Date : 02.01.2023
" Last Modified Date: 02.01.2023
" Last Modified By : Jeff LANCE <email@jefflance.me>
"""""""""""""""""""""""""""
" ____ __ ____ ___
" / __ \/ / / / |/ /
" / /_/ / / / / /|_/ /
" / ____/ /_/ / / / /
" /_/ \____/_/ /_/
"
"""""""""""""""""""""""""""
" General {{{
" -----
inoremap <C-n> <Cmd>call pum#map#insert_relative(+1)<CR>
inoremap <C-p> <Cmd>call pum#map#insert_relative(-1)<CR>
inoremap <C-y> <Cmd>call pum#map#confirm()<CR>
inoremap <C-e> <Cmd>call pum#map#cancel()<CR>
inoremap <PageDown> <Cmd>call pum#map#insert_relative_page(+1)<CR>
inoremap <PageUp> <Cmd>call pum#map#insert_relative_page(-1)<CR>
" -----
" }}}
" vim:ft=vim