Little renovations
This commit is contained in:
parent
9b6b27cd1c
commit
ace123f657
14 changed files with 135 additions and 109 deletions
5
lua/config/diagnostics.lua
Normal file
5
lua/config/diagnostics.lua
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
vim.diagnostic.enable(true)
|
||||
vim.diagnostic.config({
|
||||
virtual_text = false,
|
||||
severity_sort = true,
|
||||
})
|
||||
58
lua/config/lsp.lua
Normal file
58
lua/config/lsp.lua
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
vim.lsp.config('lua_ls', {
|
||||
on_init = function(client)
|
||||
if client.workspace_folders then
|
||||
local path = client.workspace_folders[1].name
|
||||
if
|
||||
path ~= vim.fn.stdpath('config')
|
||||
and (vim.uv.fs_stat(path .. '/.luarc.json') or vim.uv.fs_stat(path .. '/.luarc.jsonc'))
|
||||
then
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, {
|
||||
runtime = {
|
||||
-- Tell the language server which version of Lua you're using (most
|
||||
-- likely LuaJIT in the case of Neovim)
|
||||
version = 'LuaJIT',
|
||||
-- Tell the language server how to find Lua modules same way as Neovim
|
||||
-- (see `:h lua-module-load`)
|
||||
path = {
|
||||
'lua/?.lua',
|
||||
'lua/?/init.lua',
|
||||
},
|
||||
},
|
||||
-- Make the server aware of Neovim runtime files
|
||||
workspace = {
|
||||
checkThirdParty = false,
|
||||
library = {
|
||||
vim.env.VIMRUNTIME,
|
||||
-- Depending on the usage, you might want to add additional paths
|
||||
-- here.
|
||||
-- '${3rd}/luv/library',
|
||||
-- '${3rd}/busted/library',
|
||||
},
|
||||
-- Or pull in all of 'runtimepath'.
|
||||
-- NOTE: this is a lot slower and will cause issues when working on
|
||||
-- your own configuration.
|
||||
-- See https://github.com/neovim/nvim-lspconfig/issues/3189
|
||||
-- library = vim.api.nvim_get_runtime_file('', true),
|
||||
},
|
||||
})
|
||||
end,
|
||||
settings = {
|
||||
Lua = {},
|
||||
},
|
||||
})
|
||||
|
||||
vim.lsp.config('rust_analyzer', {
|
||||
settings = {
|
||||
['rust-analyzer'] = {
|
||||
diagnostics = {
|
||||
enable = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
vim.lsp.enable({'clangd','lua_ls','rust_analyzer'})
|
||||
22
lua/config/mappings.lua
Normal file
22
lua/config/mappings.lua
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
---Make string like ':cmd<CR>'
|
||||
---@param cmd string
|
||||
---@return string
|
||||
local function auto(cmd)
|
||||
return string.format(':%s<CR>', cmd)
|
||||
end
|
||||
|
||||
---Make string like '<Leader>cmd'
|
||||
---@param cmd string
|
||||
---@return string
|
||||
local function ld(cmd)
|
||||
return string.format('<Leader>%s', cmd)
|
||||
end
|
||||
|
||||
|
||||
local builtin = require('telescope.builtin')
|
||||
vim.keymap.set('n', ld('ff'), builtin.find_files, { desc = 'Telescope find files' })
|
||||
vim.keymap.set('n', ld('fg'), builtin.live_grep, { desc = 'Telescope live grep' })
|
||||
vim.keymap.set('n', ld('fb'), builtin.buffers, { desc = 'Telescope buffers' })
|
||||
vim.keymap.set('n', ld('fh'), builtin.help_tags, { desc = 'Telescope help tags' })
|
||||
|
||||
vim.keymap.set('n', ld('tt'), auto('Trouble diagnostics toggle'), {desc = 'Toggle diagnostics (Trouble)'})
|
||||
Loading…
Add table
Add a link
Reference in a new issue