From 5feb871a98fc0632f89ff8fa43e42355f8e75584 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Wed, 8 Mar 2023 18:25:14 +0100 Subject: [PATCH] Move lua files for automatic loading --- {lua/conf => after/plugin}/cmp.lua | 1 + .../plugin}/indent-blankline.lua | 0 {lua/conf => after/plugin}/telescope.lua | 0 {lua/conf => after/plugin}/treesitter.lua | 0 {lua/conf => after/plugin}/trouble.lua | 0 init.vim | 6 - lua/my-lsp.lua.orig | 137 ------------------ {lua => plugin}/my-lsp.lua | 0 8 files changed, 1 insertion(+), 143 deletions(-) rename {lua/conf => after/plugin}/cmp.lua (97%) rename {lua/conf => after/plugin}/indent-blankline.lua (100%) rename {lua/conf => after/plugin}/telescope.lua (100%) rename {lua/conf => after/plugin}/treesitter.lua (100%) rename {lua/conf => after/plugin}/trouble.lua (100%) delete mode 100644 lua/my-lsp.lua.orig rename {lua => plugin}/my-lsp.lua (100%) diff --git a/lua/conf/cmp.lua b/after/plugin/cmp.lua similarity index 97% rename from lua/conf/cmp.lua rename to after/plugin/cmp.lua index 71e2a7f..ed891c9 100644 --- a/lua/conf/cmp.lua +++ b/after/plugin/cmp.lua @@ -27,6 +27,7 @@ cmp.setup({ sources = cmp.config.sources({ { name = 'nvim_lsp' }, { name = 'vsnip' }, + { name = "copilot"}, },{ { name = 'buffer' }, --{ name = 'path' }, diff --git a/lua/conf/indent-blankline.lua b/after/plugin/indent-blankline.lua similarity index 100% rename from lua/conf/indent-blankline.lua rename to after/plugin/indent-blankline.lua diff --git a/lua/conf/telescope.lua b/after/plugin/telescope.lua similarity index 100% rename from lua/conf/telescope.lua rename to after/plugin/telescope.lua diff --git a/lua/conf/treesitter.lua b/after/plugin/treesitter.lua similarity index 100% rename from lua/conf/treesitter.lua rename to after/plugin/treesitter.lua diff --git a/lua/conf/trouble.lua b/after/plugin/trouble.lua similarity index 100% rename from lua/conf/trouble.lua rename to after/plugin/trouble.lua diff --git a/init.vim b/init.vim index b5b93e2..fddbedf 100644 --- a/init.vim +++ b/init.vim @@ -187,13 +187,7 @@ let g:signify_vcs_list = [ 'git', 'hg' ] let g:localvimrc_whitelist='/home/crater2150/work/.*' let g:localvimrc_sandbox=0 -lua require("my-lsp") -lua require("conf.cmp") -lua require("conf.trouble") -lua require("conf.treesitter") set foldmethod=expr set foldexpr=nvim_treesitter#foldexpr() set nofoldenable " Disable folding at startup. -lua require("conf.telescope") -lua require("conf.indent-blankline") " vi:foldmethod=marker sw=2 diff --git a/lua/my-lsp.lua.orig b/lua/my-lsp.lua.orig deleted file mode 100644 index ab74b7a..0000000 --- a/lua/my-lsp.lua.orig +++ /dev/null @@ -1,137 +0,0 @@ -<<<<<<< Updated upstream -local lspconfig = require('lspconfig') -local configs = require('lspconfig.configs') -======= -local lsp_status = require('lsp-status') - -lsp_status.register_progress() ->>>>>>> Stashed changes - --- enable snippet support -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities.textDocument.completion.completionItem.snippetSupport = true -capabilities.textDocument.completion.completionItem.resolveSupport = { - properties = { - 'documentation', - 'detail', - 'additionalTextEdits', - } -} -capabilities = vim.tbl_extend('keep', capabilities or {}, lsp_status.capabilities) - --- Use an on_attach function to only map the following keys --- after the language server attaches to the current buffer -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 - 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', 'lua vim.lsp.buf.declaration()', opts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('v', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) - buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.code_action()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) - buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', opts) - buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.diagnostic.set_loclist()', opts) - buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) - - lsp_status.on_attach(client) - - --require'completion'.on_attach(client, bufnr) -end - -local lsp_installer = require("nvim-lsp-installer") -lsp_installer.on_server_ready(function(server) - local opts = {} - -<<<<<<< Updated upstream - -- (optional) Customize the options passed to the server - -- if server.name == "tsserver" then - -- opts.root_dir = function() ... end - -- end -======= -require'lspinstall'.setup() -- important - -local servers = require'lspinstall'.installed_servers() -for _, server in pairs(servers) do - require'lspconfig'[server].setup{ - on_attach = on_attach, - capabilities = capabilities, - } -end ->>>>>>> Stashed changes - - -- This setup() function is exactly the same as lspconfig's setup function. - -- Refer to https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md - server:setup(opts) -end) - -metals_config = require("metals").bare_config() -metals_config.init_options.statusBarProvider = "on" -metals_config.settings = { showImplicitArguments = true } -metals_config.on_attach = on_attach -metals_config.capabilities = capabilities - -vim.cmd [[augroup lsp]] -vim.cmd [[au!]] -vim.cmd [[au FileType scala,sbt lua require("metals").initialize_or_attach(metals_config)]] -vim.cmd [[augroup end]] - --- Use a loop to conveniently call 'setup' on multiple servers and --- map buffer local keybindings when the language server attaches -<<<<<<< Updated upstream -local servers = { "lemminx" } -for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - on_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - } - } -end -======= ---local nvim_lsp = require('lspconfig') ---local servers = { "lemminx" } ---for _, lsp in ipairs(servers) do --- nvim_lsp[lsp].setup { --- on_attach = on_attach, --- capabilities = capabilities, --- flags = { --- debounce_text_changes = 150, --- } --- } ---end ->>>>>>> Stashed changes - -vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( - vim.lsp.diagnostic.on_publish_diagnostics, { - virtual_text = false, - underline = true, - signs = true, - } -) - -vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with( - vim.lsp.handlers.signature_help, { - silent = true, focusable = false - } -) - --- vim.cmd [[autocmd CursorMoved * lua vim.lsp.diagnostic.show_line_diagnostics()]] --- vim.cmd [[autocmd CursorMoved * lua vim.lsp.diagnostic.show_line_diagnostics()]] -vim.cmd [[autocmd CursorHoldI * silent! lua vim.lsp.buf.signature_help()]] -vim.cmd [[autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics({max_width = 100, focusable = false})]] diff --git a/lua/my-lsp.lua b/plugin/my-lsp.lua similarity index 100% rename from lua/my-lsp.lua rename to plugin/my-lsp.lua