configs/nvim
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update Plugin Config

Browse source
This commit is contained in:
Alexander Gehrke 2024-03-15 15:10:00 +01:00
parent 2a36c3fc7a
commit 2eca6c0d56
8 changed files with 124 additions and 249 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
lua/lsp/installer.lua
View file

@ -1,51 +0,0 @@
local status1, mason = pcall(require, "mason")
local status2, mason_lspconfig = pcall(require, "mason-lspconfig")
if (not (status1 and status2)) then return end
return function(on_attach)
mason.setup {}
mason_lspconfig.setup {
ensure_installed = { 'jdtls', 'lua_ls' }
}
local no_autosetup = {
jdtls = true
}
local extra_config = {
lua_ls = {
on_attach = on_attach,
settings = {
Lua = {
diagnostics = { globals = { 'vim' } },
workspace = {
library = vim.api.nvim_get_runtime_file("", true),
checkThirdParty = false,
},
telemetry = { enable = false },
},
},
},
["pylsp"] = {
on_attach = on_attach,
settings = {
pylsp = {
plugins = {
rope_autoimport = { enabled = true, },
isort = { enabled = true, },
}
}
}
}
}
mason_lspconfig.setup_handlers {
function(server_name)
if (not no_autosetup[server_name]) then
require("lspconfig")[server_name].setup(
extra_config[server_name] or { on_attach = on_attach }
)
end
end,
}
end

53
lua/lsp/metals.lua
View file

@ -1,53 +0,0 @@
local status, metals = pcall(require, "metals")
if (not status) then return function() end end
return function(on_attach)
metals_config = metals.bare_config()
metals_config.init_options.statusBarProvider = "on"
metals_config.settings = {
showImplicitArguments = true,
superMethodLensesEnabled = true,
}
metals_config.on_attach = function(client, bufnr)
require("metals").setup_dap()
on_attach(client, bufnr)
end
metals_config.capabilities = require("cmp_nvim_lsp").default_capabilities()
-- Debug settings if you're using nvim-dap
local dap = require("dap")
dap.configurations.scala = {
{
type = "scala",
request = "launch",
name = "RunOrTest",
metals = {
runType = "runOrTestFile",
--args = { "firstArg", "secondArg", "thirdArg" }, -- here just as an example
},
},
{
type = "scala",
request = "launch",
name = "Test Target",
metals = {
runType = "testTarget",
},
},
}
-- Autocmd that will actually be in charging of starting the whole thing
local nvim_metals_group = vim.api.nvim_create_augroup("nvim-metals", { clear = true })
vim.api.nvim_create_autocmd("FileType", {
-- NOTE: You may or may not want java included here. You will need it if you
-- want basic Java support but it may also conflict if you are using
-- something like nvim-jdtls which also works on a java filetype autocmd.
pattern = { "scala", "sbt" },
callback = function()
require("metals").initialize_or_attach(metals_config)
end,
group = nvim_metals_group,
})
return metals_config
end

13
lua/lsp/typescript.lua
View file

@ -1,13 +0,0 @@
local status, nvim_lsp = pcall(require, "lspconfig")
if (not status) then return function() end end
return function(on_attach)
local protocol = require('vim.lsp.protocol')
-- TypeScript
nvim_lsp.tsserver.setup {
on_attach = on_attach,
filetypes = { "typescript", "typescriptreact", "typescript.tsx" },
cmd = { "typescript-language-server", "--stdio" }
}
end

233
lua/plugins/cmp.lua
View file

@ -1,120 +1,119 @@
return { return {
{ {
"hrsh7th/nvim-cmp", "hrsh7th/nvim-cmp",
-- load cmp on InsertEnter -- load cmp on InsertEnter
event = "InsertEnter", event = "InsertEnter",
-- these dependencies will only be loaded when cmp loads -- these dependencies will only be loaded when cmp loads
-- dependencies are always lazy-loaded unless specified otherwise -- dependencies are always lazy-loaded unless specified otherwise
dependencies = { dependencies = {
"hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-buffer", "hrsh7th/cmp-buffer",
'hrsh7th/cmp-buffer', 'hrsh7th/cmp-path',
'hrsh7th/cmp-path', 'hrsh7th/cmp-cmdline',
'hrsh7th/cmp-cmdline', -- 'hrsh7th/cmp-vsnip',
-- 'hrsh7th/cmp-vsnip', -- 'hrsh7th/vim-vsnip',
-- 'hrsh7th/vim-vsnip', -- 'hrsh7th/vim-vsnip-integ',
-- 'hrsh7th/vim-vsnip-integ', 'L3MON4D3/LuaSnip',
'L3MON4D3/LuaSnip', 'saadparwaiz1/cmp_luasnip',
'saadparwaiz1/cmp_luasnip', 'onsails/lspkind.nvim',
'onsails/lspkind.nvim', {
{ 'zbirenbaum/copilot-cmp',
'zbirenbaum/copilot-cmp', dependencies = { "hrsh7th/nvim-cmp",
dependencies = { "hrsh7th/nvim-cmp", {
{ 'zbirenbaum/copilot.lua',
'zbirenbaum/copilot.lua', opts = {
opts = { suggestion = { enabled = false },
suggestion = { enabled = false }, panel = { enabled = false },
panel = { enabled = false }, filetypes = {
filetypes = { mail = false,
mail = false, text = false,
text = false, }
} }
} },
}, },
}, config = function()
config = function() require("copilot_cmp").setup()
require("copilot_cmp").setup() end
end },
}, },
}, config = function()
config = function() local cmp = require('cmp')
local cmp = require('cmp') local lspkind = require('lspkind')
local lspkind = require('lspkind') local luasnip = require('luasnip')
local luasnip = require('luasnip') local has_words_before = function()
local has_words_before = function() unpack = unpack or table.unpack
unpack = unpack or table.unpack local line, col = unpack(vim.api.nvim_win_get_cursor(0))
local line, col = unpack(vim.api.nvim_win_get_cursor(0)) return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil end
end
cmp.setup({ cmp.setup({
snippet = { snippet = {
expand = function(args) expand = function(args)
--vim.fn["vsnip#anonymous"](args.body) --vim.fn["vsnip#anonymous"](args.body)
require('luasnip').lsp_expand(args.body) require('luasnip').lsp_expand(args.body)
end, end,
}, },
mapping = { mapping = {
['<C-y>'] = cmp.mapping.confirm({ select = true }), ['<C-y>'] = cmp.mapping.confirm({ select = true }),
['<C-b>'] = cmp.mapping.scroll_docs(-4), ['<C-b>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4), ['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete(), ['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.abort(), ['<C-e>'] = cmp.mapping.abort(),
['<C-CR>'] = cmp.mapping.confirm({ ['<C-CR>'] = cmp.mapping.confirm({
behavior = cmp.ConfirmBehavior.Replace, behavior = cmp.ConfirmBehavior.Replace,
select = true, select = true,
}), }),
["<CR>"] = cmp.mapping({ ["<CR>"] = cmp.mapping({
i = function(fallback) i = function(fallback)
if cmp.visible() and cmp.get_active_entry() then if cmp.visible() and cmp.get_active_entry() then
cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false }) cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false })
else else
fallback() fallback()
end end
end, end,
s = cmp.mapping.confirm({ select = true }), s = cmp.mapping.confirm({ select = true }),
c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }),
}), }),
["<Tab>"] = cmp.mapping(function(fallback) ["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_next_item() cmp.select_next_item()
-- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
-- they way you will only jump inside the snippet region -- they way you will only jump inside the snippet region
elseif luasnip.expand_or_jumpable() then elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump() luasnip.expand_or_jump()
elseif has_words_before() then elseif has_words_before() then
cmp.complete() cmp.complete()
else else
fallback() fallback()
end end
end, { "i", "s" }), end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback) ["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_prev_item() cmp.select_prev_item()
elseif luasnip.jumpable(-1) then elseif luasnip.jumpable(-1) then
luasnip.jump(-1) luasnip.jump(-1)
else else
fallback() fallback()
end end
end, { "i", "s" }), end, { "i", "s" }),
}, },
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },
{ name = 'luasnip' }, { name = 'luasnip' },
{ name = "copilot" }, { name = "copilot" },
}, { }, {
{ name = 'buffer' }, { name = 'buffer', option = { keyword_pattern = [[\k\+]] } },
--{ name = 'path' }, --{ name = 'path' },
}), }),
formatting = { formatting = {
format = lspkind.cmp_format({ format = lspkind.cmp_format({
mode = 'symbol_text', -- show only symbol annotations mode = 'symbol_text', -- show only symbol annotations
maxwidth = 80, -- prevent the popup from showing more than provided characters (e.g 50 will not show more than 50 characters) maxwidth = 80, -- prevent the popup from showing more than provided characters (e.g 50 will not show more than 50 characters)
ellipsis_char = '…', -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead (must define maxwidth first) ellipsis_char = '…', -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead (must define maxwidth first)
symbol_map = { Copilot = "" }, symbol_map = { Copilot = "" },
}) })
}, },
}) })
end, end,
}, },
} }

11
lua/plugins/init.lua
View file

@ -2,7 +2,6 @@ return {
"folke/which-key.nvim", "folke/which-key.nvim",
'pbrisbin/vim-mkdir', 'pbrisbin/vim-mkdir',
'fladson/vim-kitty', 'fladson/vim-kitty',
'tpope/vim-repeat', 'tpope/vim-repeat',
'tpope/vim-surround', 'tpope/vim-surround',
'tpope/vim-characterize', 'tpope/vim-characterize',
@ -17,8 +16,6 @@ return {
}, },
-- ii / ai -- ii / ai
'michaeljsmith/vim-indent-object', 'michaeljsmith/vim-indent-object',
{'lewis6991/gitsigns.nvim', config=true},
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
{ 'nvim-telescope/telescope.nvim', { 'nvim-telescope/telescope.nvim',
@ -34,15 +31,9 @@ return {
'folke/trouble.nvim', 'folke/trouble.nvim',
'folke/lsp-colors.nvim', 'folke/lsp-colors.nvim',
'nvim-lua/popup.nvim', 'nvim-lua/popup.nvim',
'junegunn/vim-easy-align', 'junegunn/vim-easy-align',
'machakann/vim-highlightedyank', 'machakann/vim-highlightedyank',
'lambdalisue/suda.vim', 'lambdalisue/suda.vim',
-- git
'lambdalisue/gina.vim',
'gregsexton/gitv',
'gisphm/vim-gitignore',
'sjl/splice.vim',
'jamessan/vim-gnupg', 'jamessan/vim-gnupg',
{'lervag/vimtex', {'lervag/vimtex',
@ -62,5 +53,7 @@ return {
'Glench/Vim-Jinja2-Syntax', 'Glench/Vim-Jinja2-Syntax',
'GEverding/vim-hocon', 'GEverding/vim-hocon',
'nfnty/vim-nftables', 'nfnty/vim-nftables',
'nfnty/vim-nftables',
'Everduin94/nvim-quick-switcher',
} }
-- 'powerman/vim-plugin-AnsiEsc', -- 'powerman/vim-plugin-AnsiEsc',

8
lua/plugins/tabline.lua
View file

@ -13,7 +13,7 @@ return {
tabline = { tabline = {
lualine_a = { 'branch' }, lualine_a = { 'branch' },
lualine_b = {}, lualine_b = {},
lualine_c = { { 'windows', show_filename_only = false, symbols = { modified = " ✏️]", alternate_file = " 🔃", folder = " 📁"} ,}}, lualine_c = { { 'buffers', show_filename_only = false, symbols = { modified = " ✏️]", alternate_file = " 🔃", folder = " 📁"} ,}},
lualine_x = {}, lualine_x = {},
lualine_y = {}, lualine_y = {},
lualine_z = { lualine_z = {
@ -35,16 +35,16 @@ return {
} } } }
}, },
sections = { sections = {
lualine_a = { filename }, lualine_a = { 'filename' },
lualine_b = { 'diff', 'diagnostics' }, lualine_b = { 'diff', 'diagnostics' },
lualine_x = { "require'lsp-status'.status()" }, lualine_x = { "require'lsp-status'.status()" },
lualine_y = { 'filetype' }, lualine_y = { 'filetype' },
lualine_z = { 'searchcount', 'location' } lualine_z = { 'searchcount', 'selectioncount', 'location' }
}, },
inactive_sections = { inactive_sections = {
lualine_a = {}, lualine_a = {},
lualine_b = {}, lualine_b = {},
lualine_c = { filename }, lualine_c = { 'filename' },
lualine_x = { 'location' }, lualine_x = { 'location' },
lualine_y = {}, lualine_y = {},
lualine_z = {} lualine_z = {}

1
lua/plugins/telescope.lua
View file

@ -50,6 +50,5 @@ return {
local telescope = require('telescope') local telescope = require('telescope')
telescope.setup(opts) telescope.setup(opts)
telescope.load_extension('fzf') telescope.load_extension('fzf')
telescope.load_extension('ui-select')
end, end,
} }

3
lua/plugins/ui.lua
View file

@ -1,8 +1,9 @@
return { return {
{ {
'stevearc/dressing.nvim', 'stevearc/dressing.nvim',
enabled = true,
dependencies = { dependencies = {
'nvim-telescope/telescope-ui-select.nvim', --'nvim-telescope/telescope-ui-select.nvim',
}, },
opts = { opts = {
select = { select = {