clean up
This commit is contained in:
parent
07eb55c2ce
commit
3a078077cb
1 changed files with 26 additions and 20 deletions
|
@ -10,10 +10,21 @@ vim.opt.mouse = "a"
|
||||||
|
|
||||||
vim.cmd("colorscheme habamax")
|
vim.cmd("colorscheme habamax")
|
||||||
|
|
||||||
|
local plugins = {
|
||||||
|
{
|
||||||
|
source = "neovim/nvim-lspconfig",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
source = "hrsh7th/nvim-cmp",
|
||||||
|
depends = { "hrsh7th/cmp-nvim-lsp" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
local servers = {
|
local servers = {
|
||||||
clangd = {}
|
clangd = {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-- Install plugin manager
|
||||||
local mini_path = vim.fn.stdpath("data") .. "/site/pack/deps/start/mini.nvim"
|
local mini_path = vim.fn.stdpath("data") .. "/site/pack/deps/start/mini.nvim"
|
||||||
if not vim.loop.fs_stat(mini_path) then
|
if not vim.loop.fs_stat(mini_path) then
|
||||||
vim.fn.system({
|
vim.fn.system({
|
||||||
|
@ -23,21 +34,14 @@ if not vim.loop.fs_stat(mini_path) then
|
||||||
|
|
||||||
vim.cmd("packadd mini.nvim | helptags ALL")
|
vim.cmd("packadd mini.nvim | helptags ALL")
|
||||||
end
|
end
|
||||||
|
|
||||||
require("mini.deps").setup({ path = { package = path_package } })
|
require("mini.deps").setup({ path = { package = path_package } })
|
||||||
|
|
||||||
local add, now, later = MiniDeps.add, MiniDeps.now, MiniDeps.later
|
-- Install plugins
|
||||||
now(function()
|
for plugin in pairs(plugins) do
|
||||||
add({
|
MiniDeps.add(plugins[plugin])
|
||||||
source = "neovim/nvim-lspconfig",
|
end
|
||||||
})
|
|
||||||
|
|
||||||
add({
|
|
||||||
source = "hrsh7th/nvim-cmp",
|
|
||||||
depends = { "hrsh7th/cmp-nvim-lsp" }
|
|
||||||
})
|
|
||||||
end)
|
|
||||||
|
|
||||||
|
-- Setup completion
|
||||||
local cmp = require("cmp")
|
local cmp = require("cmp")
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
snippet = {
|
snippet = {
|
||||||
|
@ -56,8 +60,9 @@ cmp.setup({
|
||||||
{ name = "buffer" },
|
{ name = "buffer" },
|
||||||
});
|
});
|
||||||
|
|
||||||
local lspconfig = require("lspconfig")
|
-- Setup servers and their configs
|
||||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||||
|
local lspconfig = require("lspconfig")
|
||||||
for server in pairs(servers) do
|
for server in pairs(servers) do
|
||||||
local config = servers[server]
|
local config = servers[server]
|
||||||
config.capabilities = config.capabilities or capabilities
|
config.capabilities = config.capabilities or capabilities
|
||||||
|
@ -65,18 +70,19 @@ for server in pairs(servers) do
|
||||||
lspconfig[server].setup(config)
|
lspconfig[server].setup(config)
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.keymap.set({ 'i', 's' }, '<Tab>', function()
|
-- Binds to jump between snippets
|
||||||
|
vim.keymap.set({ "i", "s" }, "<Tab>", function()
|
||||||
if vim.snippet.active({ direction = 1 }) then
|
if vim.snippet.active({ direction = 1 }) then
|
||||||
return '<Cmd>lua vim.snippet.jump(1)<CR>'
|
return "<Cmd>lua vim.snippet.jump(1)<CR>"
|
||||||
else
|
else
|
||||||
return '<Tab>'
|
return "<Tab>"
|
||||||
end
|
end
|
||||||
end, { expr = true })
|
end, { expr = true })
|
||||||
|
|
||||||
vim.keymap.set({ 'i', 's' }, '<S-Tab>', function()
|
vim.keymap.set({ "i", "s" }, "<S-Tab>", function()
|
||||||
if vim.snippet.active({ direction = 1 }) then
|
if vim.snippet.active({ direction = -1 }) then
|
||||||
return '<Cmd>lua vim.snippet.jump(-1)<CR>'
|
return "<Cmd>lua vim.snippet.jump(-1)<CR>"
|
||||||
else
|
else
|
||||||
return '<Tab>'
|
return "<S-Tab>"
|
||||||
end
|
end
|
||||||
end, { expr = true })
|
end, { expr = true })
|
||||||
|
|
Loading…
Add table
Reference in a new issue