From 8ae7046f3f6d4a474f0cc3255553474c743b7ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Kmie=C4=87?= Date: Tue, 19 Apr 2022 23:01:31 +0200 Subject: [PATCH] Nvim: remove coq and other config files --- .config/nvim/after/plugin/alternate.rc.vim | 1 - .../plugin/{context.rc.vim => context.rc.lua} | 8 +-- .config/nvim/after/plugin/defx.rc.vim | 67 ------------------ .config/nvim/after/plugin/fzf.rc.vim | 10 --- .config/nvim/after/plugin/indent.rc.vim | 27 -------- .config/nvim/after/plugin/lspconfig.rc.vim | 69 ++++++++----------- .config/nvim/after/plugin/nerdtree.rc.vim | 3 - .../{nvim-cmp.rc.vim => nvim-cmp.rc.lua} | 17 ++--- .../{treesitter.rc.vim => treesitter.rc.lua} | 5 +- .config/nvim/after/plugin/yoink.rc.vim | 5 -- .config/nvim/init.vim | 21 ++---- 11 files changed, 46 insertions(+), 187 deletions(-) delete mode 100644 .config/nvim/after/plugin/alternate.rc.vim rename .config/nvim/after/plugin/{context.rc.vim => context.rc.lua} (89%) delete mode 100644 .config/nvim/after/plugin/defx.rc.vim delete mode 100644 .config/nvim/after/plugin/fzf.rc.vim delete mode 100644 .config/nvim/after/plugin/indent.rc.vim delete mode 100644 .config/nvim/after/plugin/nerdtree.rc.vim rename .config/nvim/after/plugin/{nvim-cmp.rc.vim => nvim-cmp.rc.lua} (88%) rename .config/nvim/after/plugin/{treesitter.rc.vim => treesitter.rc.lua} (96%) delete mode 100644 .config/nvim/after/plugin/yoink.rc.vim diff --git a/.config/nvim/after/plugin/alternate.rc.vim b/.config/nvim/after/plugin/alternate.rc.vim deleted file mode 100644 index cfa3bcc..0000000 --- a/.config/nvim/after/plugin/alternate.rc.vim +++ /dev/null @@ -1 +0,0 @@ -nnoremap :silent FSHere diff --git a/.config/nvim/after/plugin/context.rc.vim b/.config/nvim/after/plugin/context.rc.lua similarity index 89% rename from .config/nvim/after/plugin/context.rc.vim rename to .config/nvim/after/plugin/context.rc.lua index 3ed40f5..e63bbca 100644 --- a/.config/nvim/after/plugin/context.rc.vim +++ b/.config/nvim/after/plugin/context.rc.lua @@ -1,7 +1,6 @@ -" Configuration for context.vim -"" Disable context.vim on json files -""let g:context_filetype_blacklist = ["json", "log"] -lua << EOF +-- " Configuration for context.vim +-- "" Disable context.vim on json files +-- ""let g:context_filetype_blacklist = ["json", "log"] require'treesitter-context'.setup{ enable = true, -- Enable this plugin (Can be enabled/disabled later via commands) throttle = true, -- Throttles plugin updates (may improve performance) @@ -34,4 +33,3 @@ require'treesitter-context'.setup{ rust = true, } } -EOF diff --git a/.config/nvim/after/plugin/defx.rc.vim b/.config/nvim/after/plugin/defx.rc.vim deleted file mode 100644 index 356ad77..0000000 --- a/.config/nvim/after/plugin/defx.rc.vim +++ /dev/null @@ -1,67 +0,0 @@ -"nnoremap d Defx `escape(expand('%:p:h'), ' :')` -search=`expand('%:p')` -split=vertical -winwidth=50 -direction=topleft -" -"autocmd FileType defx call s:defx_my_settings() -"function! s:defx_my_settings() abort -" " Define mappings -" nnoremap -" \ defx#do_action('drop') " instead of open -" nnoremap c -" \ defx#do_action('copy') -" nnoremap m -" \ defx#do_action('move') -" nnoremap p -" \ defx#do_action('paste') -" nnoremap l -" \ defx#do_action('drop') -" nnoremap E -" \ defx#do_action('open', 'vsplit') -" nnoremap P -" \ defx#do_action('preview') -" nnoremap o -" \ defx#do_action('open_tree', 'toggle') -" nnoremap K -" \ defx#do_action('new_directory') -" nnoremap N -" \ defx#do_action('new_file') -" nnoremap M -" \ defx#do_action('new_multiple_files') -" nnoremap C -" \ defx#do_action('toggle_columns', -" \ 'mark:indent:icon:filename:type:size:time') -" nnoremap S -" \ defx#do_action('toggle_sort', 'time') -" nnoremap d -" \ defx#do_action('remove') -" nnoremap r -" \ defx#do_action('rename') -" nnoremap ! -" \ defx#do_action('execute_command') -" nnoremap x -" \ defx#do_action('execute_system') -" nnoremap yy -" \ defx#do_action('yank_path') -" nnoremap . -" \ defx#do_action('toggle_ignored_files') -" nnoremap ; -" \ defx#do_action('repeat') -" nnoremap h -" \ defx#do_action('cd', ['..']) -" nnoremap ~ -" \ defx#do_action('cd') -" nnoremap q -" \ defx#do_action('quit') -" nnoremap -" \ defx#do_action('toggle_select') . 'j' -" nnoremap * -" \ defx#do_action('toggle_select_all') -" nnoremap j -" \ line('.') == line('$') ? 'gg' : 'j' -" nnoremap k -" \ line('.') == 1 ? 'G' : 'k' -" nnoremap -" \ defx#do_action('redraw') -" nnoremap -" \ defx#do_action('print') -" nnoremap cd -" \ defx#do_action('change_vim_cwd') -"endfunction diff --git a/.config/nvim/after/plugin/fzf.rc.vim b/.config/nvim/after/plugin/fzf.rc.vim deleted file mode 100644 index 2a6cb0a..0000000 --- a/.config/nvim/after/plugin/fzf.rc.vim +++ /dev/null @@ -1,10 +0,0 @@ -"nnoremap a :Rg! -"nnoremap A :Rg! -"nnoremap b :Buffers! -"nnoremap c :Commands! -"nnoremap g :Commits! -"nnoremap f :Files! -"nnoremap H :History/ -"nnoremap H :History! -"nnoremap l :Lines! -"inoremap s :Snippets! diff --git a/.config/nvim/after/plugin/indent.rc.vim b/.config/nvim/after/plugin/indent.rc.vim deleted file mode 100644 index f5ee61d..0000000 --- a/.config/nvim/after/plugin/indent.rc.vim +++ /dev/null @@ -1,27 +0,0 @@ -lua << EOF -vim.opt.termguicolors = true -vim.cmd [[highlight IndentBlanklineIndent1 guifg=#A04050 gui=nocombine]] -vim.cmd [[highlight IndentBlanklineIndent2 guifg=#A0A050 gui=nocombine]] -vim.cmd [[highlight IndentBlanklineIndent3 guifg=#50A050 gui=nocombine]] -vim.cmd [[highlight IndentBlanklineIndent4 guifg=#1090A0 gui=nocombine]] -vim.cmd [[highlight IndentBlanklineIndent5 guifg=#2080C0 gui=nocombine]] -vim.cmd [[highlight IndentBlanklineIndent6 guifg=#8050B0 gui=nocombine]] - ---vim.opt.list = true ---vim.opt.listchars:append("space:⋅") ---vim.opt.listchars:append("eol:↴") - -require("indent_blankline").setup { - show_current_context = true, - show_current_context_start = true, - --space_char_blankline = " ", - char_highlight_list = { - "IndentBlanklineIndent1", - "IndentBlanklineIndent2", - "IndentBlanklineIndent3", - "IndentBlanklineIndent4", - "IndentBlanklineIndent5", - "IndentBlanklineIndent6", - }, -} -EOF diff --git a/.config/nvim/after/plugin/lspconfig.rc.vim b/.config/nvim/after/plugin/lspconfig.rc.vim index a487e0f..bdfe23a 100644 --- a/.config/nvim/after/plugin/lspconfig.rc.vim +++ b/.config/nvim/after/plugin/lspconfig.rc.vim @@ -5,10 +5,9 @@ endif " Completion configuration for native neovim + nvim-lspconfig lua << EOF local nvim_lsp = require'lspconfig' -local coq = require'coq' +--local coq = require'coq' local cmp = require'cmp_nvim_lsp' local clangd_extensions = require("clangd_extensions") ---local signature = require'lsp_signature' -- Mappings. local opts = { noremap=true, silent=true } @@ -39,12 +38,6 @@ local on_attach = function(client, bufnr) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', 'lua vim.lsp.buf.references()', opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', '', 'ClangdSwitchSourceHeader', opts) - -- signature.on_attach({ - -- bind = true, - -- handler_opts = { - -- border = "single", - -- } - -- }, bufnr) require'illuminate'.on_attach(client) require'virtualtypes'.on_attach() end @@ -77,13 +70,12 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( } ) -nvim_lsp.groovyls.setup ( - coq.lsp_ensure_capabilities({ - cmd = { "java", "-jar", "/home/kmcr/tools/groovy-language-server/build/libs/groovy-language-server-all.jar" }, - on_attach = on_attach, - on_publish_diagnostics = diagnostic_handler, - capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()), - }) +nvim_lsp.groovyls.setup ({ + cmd = { "java", "-jar", "/home/kmcr/tools/groovy-language-server/build/libs/groovy-language-server-all.jar" }, + on_attach = on_attach, + on_publish_diagnostics = diagnostic_handler, + capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()), + } ) -- nvim_lsp.ccls.setup( @@ -126,39 +118,34 @@ clangd_extensions.setup({ -- ) -- ) -nvim_lsp.pylsp.setup( - coq.lsp_ensure_capabilities({ - settings = { - pylint = { - enabled = false - }, - pyflakes = { - enabled = false, - }, +nvim_lsp.pylsp.setup({ + settings = { + pylint = { + enabled = false }, - flags = { - debounce_text_changes = 150, + pyflakes = { + enabled = false, }, - on_attach = on_attach, - on_publish_diagnostics = diagnostic_handler, - capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()), - }) -) + }, + flags = { + debounce_text_changes = 150, + }, + on_attach = on_attach, + on_publish_diagnostics = diagnostic_handler, + capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()), +}) -- Use a loop to conveniently call 'setup' on multiple servers and -- map buffer local keybindings when the language server attaches local servers = { "cmake", "rust_analyzer" } for _, lsp in ipairs(servers) do - nvim_lsp[lsp].setup( - coq.lsp_ensure_capabilities({ - on_attach = on_attach, - on_publish_diagnostics = diagnostic_handler, - capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()), - flags = { - debounce_text_changes = 150, - } + nvim_lsp[lsp].setup({ + on_attach = on_attach, + on_publish_diagnostics = diagnostic_handler, + capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()), + flags = { + debounce_text_changes = 150, } - ) -) + }) end EOF diff --git a/.config/nvim/after/plugin/nerdtree.rc.vim b/.config/nvim/after/plugin/nerdtree.rc.vim deleted file mode 100644 index 2cd1225..0000000 --- a/.config/nvim/after/plugin/nerdtree.rc.vim +++ /dev/null @@ -1,3 +0,0 @@ -" Mapping to NERDTree -"nnoremap t :NERDTreeToggle -"let NERDTreeIgnore=['\~$', '\.pyc$'] diff --git a/.config/nvim/after/plugin/nvim-cmp.rc.vim b/.config/nvim/after/plugin/nvim-cmp.rc.lua similarity index 88% rename from .config/nvim/after/plugin/nvim-cmp.rc.vim rename to .config/nvim/after/plugin/nvim-cmp.rc.lua index 7d60826..cfa2b71 100644 --- a/.config/nvim/after/plugin/nvim-cmp.rc.vim +++ b/.config/nvim/after/plugin/nvim-cmp.rc.lua @@ -1,5 +1,3 @@ -lua << EOF - -- Setup nvim-cmp. local cmp = require'cmp' @@ -16,7 +14,7 @@ cmp.setup({ vim.fn["UltiSnips#Anon"](args.body) end, }, - mapping = { + mapping = cmp.mapping.preset.insert({ [''] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }), [''] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }), [''] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }), @@ -25,7 +23,7 @@ cmp.setup({ i = cmp.mapping.abort(), c = cmp.mapping.close(), }), - }, + }), sources = cmp.config.sources({ { name = 'nvim_lsp' }, @@ -39,9 +37,9 @@ cmp.setup({ }, { { name = 'buffer', keyword_length = 5, max_item_count = 10, priority = -5 }, }), - experimental = { - native_menu = false - } + --experimental = { + -- native_menu = false + --} }) cmp.setup.cmdline('/', { @@ -53,9 +51,8 @@ cmp.setup.cmdline('/', { cmp.setup.cmdline(':', { sources = { { name = 'cmdline' } - } + }, + mapping = cmp.mapping.preset.cmdline() }) require("cmp_git").setup() - -EOF diff --git a/.config/nvim/after/plugin/treesitter.rc.vim b/.config/nvim/after/plugin/treesitter.rc.lua similarity index 96% rename from .config/nvim/after/plugin/treesitter.rc.vim rename to .config/nvim/after/plugin/treesitter.rc.lua index fe7f4ce..05b5edd 100644 --- a/.config/nvim/after/plugin/treesitter.rc.vim +++ b/.config/nvim/after/plugin/treesitter.rc.lua @@ -1,5 +1,4 @@ -" Tree-sitter configuration -lua <yp (YoinkPostPasteSwapBack) -"nmap yn (YoinkPostPasteSwapForward) -"nmap p (YoinkPaste_p) -"nmap P (YoinkPaste_P) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index dc56c20..aeb9ed3 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -18,10 +18,10 @@ Plug 'p00f/clangd_extensions.nvim' Plug 'RRethy/vim-illuminate' " main one -Plug 'ms-jpq/coq_nvim', {'branch': 'coq'} +"Plug 'ms-jpq/coq_nvim', {'branch': 'coq'} " 9000+ Snippets -Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'} -Plug 'ms-jpq/coq.thirdparty', {'branch': '3p'} +"Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'} +"Plug 'ms-jpq/coq.thirdparty', {'branch': '3p'} "Plug 'dbeniamine/cheat.sh-vim' Plug 'puremourning/vimspector' @@ -66,10 +66,10 @@ Plug 'stevearc/dressing.nvim' Plug 'MunifTanjim/nui.nvim' Plug 'inside/vim-search-pulse' Plug 'wellle/targets.vim' -"Plug 'voldikss/vim-floaterm' "Plug 'kevinhwang91/nvim-hlslens' "Plug 'camspiers/lens.vim' "Plug 'karb94/neoscroll.nvim' +Plug 'numToStr/FTerm.nvim' " }}} " Git integration {{{ @@ -109,7 +109,6 @@ Plug 'vim-airline/vim-airline' | Plug 'vim-airline/vim-airline-themes' Plug 'dylanaraps/wal' "Plug 'tanvirtin/monokai.nvim' Plug 'marko-cerovac/material.nvim' -Plug 'Shatur/neovim-ayu' " }}} " Testing phase {{{ @@ -117,6 +116,7 @@ Plug 'nvim-neorg/neorg' Plug 'jubnzv/virtual-types.nvim' Plug 'folke/which-key.nvim' Plug 'https://gitlab.com/yorickpeterse/nvim-window.git' +Plug 'themercorp/themer.lua' " }}} call plug#end() @@ -146,15 +146,8 @@ set background=dark "Material scheme: "let g:material_style = "deep ocean" "colorscheme material -"Ayu scheme: -colorscheme ayu-dark -lua << EOF --- require('ayu').setup({ --- overrides = { --- IncSearch = { fg = '#ffffff' } --- } --- }) -EOF + +colorscheme themer_catppuccin "highlight MatchParen cterm=underline ctermbg=black ctermfg=NONE "highlight VirtColumn ctermfg=DarkGrey ctermbg=NONE