From 2d2009413f8be624a7cca95cf702e32d9315cbef Mon Sep 17 00:00:00 2001 From: Robert Günzler Date: Fri, 14 Oct 2022 20:57:03 +0200 Subject: vim: move custom modules under internal/ --- .vim/lua/plugins.lua | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to '.vim/lua/plugins.lua') diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua index de7a984..e8630f2 100644 --- a/.vim/lua/plugins.lua +++ b/.vim/lua/plugins.lua @@ -349,7 +349,8 @@ require('packer').startup({function() 'stevearc/aerial.nvim', }, config = function() - require('lsp').setup() + require('telescope').load_extension('lsp_handlers') + require('internal.lsp').setup() end} -- }}} use {'nvim-lua/lsp-status.nvim', -- {{{ @@ -382,7 +383,7 @@ require('packer').startup({function() 'Constant', 'Variable', }, - icons = require('lsp').symbols, + icons = require('internal.lsp').symbols, close_automatic_events = {'switch_buffer'}, open_automatic = function(bufnr) return vim.api.nvim_buf_line_count(bufnr) > 80 @@ -399,7 +400,7 @@ require('packer').startup({function() config = function() local navic = require('nvim-navic') navic.setup { - icons = require('lsp').symbols, + icons = require('internal.lsp').symbols, } end} -- }}} @@ -445,14 +446,15 @@ require('packer').startup({function() -- nls.builtins.formatting.rustfmt, -- nls.builtins.formatting.stylua, }, - on_attach = require('lsp').my_attach, + on_attach = require('internal.lsp').my_attach, } end} -- }}} use {'mfussenegger/nvim-dap', module = {'dap'}, -- {{{ requires = {'nvim-telescope/telescope-dap.nvim'}, config = function() - require('debugger') + require('telescope').load_extension('dap') + require('internal.dap') end} -- }}} use {'hrsh7th/nvim-cmp', -- {{{ @@ -616,7 +618,7 @@ require('packer').startup({function() path = '░ path', buffer = '░ buf', } - item.kind = package.loaded.lsp.symbols[item.kind] or '' + item.kind = require('internal.lsp').symbols[item.kind] or '' item.menu = menus[entry.source.name] return item end, @@ -651,7 +653,7 @@ require('packer').startup({function() use {'L3MON4D3/LuaSnip', -- {{{ config = function() - require('snips') + require('internal.snips') end} -- }}} use {'nvim-telescope/telescope.nvim', --- {{{ @@ -898,7 +900,7 @@ require('packer').startup({function() use {'mickael-menu/zk-nvim', module = {'zk', 'telescope._extensions.zk'}, -- {{{ config = function() - local lsp = require('lsp') + local lsp = require('internal.lsp') require('zk').setup { picker = 'telescope', lsp = { @@ -1154,8 +1156,8 @@ require('packer').startup({function() {type = 'padding', val = 1}, {type = 'group', val = { -- buttons {{{ button('e', '󰈔 new', [[ene startinsert]]), - button('r', '󰈸 live grep', [[lua require('misc').live_grep()]]), - button('f', '󰝰 find files', [[lua require('misc').find_files()]]), + button('r', '󰈸 live grep', [[lua require('internal.misc').live_grep()]]), + button('f', '󰝰 find files', [[lua require('internal.misc').find_files()]]), button('m', '󰥔 mru', [[lua require('telescope.builtin').oldfiles()]]), -- button('o', '󰃶 orgmode', [[lua require('packer').loader('orgmode.nvim'); require('orgmode').action('agenda.prompt')]]), button('T', '󰃶 todos', [[lua require('telescope._extensions.todo-comments').exports.todo {cwd=vim.env.ZK_NOTEBOOK_DIR}]]), @@ -1269,3 +1271,4 @@ config = { if vim.fn.empty(vim.fn.glob(compilepath)) > 0 then require('packer').sync() end + -- cgit 1.4.1