diff options
author | Daniel Weipert <code@drogueronin.de> | 2023-11-06 15:54:24 +0100 |
---|---|---|
committer | Daniel Weipert <code@drogueronin.de> | 2023-11-06 15:54:24 +0100 |
commit | 99ae247eacf35697c607d880675d910fcce90ae3 (patch) | |
tree | c54bd8b42a56c7ad94ff138c69fd85005b02f4ae /.config/nvim/plugins | |
parent | d9f12831186077736fcd9c163a4b31a1fa28690e (diff) |
[nvim] refactor plugins to use lazy.nvim
Diffstat (limited to '.config/nvim/plugins')
-rw-r--r-- | .config/nvim/plugins/_install.vim | 48 | ||||
-rw-r--r-- | .config/nvim/plugins/_load.vim | 11 | ||||
-rw-r--r-- | .config/nvim/plugins/aerial.vim | 28 | ||||
-rw-r--r-- | .config/nvim/plugins/comment.vim | 3 | ||||
-rw-r--r-- | .config/nvim/plugins/diffview.vim | 6 | ||||
-rw-r--r-- | .config/nvim/plugins/gitgutter.vim | 2 | ||||
-rw-r--r-- | .config/nvim/plugins/indent_blankline.vim | 43 | ||||
-rw-r--r-- | .config/nvim/plugins/leap.vim | 3 | ||||
-rw-r--r-- | .config/nvim/plugins/lsp.vim | 91 | ||||
-rw-r--r-- | .config/nvim/plugins/markdown_preview.vim | 3 | ||||
-rw-r--r-- | .config/nvim/plugins/nerdtree.vim | 58 | ||||
-rw-r--r-- | .config/nvim/plugins/telescope.vim | 3 | ||||
-rw-r--r-- | .config/nvim/plugins/treesitter.vim | 18 |
13 files changed, 0 insertions, 317 deletions
diff --git a/.config/nvim/plugins/_install.vim b/.config/nvim/plugins/_install.vim deleted file mode 100644 index f47037c..0000000 --- a/.config/nvim/plugins/_install.vim +++ /dev/null @@ -1,48 +0,0 @@ -call plug#begin(stdpath('data') . '/plugged') - -Plug 'doums/darcula' - -Plug 'ryanoasis/vim-devicons' -Plug 'nvim-tree/nvim-web-devicons' - -Plug 'preservim/nerdtree' -Plug 'Xuyuanp/nerdtree-git-plugin' - -Plug 'nvim-lua/plenary.nvim' -Plug 'nvim-telescope/telescope.nvim' -Plug 'sindrets/diffview.nvim' - -Plug 'airblade/vim-gitgutter' - -Plug 'mg979/vim-xtabline' - -Plug 'ggandor/leap.nvim' - -Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} - -Plug 'lukas-reineke/indent-blankline.nvim' - -Plug 'tpope/vim-surround' - -Plug 'gpanders/editorconfig.nvim' - -Plug 'iamcco/markdown-preview.nvim', {'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']} -" if install fails do `:call mkdp#util#install() manually` - -Plug 'stevearc/aerial.nvim' -Plug 'numToStr/Comment.nvim' - -Plug 'williamboman/mason.nvim' -Plug 'williamboman/mason-lspconfig.nvim' -Plug 'neovim/nvim-lspconfig' -Plug 'hrsh7th/nvim-cmp' -Plug 'hrsh7th/cmp-nvim-lsp' -Plug 'saadparwaiz1/cmp_luasnip' -Plug 'L3MON4D3/LuaSnip' - -Plug 'sheerun/vim-polyglot' - -"Plug 'https://gitlab.com/dweipert.de/rclone.nvim' -Plug '~/Projects/rclone.nvim' - -call plug#end() diff --git a/.config/nvim/plugins/_load.vim b/.config/nvim/plugins/_load.vim deleted file mode 100644 index 4917b89..0000000 --- a/.config/nvim/plugins/_load.vim +++ /dev/null @@ -1,11 +0,0 @@ -source ~/.config/nvim/plugins/aerial.vim -source ~/.config/nvim/plugins/comment.vim -source ~/.config/nvim/plugins/diffview.vim -source ~/.config/nvim/plugins/gitgutter.vim -source ~/.config/nvim/plugins/indent_blankline.vim -source ~/.config/nvim/plugins/leap.vim -source ~/.config/nvim/plugins/lsp.vim -source ~/.config/nvim/plugins/markdown_preview.vim -source ~/.config/nvim/plugins/nerdtree.vim -source ~/.config/nvim/plugins/telescope.vim -source ~/.config/nvim/plugins/treesitter.vim diff --git a/.config/nvim/plugins/aerial.vim b/.config/nvim/plugins/aerial.vim deleted file mode 100644 index 9a6db49..0000000 --- a/.config/nvim/plugins/aerial.vim +++ /dev/null @@ -1,28 +0,0 @@ -lua <<EOF -require('aerial').setup({ - filter_kind = false, -}) - -require('telescope').load_extension('aerial') -EOF - -nnoremap <leader>a <cmd>AerialToggle!<CR> -nnoremap <leader>fa <cmd>Telescope aerial<CR> - -" add aerial to tab switch filetypes -call add(g:NERDTreeStatusLineTabSwitchFiletypes, 'aerial') - -" close Aerial and NERDTree if they are the only remaining windows -function AerialNERDTreeClose() - if winnr('$') != 2 - return - endif - - let window_filetypes = UtilityWinfiletypes() - - if index(window_filetypes, 'aerial') != -1 && index(window_filetypes, 'nerdtree') != -1 - " one quit suffices, since aerial and nerdtree close themselves - quit - endif -endfunction -autocmd BufEnter * call AerialNERDTreeClose() diff --git a/.config/nvim/plugins/comment.vim b/.config/nvim/plugins/comment.vim deleted file mode 100644 index 3b150b6..0000000 --- a/.config/nvim/plugins/comment.vim +++ /dev/null @@ -1,3 +0,0 @@ -lua <<EOF -require('Comment').setup() -EOF diff --git a/.config/nvim/plugins/diffview.vim b/.config/nvim/plugins/diffview.vim deleted file mode 100644 index 4b9d2f0..0000000 --- a/.config/nvim/plugins/diffview.vim +++ /dev/null @@ -1,6 +0,0 @@ -lua <<EOF -require('diffview').setup({}) -EOF - -" close all windows when Diffview is closed -autocmd QuitPre * if &filetype == 'DiffviewFiles' | quitall | endif diff --git a/.config/nvim/plugins/gitgutter.vim b/.config/nvim/plugins/gitgutter.vim deleted file mode 100644 index 5099e57..0000000 --- a/.config/nvim/plugins/gitgutter.vim +++ /dev/null @@ -1,2 +0,0 @@ -nnoremap <leader>gp <cmd>GitGutterPreviewHunk<CR> -nnoremap <leader>gu <cmd>GitGutterUndoHunk<CR> diff --git a/.config/nvim/plugins/indent_blankline.vim b/.config/nvim/plugins/indent_blankline.vim deleted file mode 100644 index 2702b4f..0000000 --- a/.config/nvim/plugins/indent_blankline.vim +++ /dev/null @@ -1,43 +0,0 @@ -lua <<EOF - -local hooks = require('ibl.hooks') - -hooks.register( - hooks.type.WHITESPACE, - hooks.builtin.hide_first_space_indent_level -) - -hooks.register( - hooks.type.WHITESPACE, - hooks.builtin.hide_first_tab_indent_level -) - -hooks.register( - hooks.type.HIGHLIGHT_SETUP, - function() - vim.api.nvim_set_hl(0, 'IndentBlanklineChar', { fg = '#303030', nocombine = true }) - vim.api.nvim_set_hl(0, 'IndentBlanklineContextChar', { fg = '#404040', nocombine = true }) - end -) - - -require('ibl').setup { - indent = { - highlight = { - 'IndentBlanklineChar', - }, - }, - - whitespace = { - remove_blankline_trail = true, - }, - - scope = { - enabled = false, - - highlight = { - 'IndentBlanklineContextChar', - }, - }, -} -EOF diff --git a/.config/nvim/plugins/leap.vim b/.config/nvim/plugins/leap.vim deleted file mode 100644 index be63380..0000000 --- a/.config/nvim/plugins/leap.vim +++ /dev/null @@ -1,3 +0,0 @@ -lua <<EOF -require('leap').add_default_mappings() -EOF diff --git a/.config/nvim/plugins/lsp.vim b/.config/nvim/plugins/lsp.vim deleted file mode 100644 index d0f6f26..0000000 --- a/.config/nvim/plugins/lsp.vim +++ /dev/null @@ -1,91 +0,0 @@ -lua <<EOF -local on_attach = function(client, bufnr) - local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end - local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end - - -- Enable completion triggered by <c-x><c-o> - buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') - - -- Mappings. - local opts = { noremap=true, silent=true } - - -- See :help vim.lsp.* for documentation on any of the below functions - buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts) - buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts) - buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts) - buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts) - buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts) - buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts) - buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts) - buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts) - buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts) - buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) - buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts) - buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts) - buf_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts) - buf_set_keymap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts) - buf_set_keymap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts) - buf_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts) - buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.format({async = true})<CR>', opts) -end - -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) - -vim.o.completeopt = 'menuone,noselect' - -require('mason').setup() -require('mason-lspconfig').setup() -require('mason-lspconfig').setup_handlers { - function (server_name) - require ('lspconfig')[server_name].setup { - on_attach = on_attach, - capabilities = capabilities, - } - end -} - -local cmp = require('cmp') -local luasnip = require('luasnip') -cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = { - ['<C-p>'] = cmp.mapping.select_prev_item(), - ['<C-n>'] = cmp.mapping.select_next_item(), - ['<C-d>'] = cmp.mapping.scroll_docs(-4), - ['<C-f>'] = cmp.mapping.scroll_docs(4), - ['<C-Space>'] = cmp.mapping.complete(), - ['<C-e>'] = cmp.mapping.close(), - ['<CR>'] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }, - ['<Tab>'] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, - ['<S-Tab>'] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, - }, - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - }, -} -EOF diff --git a/.config/nvim/plugins/markdown_preview.vim b/.config/nvim/plugins/markdown_preview.vim deleted file mode 100644 index 03ff94f..0000000 --- a/.config/nvim/plugins/markdown_preview.vim +++ /dev/null @@ -1,3 +0,0 @@ -let g:mkdp_preview_options = { - \ 'disable_sync_scroll': 1 -\ } diff --git a/.config/nvim/plugins/nerdtree.vim b/.config/nvim/plugins/nerdtree.vim deleted file mode 100644 index 7caf768..0000000 --- a/.config/nvim/plugins/nerdtree.vim +++ /dev/null @@ -1,58 +0,0 @@ -let g:NERDTreeShowHidden=1 -let g:NERDTreeGitStatusShowIgnored=1 - -:let g:NERDTreeShowLineNumbers=1 -:autocmd BufEnter NERD_* setlocal rnu - -if !&diff - autocmd StdinReadPre * let s:std_in=1 -endif - -function NERDTreeInit() - if !&diff - let buffer_type = getbufvar(bufnr(), "&filetype") - if index(g:NERDTreeNoInitFiletypes, buffer_type) == -1 - NERDTree - - if argc() > 0 || exists('s:std_in') - wincmd p - endif - - if argc() > 0 - silent NERDTreeFind - wincmd p - endif - endif - endif -endfunction -autocmd VimEnter * call NERDTreeInit() - -autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif -autocmd BufEnter * if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif - -" set status line on tab switch -function NERDTreeStatusLineTabSwitch() - " only when in non-meaningful window - if index(g:NERDTreeStatusLineTabSwitchFiletypes, &filetype) == -1 - return - endif - - let tab_nr = tabpagenr() - let buffer_list = tabpagebuflist(tab_nr) - - " default to 2 - let meaningful_window_nr = 2 - - for buffer_nr in buffer_list - let buffer_type = getbufvar(buffer_nr, "&filetype") - if index(g:NERDTreeStatusLineTabSwitchFiletypes, buffer_type) == -1 - let meaningful_window_nr = bufwinnr(buffer_nr) - break - endif - endfor - - exe meaningful_window_nr .. "wincmd w" -endfunction -autocmd TabLeave * call NERDTreeStatusLineTabSwitch() - -map <C-b> <cmd>NERDTreeToggle<CR> diff --git a/.config/nvim/plugins/telescope.vim b/.config/nvim/plugins/telescope.vim deleted file mode 100644 index 729edad..0000000 --- a/.config/nvim/plugins/telescope.vim +++ /dev/null @@ -1,3 +0,0 @@ -nnoremap <leader>ff <cmd>Telescope find_files<CR> -nnoremap <leader>fg <cmd>Telescope live_grep<CR> -nnoremap <leader><leader> <cmd>Telescope buffers<CR> diff --git a/.config/nvim/plugins/treesitter.vim b/.config/nvim/plugins/treesitter.vim deleted file mode 100644 index b011e36..0000000 --- a/.config/nvim/plugins/treesitter.vim +++ /dev/null @@ -1,18 +0,0 @@ -lua <<EOF -require('nvim-treesitter.configs').setup { - ensure_installed = 'all', - sync_install = false, - indent = { - enable = true, - }, - highlight = { - enable = true, - additional_vim_regex_highlighting = false, - }, -} -EOF - -highlight! link @text.diff.add DiffAdd -highlight! link @text.diff.delete DiffDelete -highlight! link @text.diff.change DiffChange -highlight! link @text.diff.text DiffText |