Nvim: remove coq and other config files

2022-04-19 23:01:31 +02:00
parent 47ef520e56
commit 8ae7046f3f
11 changed files with 46 additions and 187 deletions
--- a/.config/nvim/after/plugin/alternate.rc.vim
+++ b/.config/nvim/after/plugin/alternate.rc.vim
@@ -1 +0,0 @@
-nnoremap <F6> :silent FSHere<CR>
--- a/.config/nvim/after/plugin/context.rc.lua
+++ 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
--- a/.config/nvim/after/plugin/defx.rc.vim
+++ b/.config/nvim/after/plugin/defx.rc.vim
@@ -1,67 +0,0 @@
-"nnoremap <leader>d <cmd>Defx `escape(expand('%:p:h'), ' :')` -search=`expand('%:p')` -split=vertical -winwidth=50 -direction=topleft<CR>
-"
-"autocmd FileType defx call s:defx_my_settings()
-"function! s:defx_my_settings() abort
-"  " Define mappings
-"  nnoremap <silent><buffer><expr> <CR>
-"        \ defx#do_action('drop') " instead of open
-"  nnoremap <silent><buffer><expr> c
-"        \ defx#do_action('copy')
-"  nnoremap <silent><buffer><expr> m
-"        \ defx#do_action('move')
-"  nnoremap <silent><buffer><expr> p
-"        \ defx#do_action('paste')
-"  nnoremap <silent><buffer><expr> l
-"        \ defx#do_action('drop')
-"  nnoremap <silent><buffer><expr> E
-"        \ defx#do_action('open', 'vsplit')
-"  nnoremap <silent><buffer><expr> P
-"        \ defx#do_action('preview')
-"  nnoremap <silent><buffer><expr> o
-"        \ defx#do_action('open_tree', 'toggle')
-"  nnoremap <silent><buffer><expr> K
-"        \ defx#do_action('new_directory')
-"  nnoremap <silent><buffer><expr> N
-"        \ defx#do_action('new_file')
-"  nnoremap <silent><buffer><expr> M
-"        \ defx#do_action('new_multiple_files')
-"  nnoremap <silent><buffer><expr> C
-"        \ defx#do_action('toggle_columns',
-"        \                'mark:indent:icon:filename:type:size:time')
-"  nnoremap <silent><buffer><expr> S
-"        \ defx#do_action('toggle_sort', 'time')
-"  nnoremap <silent><buffer><expr> d
-"        \ defx#do_action('remove')
-"  nnoremap <silent><buffer><expr> r
-"        \ defx#do_action('rename')
-"  nnoremap <silent><buffer><expr> !
-"        \ defx#do_action('execute_command')
-"  nnoremap <silent><buffer><expr> x
-"        \ defx#do_action('execute_system')
-"  nnoremap <silent><buffer><expr> yy
-"        \ defx#do_action('yank_path')
-"  nnoremap <silent><buffer><expr> .
-"        \ defx#do_action('toggle_ignored_files')
-"  nnoremap <silent><buffer><expr> ;
-"        \ defx#do_action('repeat')
-"  nnoremap <silent><buffer><expr> h
-"        \ defx#do_action('cd', ['..'])
-"  nnoremap <silent><buffer><expr> ~
-"        \ defx#do_action('cd')
-"  nnoremap <silent><buffer><expr> q
-"        \ defx#do_action('quit')
-"  nnoremap <silent><buffer><expr> <Space>
-"        \ defx#do_action('toggle_select') . 'j'
-"  nnoremap <silent><buffer><expr> *
-"        \ defx#do_action('toggle_select_all')
-"  nnoremap <silent><buffer><expr> j
-"        \ line('.') == line('$') ? 'gg' : 'j'
-"  nnoremap <silent><buffer><expr> k
-"        \ line('.') == 1 ? 'G' : 'k'
-"  nnoremap <silent><buffer><expr> <C-l>
-"        \ defx#do_action('redraw')
-"  nnoremap <silent><buffer><expr> <C-g>
-"        \ defx#do_action('print')
-"  nnoremap <silent><buffer><expr> cd
-"        \ defx#do_action('change_vim_cwd')
-"endfunction
--- a/.config/nvim/after/plugin/fzf.rc.vim
+++ b/.config/nvim/after/plugin/fzf.rc.vim
@@ -1,10 +0,0 @@
-"nnoremap <leader>a :Rg! <C-R><C-W><CR>
-"nnoremap <leader>A :Rg!<space>
-"nnoremap <leader>b :Buffers!<CR>
-"nnoremap <leader>c :Commands!<CR>
-"nnoremap <leader>g :Commits!<CR>
-"nnoremap <leader>f :Files!<CR>
-"nnoremap <leader>H :History/<CR>
-"nnoremap <leader>H :History!<CR>
-"nnoremap <leader>l :Lines!<CR>
-"inoremap <leader>s <ESC>:Snippets!<CR>
--- a/.config/nvim/after/plugin/indent.rc.vim
+++ b/.config/nvim/after/plugin/indent.rc.vim
@@ -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
--- 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', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<F6>', '<cmd>ClangdSwitchSourceHeader<cr>', 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({
+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,8 +118,7 @@ clangd_extensions.setup({
 --   )
 -- )

-nvim_lsp.pylsp.setup(
-  coq.lsp_ensure_capabilities({
+nvim_lsp.pylsp.setup({
  settings = {
    pylint = {
      enabled = false
@@ -143,22 +134,18 @@ nvim_lsp.pylsp.setup(
  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({
+  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
--- a/.config/nvim/after/plugin/nerdtree.rc.vim
+++ b/.config/nvim/after/plugin/nerdtree.rc.vim
@@ -1,3 +0,0 @@
-" Mapping to NERDTree
-"nnoremap <leader>t :NERDTreeToggle<CR>
-"let NERDTreeIgnore=['\~$', '\.pyc$']
--- a/.config/nvim/after/plugin/nvim-cmp.rc.lua
+++ 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({
        ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
        ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
        ['<C-Space>'] = 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
--- a/.config/nvim/after/plugin/treesitter.rc.lua
+++ b/.config/nvim/after/plugin/treesitter.rc.lua
@@ -1,5 +1,4 @@
-" Tree-sitter configuration
-lua <<EOF
+-- Tree-sitter configuration

 ts = require'nvim-treesitter.configs'

@@ -57,5 +56,3 @@ ts.setup {
 }
 --vim.opt.foldmethod = "expr"
 --vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-
-EOF
--- a/.config/nvim/after/plugin/yoink.rc.vim
+++ b/.config/nvim/after/plugin/yoink.rc.vim
@@ -1,5 +0,0 @@
-" yoink configuration
-"nmap <leader>yp <plug>(YoinkPostPasteSwapBack)
-"nmap <leader>yn <plug>(YoinkPostPasteSwapForward)
-"nmap p <plug>(YoinkPaste_p)
-"nmap P <plug>(YoinkPaste_P)
--- 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