From 750a43c708daf3c9d6c6c57463deb34a9ecc9aa6 Mon Sep 17 00:00:00 2001 From: Anthony Debucquoy Date: Fri, 23 Aug 2024 11:20:30 +0200 Subject: [PATCH] vim to neovim --- .gitmodules | 16 +- nvim/.config/nvim/after/ftplugin/c.lua | 5 + nvim/.config/nvim/after/ftplugin/lua.lua | 4 + nvim/.config/nvim/after/ftplugin/python.lua | 4 + nvim/.config/nvim/after/ftplugin/tex.lua | 4 + nvim/.config/nvim/init.vim | 3 + nvim/.config/nvim/plugin/configs.lua | 1 + nvim/.config/nvim/plugin/lsp.lua | 24 ++ stowed.list | 1 + vim/.vim/UltiSnips/cmake.snippets | 18 ++ vim/.vim/UltiSnips/glsl.snippets | 20 ++ vim/.vim/UltiSnips/java.snippets | 10 + vim/.vim/UltiSnips/javascript.snippets | 10 + vim/.vim/UltiSnips/tex.snippets | 9 + vim/.vim/UltiSnips/vue.snippets | 25 +++ vim/.vim/compiler/bff.vim | 1 + vim/.vim/compiler/gradle.vim | 24 ++ vim/.vim/ftplugin/java.vim | 2 + vim/.vim/ftplugin/tex.vim | 1 + .../autoload/{start => other}/YouCompleteMe | 0 .../{start => other}/plantuml-previewer.vim | 0 .../autoload/{start => other}/plantuml-syntax | 0 .../autoload/{start => other}/vim-commentary | 0 vim/.vim/syntax/nim.vim | 205 ++++++++++++++++++ vim/.vim/ycm_extra_conf.py | 27 ++- vim/.vimrc | 48 +++- 26 files changed, 431 insertions(+), 31 deletions(-) create mode 100644 nvim/.config/nvim/after/ftplugin/c.lua create mode 100644 nvim/.config/nvim/after/ftplugin/lua.lua create mode 100644 nvim/.config/nvim/after/ftplugin/python.lua create mode 100644 nvim/.config/nvim/after/ftplugin/tex.lua create mode 100644 nvim/.config/nvim/init.vim create mode 100644 nvim/.config/nvim/plugin/configs.lua create mode 100644 nvim/.config/nvim/plugin/lsp.lua create mode 100644 vim/.vim/UltiSnips/cmake.snippets create mode 100644 vim/.vim/UltiSnips/glsl.snippets create mode 100644 vim/.vim/UltiSnips/java.snippets create mode 100644 vim/.vim/UltiSnips/javascript.snippets create mode 100644 vim/.vim/UltiSnips/vue.snippets create mode 100644 vim/.vim/compiler/bff.vim create mode 100644 vim/.vim/compiler/gradle.vim create mode 100644 vim/.vim/ftplugin/java.vim rename vim/.vim/pack/autoload/{start => other}/YouCompleteMe (100%) rename vim/.vim/pack/autoload/{start => other}/plantuml-previewer.vim (100%) rename vim/.vim/pack/autoload/{start => other}/plantuml-syntax (100%) rename vim/.vim/pack/autoload/{start => other}/vim-commentary (100%) create mode 100755 vim/.vim/syntax/nim.vim diff --git a/.gitmodules b/.gitmodules index 2eb583c..5595c17 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,14 +40,14 @@ [submodule "vim/.vim/pack/autoload/start/tagbar"] path = vim/.vim/pack/autoload/start/tagbar url = https://github.com/majutsushi/tagbar -[submodule "vim/.vim/pack/autoload/start/vim-commentary"] - path = vim/.vim/pack/autoload/start/vim-commentary +[submodule "vim/.vim/pack/autoload/other/vim-commentary"] + path = vim/.vim/pack/autoload/other/vim-commentary url = https://github.com/tpope/vim-commentary [submodule "vim/.vim/pack/autoload/start/vimspector"] path = vim/.vim/pack/autoload/start/vimspector url = https://github.com/puremourning/vimspector -[submodule "vim/.vim/pack/autoload/start/YouCompleteMe"] - path = vim/.vim/pack/autoload/start/YouCompleteMe +[submodule "vim/.vim/pack/autoload/other/YouCompleteMe"] + path = vim/.vim/pack/autoload/other/YouCompleteMe url = https://github.com/ycm-core/YouCompleteMe [submodule "vim/.vim/pack/autoload/start/vim-signify"] path = vim/.vim/pack/autoload/start/vim-signify @@ -88,12 +88,12 @@ [submodule "vim/.vim/pack/autoload/start/latex-snippets"] path = vim/.vim/pack/autoload/start/latex-snippets url = https://github.com/gillescastel/latex-snippets -[submodule "vim/.vim/pack/autoload/start/plantuml-previewer.vim"] - path = vim/.vim/pack/autoload/start/plantuml-previewer.vim +[submodule "vim/.vim/pack/autoload/other/plantuml-previewer.vim"] + path = vim/.vim/pack/autoload/other/plantuml-previewer.vim url = https://github.com/weirongxu/plantuml-previewer.vim [submodule "vim/.vim/pack/autoload/start/open-browser.vim"] path = vim/.vim/pack/autoload/start/open-browser.vim url = https://github.com/tyru/open-browser.vim -[submodule "vim/.vim/pack/autoload/start/plantuml-syntax"] - path = vim/.vim/pack/autoload/start/plantuml-syntax +[submodule "vim/.vim/pack/autoload/other/plantuml-syntax"] + path = vim/.vim/pack/autoload/other/plantuml-syntax url = https://github.com/aklt/plantuml-syntax diff --git a/nvim/.config/nvim/after/ftplugin/c.lua b/nvim/.config/nvim/after/ftplugin/c.lua new file mode 100644 index 0000000..3da1392 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/c.lua @@ -0,0 +1,5 @@ +vim.lsp.start({ + name = 'clangd', + cmd = {'clangd'}, + -- root_dir = vim.fs.root(args.buf, {'Makefile'}) +}) diff --git a/nvim/.config/nvim/after/ftplugin/lua.lua b/nvim/.config/nvim/after/ftplugin/lua.lua new file mode 100644 index 0000000..2ed0356 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/lua.lua @@ -0,0 +1,4 @@ +vim.lsp.start({ + name = 'lua-language-server', + cmd = {'lua-language-server'}, +}) diff --git a/nvim/.config/nvim/after/ftplugin/python.lua b/nvim/.config/nvim/after/ftplugin/python.lua new file mode 100644 index 0000000..48b67c4 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/python.lua @@ -0,0 +1,4 @@ +vim.lsp.start({ + name = 'jedi', + cmd = {'jedi-language-server'}, +}) diff --git a/nvim/.config/nvim/after/ftplugin/tex.lua b/nvim/.config/nvim/after/ftplugin/tex.lua new file mode 100644 index 0000000..c62a3c7 --- /dev/null +++ b/nvim/.config/nvim/after/ftplugin/tex.lua @@ -0,0 +1,4 @@ +vim.lsp.start({ + name = 'texlab', + cmd = {'texlab'}, +}) diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim new file mode 100644 index 0000000..f182e5b --- /dev/null +++ b/nvim/.config/nvim/init.vim @@ -0,0 +1,3 @@ +set runtimepath^=~/.vim runtimepath+=~/.vim/after +let &packpath = &runtimepath +source ~/.vimrc diff --git a/nvim/.config/nvim/plugin/configs.lua b/nvim/.config/nvim/plugin/configs.lua new file mode 100644 index 0000000..4b6d1d1 --- /dev/null +++ b/nvim/.config/nvim/plugin/configs.lua @@ -0,0 +1 @@ +vim.g.vimtex_view_method="zathura" diff --git a/nvim/.config/nvim/plugin/lsp.lua b/nvim/.config/nvim/plugin/lsp.lua new file mode 100644 index 0000000..ba11599 --- /dev/null +++ b/nvim/.config/nvim/plugin/lsp.lua @@ -0,0 +1,24 @@ +--- Default maps for LSP functions. +--- +--- These are mapped unconditionally to avoid different behavior depending on whether an LSP +--- client is attached. If no client is attached, or if a server does not support a capability, an +--- error message is displayed rather than exhibiting different behavior. +--- +--- See |grr|, |grn|, |gra|, |i_CTRL-S|. +do + vim.keymap.set('n', 'grn', function() + vim.lsp.buf.rename() + end, { desc = 'vim.lsp.buf.rename()' }) + + vim.keymap.set({ 'n', 'x' }, 'gra', function() + vim.lsp.buf.code_action() + end, { desc = 'vim.lsp.buf.code_action()' }) + + vim.keymap.set('n', 'grr', function() + vim.lsp.buf.references() + end, { desc = 'vim.lsp.buf.references()' }) + + vim.keymap.set('i', '', function() + vim.lsp.buf.signature_help() + end, { desc = 'vim.lsp.buf.signature_help()' }) +end diff --git a/stowed.list b/stowed.list index 28b55b9..3b2c70e 100644 --- a/stowed.list +++ b/stowed.list @@ -3,6 +3,7 @@ bspwm dmenu feh git +nvim picom polybar sxhkd diff --git a/vim/.vim/UltiSnips/cmake.snippets b/vim/.vim/UltiSnips/cmake.snippets new file mode 100644 index 0000000..cfcdf7b --- /dev/null +++ b/vim/.vim/UltiSnips/cmake.snippets @@ -0,0 +1,18 @@ +snippet base "Cmake Init" b +cmake_minimum_required(VERSION ${1:3.12}) +project(${2:${VISUAL:project}}) + +# Generate compile_commands.json +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + +# Dependencies +# find_package(package 0.0.1 REQUIRED) + +# Project configurations +add_executable(${PROJECT_NAME}) +add_subdirectory(src) + +# target_link_libraries(${PROJECT_NAME} package) + +endsnippet + diff --git a/vim/.vim/UltiSnips/glsl.snippets b/vim/.vim/UltiSnips/glsl.snippets new file mode 100644 index 0000000..c9a3f90 --- /dev/null +++ b/vim/.vim/UltiSnips/glsl.snippets @@ -0,0 +1,20 @@ +snippet basev "base for vertex shader" +#version ${1:${VISUAL:420}} core + +layout (location = 0) in vec3 aPos; + +void main(){ + gl_Position = vec4(aPos, 1.0); + $0 +} +endsnippet + +snippet basef "base for fragment shader" +#version ${1:${VISUAL:420}} core + +out vec4 FragColor; + +void main(){ + FragColor = vec4(1.0, 0.0, 0.0, 1.0); +} +endsnippet diff --git a/vim/.vim/UltiSnips/java.snippets b/vim/.vim/UltiSnips/java.snippets new file mode 100644 index 0000000..54202b3 --- /dev/null +++ b/vim/.vim/UltiSnips/java.snippets @@ -0,0 +1,10 @@ +snippet sign "Header of vue file" b +/****************************************************** + * @file `!p snip.rv = fn` + * @author `git config --global --get user.name` + * @scope ${1:Extension messagerie} + * + * $2 + ******************************************************/ +$0 +endsnippet diff --git a/vim/.vim/UltiSnips/javascript.snippets b/vim/.vim/UltiSnips/javascript.snippets new file mode 100644 index 0000000..5f859d2 --- /dev/null +++ b/vim/.vim/UltiSnips/javascript.snippets @@ -0,0 +1,10 @@ +snippet sign "sign your work" b +/******************************************************* + * File: `!p snip.rv = fn` + * Author: `git config --global --get user.name` + * Scope: ${1:Extension messagerie} + * Description: $2 + *******************************************************/ + +$0 +endsnippet diff --git a/vim/.vim/UltiSnips/tex.snippets b/vim/.vim/UltiSnips/tex.snippets index 1320248..5055e51 100644 --- a/vim/.vim/UltiSnips/tex.snippets +++ b/vim/.vim/UltiSnips/tex.snippets @@ -17,3 +17,12 @@ $0 \end{document} endsnippet + +snippet bb "mathbb" i +\mathbb{${1:${VISUAL:R}}} $0 +endsnippet + +priority -9999999 +snippet "(\w+)" "latex default" r +\\`!p snip.rv = match.group(1)` $1 +endsnippet diff --git a/vim/.vim/UltiSnips/vue.snippets b/vim/.vim/UltiSnips/vue.snippets new file mode 100644 index 0000000..479e84d --- /dev/null +++ b/vim/.vim/UltiSnips/vue.snippets @@ -0,0 +1,25 @@ +snippet sign "Header of vue file" + + + +$0 +endsnippet + +snippet basev "vue base" + + + + + +endsnippet diff --git a/vim/.vim/compiler/bff.vim b/vim/.vim/compiler/bff.vim new file mode 100644 index 0000000..1f8c07c --- /dev/null +++ b/vim/.vim/compiler/bff.vim @@ -0,0 +1 @@ +let &makeprg="bff %" diff --git a/vim/.vim/compiler/gradle.vim b/vim/.vim/compiler/gradle.vim new file mode 100644 index 0000000..5ec37ee --- /dev/null +++ b/vim/.vim/compiler/gradle.vim @@ -0,0 +1,24 @@ +" Vim Compiler File +" Compiler: gradlew + +if exists("current_compiler") + finish +endif +let current_compiler = "gradlew" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal +endif + +CompilerSet makeprg=$PWD/gradlew + +CompilerSet errorformat= + \%E[ant:scalac]\ %f:%l:\ error:\ %m, + \%W[ant:scalac]\ %f:%l:\ warning:\ %m, + \%E%.%#:compile%\\w%#Java%f:%l:\ error:\ %m,%-Z%p^,%-C%.%#, + \%W%.%#:compile%\\w%#Java%f:%l:\ warning:\ %m,%-Z%p^,%-C%.%#, + \%E%f:%l:\ error:\ %m,%-Z%p^,%-C%.%#, + \%W%f:%l:\ warning:\ %m,%-Z%p^,%-C%.%#, + \%E%f:\ %\\d%\\+:\ %m\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^, + \%E%>%f:\ %\\d%\\+:\ %m,%C\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^, + \%-G%.%#" diff --git a/vim/.vim/ftplugin/java.vim b/vim/.vim/ftplugin/java.vim new file mode 100644 index 0000000..41959f9 --- /dev/null +++ b/vim/.vim/ftplugin/java.vim @@ -0,0 +1,2 @@ +nnoremap K :YcmCompleter GetDoc +" let $JAVA_TOOL_OPTIONS = '-javaagent:/usr/share/lombok-common/lombok-api.jar -Xbootclasspath/p:/usr/share/lombok-common/lombok-api.jar' diff --git a/vim/.vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim index 773d2fd..f6089ed 100644 --- a/vim/.vim/ftplugin/tex.vim +++ b/vim/.vim/ftplugin/tex.vim @@ -1,4 +1,5 @@ set concealcursor="" +set textwidth=100 highlight Conceal ctermfg=red diff --git a/vim/.vim/pack/autoload/start/YouCompleteMe b/vim/.vim/pack/autoload/other/YouCompleteMe similarity index 100% rename from vim/.vim/pack/autoload/start/YouCompleteMe rename to vim/.vim/pack/autoload/other/YouCompleteMe diff --git a/vim/.vim/pack/autoload/start/plantuml-previewer.vim b/vim/.vim/pack/autoload/other/plantuml-previewer.vim similarity index 100% rename from vim/.vim/pack/autoload/start/plantuml-previewer.vim rename to vim/.vim/pack/autoload/other/plantuml-previewer.vim diff --git a/vim/.vim/pack/autoload/start/plantuml-syntax b/vim/.vim/pack/autoload/other/plantuml-syntax similarity index 100% rename from vim/.vim/pack/autoload/start/plantuml-syntax rename to vim/.vim/pack/autoload/other/plantuml-syntax diff --git a/vim/.vim/pack/autoload/start/vim-commentary b/vim/.vim/pack/autoload/other/vim-commentary similarity index 100% rename from vim/.vim/pack/autoload/start/vim-commentary rename to vim/.vim/pack/autoload/other/vim-commentary diff --git a/vim/.vim/syntax/nim.vim b/vim/.vim/syntax/nim.vim new file mode 100755 index 0000000..7534a67 --- /dev/null +++ b/vim/.vim/syntax/nim.vim @@ -0,0 +1,205 @@ +" For version 5.x: Clear all syntax items +" For version 6.x: Quit when a syntax file was already loaded +if v:version < 600 + syntax clear +elseif exists('b:current_syntax') + finish +endif + +" Keep user-supplied options +if !exists('nim_highlight_numbers') + let nim_highlight_numbers = 1 +endif +if !exists('nim_highlight_builtins') + let nim_highlight_builtins = 1 +endif +if !exists('nim_highlight_exceptions') + let nim_highlight_exceptions = 1 +endif +if !exists('nim_highlight_space_errors') + let nim_highlight_space_errors = 1 +endif +if !exists('nim_highlight_special_vars') + let nim_highlight_special_vars = 1 +endif + +if exists('nim_highlight_all') + let nim_highlight_numbers = 1 + let nim_highlight_builtins = 1 + let nim_highlight_exceptions = 1 + let nim_highlight_space_errors = 1 + let nim_highlight_special_vars = 1 +endif + +syn region nimBrackets contained extend keepend matchgroup=Bold start=+\(\\\)\@/' + exe 'syn match nimNumber /\v<0[ocC]\o%(_?\o)*%('.s:int_suf.'|'.s:float_suf.')?>/' + exe 'syn match nimNumber /\v<0[xX]\x%(_?\x)*%('.s:int_suf.'|'.s:float_suf.')?>/' + exe 'syn match nimNumber /\v<'.s:dec_num.'%('.s:int_suf.'|'.s:exp.'?'.s:float_suf.'?)>/' + exe 'syn match nimNumber /\v<'.s:dec_num.'\.'.s:dec_num.s:exp.'?'.s:float_suf.'?>/' + unlet s:dec_num s:int_suf s:float_suf s:exp +endif + +if nim_highlight_builtins == 1 + " builtin functions, types and objects, not really part of the syntax + syn keyword nimBuiltin int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64 + syn keyword nimBuiltin bool void chr char string cstring pointer range array openarray openArray seq varargs varArgs + syn keyword nimBuiltin set Byte Natural Positive Conversion + syn keyword nimBuiltin BiggestInt BiggestFloat cchar cschar cshort cint csize cuchar cushort + syn keyword nimBuiltin clong clonglong cfloat cdouble clongdouble cuint culong culonglong cchar + syn keyword nimBuiltin CompileDate CompileTime nimversion nimVersion nimmajor nimMajor + syn keyword nimBuiltin nimminor nimMinor nimpatch nimPatch cpuendian cpuEndian hostos hostOS hostcpu hostCPU inf + syn keyword nimBuiltin neginf nan QuitSuccess QuitFailure dbglinehook dbgLineHook stdin + syn keyword nimBuiltin stdout stderr defined new high low sizeof succ pred + syn keyword nimBuiltin inc dec newseq newSeq len incl excl card ord chr ze ze64 + syn keyword nimBuiltin tou8 toU8 tou16 toU16 tou32 toU32 abs min max add repr + syn match nimBuiltin "\" + syn keyword nimBuiltin tofloat toFloat tobiggestfloat toBiggestFloat toint toInt tobiggestint toBiggestInt + syn keyword nimBuiltin addquitproc addQuitProc + syn keyword nimBuiltin copy setlen setLen newstring newString zeromem zeroMem copymem copyMem movemem moveMem + syn keyword nimBuiltin equalmem equalMem alloc alloc0 realloc dealloc assert + syn keyword nimBuiltin typedesc typed untyped stmt expr + syn keyword nimBuiltin echo swap getrefcount getRefcount getcurrentexception getCurrentException Msg + syn keyword nimBuiltin getoccupiedmem getOccupiedMem getfreemem getFreeMem gettotalmem getTotalMem isnil isNil seqtoptr seqToPtr + syn keyword nimBuiltin find pop GC_disable GC_enable GC_fullCollect + syn keyword nimBuiltin GC_setStrategy GC_enableMarkAndSweep GC_Strategy + syn keyword nimBuiltin GC_disableMarkAnd Sweep GC_getStatistics GC_ref + syn keyword nimBuiltin GC_ref GC_ref GC_unref GC_unref GC_unref quit + syn keyword nimBuiltin OpenFile OpenFile CloseFile EndOfFile readChar + syn keyword nimBuiltin FlushFile readfile readFile readline readLine write writeln writeLn writeline writeLine + syn keyword nimBuiltin getfilesize getFileSize ReadBytes ReadChars readbuffer readBuffer writebytes writeBytes + syn keyword nimBuiltin writechars writeChars writebuffer writeBuffer setfilepos setFilePos getfilepos getFilePos + syn keyword nimBuiltin filehandle fileHandle countdown countup items lines + syn keyword nimBuiltin FileMode File RootObj FileHandle ByteAddress Endianness +endif + +if nim_highlight_exceptions == 1 + " builtin exceptions and warnings + syn keyword nimException E_Base EAsynch ESynch ESystem EIO EOS + syn keyword nimException ERessourceExhausted EArithmetic EDivByZero + syn keyword nimException EOverflow EAccessViolation EAssertionFailed + syn keyword nimException EControlC EInvalidValue EOutOfMemory EInvalidIndex + syn keyword nimException EInvalidField EOutOfRange EStackOverflow + syn keyword nimException ENoExceptionToReraise EInvalidObjectAssignment + syn keyword nimException EInvalidObject EInvalidLibrary EInvalidKey + syn keyword nimException EInvalidObjectConversion EFloatingPoint + syn keyword nimException EFloatInvalidOp EFloatDivByZero EFloatOverflow + syn keyword nimException EFloatInexact EDeadThread EResourceExhausted + syn keyword nimException EFloatUnderflow +endif + +if nim_highlight_space_errors == 1 + " trailing whitespace + syn match nimSpaceError display excludenl "\S\s\+$"ms=s+1 + " any tabs are illegal in nim + syn match nimSpaceError display "\t" +endif + +if nim_highlight_special_vars + syn keyword nimSpecialVar result +endif + +syn sync match nimSync grouphere NONE "):$" +syn sync maxlines=200 +syn sync minlines=2000 + +if v:version >= 508 || !exists('did_nim_syn_inits') + if v:version <= 508 + let did_nim_syn_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + " The default methods for highlighting. Can be overridden later + HiLink nimBrackets Operator + HiLink nimKeyword Keyword + HiLink nimFunction Function + HiLink nimConditional Conditional + HiLink nimRepeat Repeat + HiLink nimString String + HiLink nimRawString String + HiLink nimBoolean Boolean + HiLink nimEscape Special + HiLink nimOperator Operator + HiLink nimPreCondit PreCondit + HiLink nimComment Comment + HiLink nimTodo Todo + HiLink nimDecorator Define + HiLink nimSpecialVar Identifier + + if nim_highlight_numbers == 1 + HiLink nimNumber Number + endif + + if nim_highlight_builtins == 1 + HiLink nimBuiltin Number + endif + + if nim_highlight_exceptions == 1 + HiLink nimException Exception + endif + + if nim_highlight_space_errors == 1 + HiLink nimSpaceError Error + endif + + delcommand HiLink +endif + +let b:current_syntax = 'nim' + diff --git a/vim/.vim/ycm_extra_conf.py b/vim/.vim/ycm_extra_conf.py index 1a61c1d..9428053 100644 --- a/vim/.vim/ycm_extra_conf.py +++ b/vim/.vim/ycm_extra_conf.py @@ -1,20 +1,19 @@ import os PATH_TO_LOMBOK = os.path.expanduser("/usr/lib/lombok-common/lombok.jar") -jdtls_args = ['-noverify', - '-Xmx1G', +jdtls_args = ['-Xmx1G', '-XX:+UseG1GC', '-XX:+UseStringDeduplication'] -def Settings( **kwargs ): - if not os.path.exists(PATH_TO_LOMBOK): - raise RuntimeError("Didn't find lombok jar") - if kwargs['language'] == 'java': - return { - 'server': { - 'jvm_args': [ - '-javaagent:' + PATH_TO_LOMBOK, - '-Xbootclasspath/a:' + PATH_TO_LOMBOK - ] + jdtls_args - } - } +# def Settings( **kwargs ): +# if not os.path.exists(PATH_TO_LOMBOK): +# raise RuntimeError("Didn't find lombok jar") +# if kwargs['language'] == 'java': +# return { +# 'server': { +# 'jvm_args': [ +# '-javaagent:' + PATH_TO_LOMBOK, +# '-Xbootclasspath/a:' + PATH_TO_LOMBOK +# ] + jdtls_args +# } +# } diff --git a/vim/.vimrc b/vim/.vimrc index ed79765..9e3d2c8 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -1,5 +1,26 @@ nnoremap :Buffers nnoremap :Ag +map gf :e + +"FZF Buffer Delete + +function! s:list_buffers() + redir => list + silent ls + redir END + return split(list, "\n") +endfunction + +function! s:delete_buffers(lines) + execute 'bwipeout' join(map(a:lines, {_, line -> split(line)[0]})) +endfunction + + +command! BD call fzf#run(fzf#wrap({ + \ 'source': s:list_buffers(), + \ 'sink*': { lines -> s:delete_buffers(lines) }, + \ 'options': '--multi --reverse --bind ctrl-a:select-all+accept' +\ })) "alt g to :Gfiles (if in git folder) else :Files function! GFilesFallback() @@ -31,17 +52,17 @@ let g:vimtex_grammar_textidote = {'jar': '/usr/share/java/textidote.jar'} let g:vimtex_view_method = 'zathura' -nnoremap gd :YcmCompleter GoToDefinition -nnoremap gr :YcmCompleter GoToReferences -nnoremap K :YcmCompleter GetDoc -nnoremap \ :YcmCompleter FixIt +" nnoremap gd :YcmCompleter GoToDefinition +" nnoremap gr :YcmCompleter GoToReferences +" nnoremap K :YcmCompleter GetDoc +" nnoremap \ :YcmCompleter FixIt noremap gN :Lex nnoremap :Make nnoremap :Make run "Documentation -nnoremap K :execute 'vert term' &keywordprg '' +" nnoremap K :execute 'vert term' &keywordprg '' command Curl :execute 'vert term lynx -dump' escape(@+, '#') command OpenLink :silent w !urlscan @@ -79,6 +100,11 @@ let g:ycm_language_server = [ \ 'filetypes': ['tex'], \ }, \ { + \ 'name': 'vue', + \ 'cmdline': [ 'vue-language-server', '--stdio' ], + \ 'filetypes': ['vue'], + \ }, + \ { \ 'name': 'godot', \ 'filetypes': ['gdscript'], \ 'port': 6008, @@ -120,16 +146,20 @@ set nu set rnu set scrolloff=10 set shiftwidth=4 -set shortmess-=S +set shortmess=atToOs set showcmd set spelllang+=fr set splitbelow splitright set tabstop=4 -set ttymouse=xterm2 + +if !has('nvim') + set ttymouse=xterm2 +endif color desert hi Normal ctermfg=None ctermbg=None hi NonText ctermfg=None ctermbg=None -packadd termdebug -let termdebug_wide=1 +" packadd termdebug +let g:termdebug_wide=1 +filetype plugin indent on