1
0
Fork 0

more nvim config

This commit is contained in:
Arthur Khachaturov 2024-08-25 16:40:36 +03:00
parent 4ecc5566b4
commit 6d6e894f53
No known key found for this signature in database
GPG key ID: CAC2B7EB6DF45D55
14 changed files with 107 additions and 120 deletions

View file

@ -1,3 +1,4 @@
-- Set proper tabstop for go
vim.api.nvim_create_autocmd('FileType', {
pattern = "go",
command = "setlocal tabstop=4",

View file

@ -1,73 +0,0 @@
require('mason').setup()
require('mason-lspconfig').setup()
local mason_lspconfig = require('mason-lspconfig')
local on_attach = function(_, bufnr)
local nmap = function(keys, func, desc)
if desc then
desc = 'LSP: ' .. desc
end
vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
end
nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
nmap('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
nmap('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
nmap("<leader>i", vim.diagnostic.open_float)
nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-- nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-- See `:help K` for why this keymap
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
-- Lesser used LSP functionality
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-- nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
-- nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
-- nmap('<leader>wl', function()
-- print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-- end, '[W]orkspace [L]ist Folders')
-- require("config.lsp.keybinds").init_keymap(bufnr)
vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
vim.lsp.buf.format()
end, { desc = 'Format current buffer with LSP' })
end
local servers = {
ansiblels = {},
clangd = {},
pyright = {},
lua_ls = require("config.lsp.lua_ls"),
gopls = {},
rust_analyzer = {},
cmake = {},
bashls = {},
hls = {}
}
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
mason_lspconfig.setup({
ensure_installed = vim.tbl_keys(servers),
})
mason_lspconfig.setup_handlers {
function(server_name)
require('lspconfig')[server_name].setup {
capabilities = capabilities,
on_attach = on_attach,
settings = servers[server_name],
filetypes = (servers[server_name] or {}).filetypes,
}
end,
}

View file

@ -1,8 +0,0 @@
require('neodev').setup()
return {
Lua = {
workspace = { checkThirdParty = false },
telemetry = { enable = false },
},
}

View file

@ -6,9 +6,6 @@ map({ 'n', 'v' }, 'H', '<NOP>')
map({ 'n', 'v' }, 'L', '<NOP>')
map({ 'n', 'v' }, '<C-Space>', '<NOP>')
-- Yes...
map({ 'n', 'v' }, 'q:', ':q')
-- Movement between buffers
map({ 'n', 'v' }, '<A-u>', ':bp<CR>', { silent = true })
map({ 'n', 'v' }, '<A-i>', ':bn<CR>', { silent = true })
@ -21,8 +18,7 @@ map({ 'n', 'v' }, 'j', 'v:count == 0 ? "gj" : "j"', { expr = true, silent = true
map('n', '<C-q>', function() require('utils.close_buffer').close_buffer() end)
-- Copy and paste from clipboard
map('n', '<leader>y', '"+yy<ESC>')
map('v', '<leader>y', '"+y<ESC>')
map({ 'n', 'v' }, '<leader>y', '"+y')
map({ 'n', 'v' }, '<leader>p', '"+p<ESC>')
map({ 'n', 'v' }, '<leader>P', '"+P<ESC>')
@ -35,7 +31,5 @@ map({ 'n', 'v' }, '<leader>M', '<C-w>6+')
-- Remap <M-BS> to remove last word
map('i', '<M-BS>', '<C-w>')
map('n', '<leader>F', function() vim.lsp.buf.format() end)
map('n', '<C-M-k>', ':m-2<CR>', { silent = true })
map('n', '<C-M-j>', ':m+1<CR>', { silent = true })

View file

@ -21,7 +21,7 @@ vim.o.softtabstop = -1
-- Save undo history
vim.o.undofile = true
-- Case-insensitive searching UNLESS \C or capital in search
-- Case-insensitive searching
vim.o.ignorecase = true
vim.o.smartcase = true
@ -32,8 +32,5 @@ vim.wo.signcolumn = 'yes'
vim.o.updatetime = 250
vim.o.timeoutlen = 300
-- Enable TrueColor
vim.o.termguicolors = true
vim.o.splitbelow = true
vim.o.splitright = true