This commit is contained in:
Adam Jeniski 2023-02-16 13:52:02 -05:00
parent 59e82b9f41
commit f0a20b0a8b
4 changed files with 34 additions and 60 deletions

View File

@ -991,7 +991,7 @@ hide_window_decorations yes
#: The foreground and background colors. #: The foreground and background colors.
background_opacity .7 background_opacity .85
#: The opacity of the background. A number between zero and one, where #: The opacity of the background. A number between zero and one, where
#: one is opaque and zero is fully transparent. This will only work if #: one is opaque and zero is fully transparent. This will only work if

View File

@ -1,52 +1,8 @@
local lsp = require("lsp-zero") local lsp = require('lsp-zero').preset({
name = 'minimal',
lsp.preset("recommended") set_lsp_keymaps = true,
manage_nvim_cmp = true,
lsp.ensure_installed({
'tsserver',
'eslint',
'sumneko_lua',
'rust_analyzer',
})
-- Fix Undefined global 'vim'
lsp.configure('sumneko_lua', {
settings = {
Lua = {
diagnostics = {
globals = { 'vim' }
}
}
}
})
local cmp = require('cmp')
local cmp_select = { behavior = cmp.PreselectMode.None } --cmp.SelectBehavior.Select }
local cmp_mappings = lsp.defaults.cmp_mappings({
['<C-k>'] = cmp.mapping.select_prev_item(cmp_select),
['<C-j>'] = cmp.mapping.select_next_item(cmp_select),
['<CR>'] = cmp.mapping.confirm({ select = true }),
["<C-Space>"] = cmp.mapping.complete(),
})
lsp.setup_nvim_cmp({
mapping = cmp_mappings,
sources = {
{
name = 'conjure'
}
}
})
lsp.set_preferences({
suggest_lsp_servers = false, suggest_lsp_servers = false,
sign_icons = {
error = 'E',
warn = 'W',
hint = 'H',
info = 'I'
}
}) })
lsp.on_attach(function(client, bufnr) lsp.on_attach(function(client, bufnr)
@ -69,8 +25,27 @@ lsp.on_attach(function(client, bufnr)
vim.keymap.set("i", "<C-h>", vim.lsp.buf.signature_help, opts) vim.keymap.set("i", "<C-h>", vim.lsp.buf.signature_help, opts)
end) end)
lsp.setup() lsp.configure('sumneko_lua', {
settings = {
vim.diagnostic.config({ Lua = {
virtual_text = true, diagnostics = {
globals = { 'vim' }
}
}
}
}) })
local cmp = require('cmp')
local cmp_select = { behavior = cmp.SelectBehavior.Select }
lsp.setup_nvim_cmp({
mapping = cmp.mapping.preset.insert({
['<C-Space>'] = cmp.mapping.complete(),
['<C-b>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-k>'] = cmp.mapping.select_prev_item(cmp_select),
['<C-j>'] = cmp.mapping.select_next_item(cmp_select),
['<CR>'] = cmp.mapping.confirm({ select = true }),
}),
})
lsp.setup()

View File

@ -40,7 +40,6 @@ vim.keymap.set("n", "<leader>F", vim.lsp.buf.format)
--vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz") --vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]]) vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
vim.keymap.set("t", "<esc>", "<C-\\><C-n>") vim.keymap.set("t", "<esc>", "<C-\\><C-n>")

2
.config/nvim/lua/ajet/set.lua Normal file → Executable file
View File

@ -8,7 +8,7 @@ vim.opt.softtabstop = 2
vim.opt.shiftwidth = 2 vim.opt.shiftwidth = 2
vim.opt.expandtab = true vim.opt.expandtab = true
vim.opt.foldlevel = 3 vim.opt.foldlevel = 5
vim.opt.foldmethod = "expr" vim.opt.foldmethod = "expr"
vim.opt.foldexpr = "nvim_treesitter#foldexpr()" vim.opt.foldexpr = "nvim_treesitter#foldexpr()"