fix: nvim treesitter error, add hyperland lock keybind and some other cosmetic settings
This commit is contained in:
@@ -1,54 +1,54 @@
|
||||
return {
|
||||
"mason-org/mason-lspconfig.nvim",
|
||||
dependencies = {
|
||||
{"mason-org/mason.nvim"},
|
||||
{'neovim/nvim-lspconfig'},
|
||||
dependencies = {
|
||||
{"mason-org/mason.nvim"},
|
||||
{'neovim/nvim-lspconfig'},
|
||||
|
||||
{'nvim-mini/mini.nvim'},
|
||||
{'nvim-mini/mini.nvim'},
|
||||
{'nvim-mini/mini.completion'},
|
||||
},
|
||||
config = function()
|
||||
require("mason").setup()
|
||||
},
|
||||
config = function()
|
||||
require("mason").setup()
|
||||
require("mason-lspconfig").setup {}
|
||||
|
||||
-- NOTE: this is meant to be backwards compatible with Neovim v0.9
|
||||
---
|
||||
-- Autocompletion
|
||||
---
|
||||
|
||||
require('mini.snippets').setup()
|
||||
require('mini.completion').setup()
|
||||
-- NOTE: this is meant to be backwards compatible with Neovim v0.9
|
||||
---
|
||||
-- Autocompletion
|
||||
---
|
||||
|
||||
---
|
||||
-- Language server configuration
|
||||
---
|
||||
--require('mini.snippets').setup()
|
||||
require('mini.completion').setup()
|
||||
|
||||
-- These keymaps are the defaults in Neovim v0.10
|
||||
if vim.fn.has('nvim-0.11') == 0 then
|
||||
-- NOTE: vim.diagnostic.goto_* methods are deprecated in v0.11
|
||||
-- that's why we put these under a conditional block
|
||||
vim.keymap.set('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
|
||||
vim.keymap.set('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
|
||||
vim.keymap.set('n', '<C-w>d', '<cmd>lua vim.diagnostic.open_float()<cr>')
|
||||
vim.keymap.set('n', '<C-w><C-d>', '<cmd>lua vim.diagnostic.open_float()<cr>')
|
||||
end
|
||||
---
|
||||
-- Language server configuration
|
||||
---
|
||||
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
callback = function(event)
|
||||
local bufmap = function(mode, rhs, lhs)
|
||||
vim.keymap.set(mode, rhs, lhs, {buffer = event.buf})
|
||||
end
|
||||
-- These keymaps are the defaults in Neovim v0.10
|
||||
if vim.fn.has('nvim-0.11') == 0 then
|
||||
-- NOTE: vim.diagnostic.goto_* methods are deprecated in v0.11
|
||||
-- that's why we put these under a conditional block
|
||||
vim.keymap.set('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
|
||||
vim.keymap.set('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<cr>')
|
||||
vim.keymap.set('n', '<C-w>d', '<cmd>lua vim.diagnostic.open_float()<cr>')
|
||||
vim.keymap.set('n', '<C-w><C-d>', '<cmd>lua vim.diagnostic.open_float()<cr>')
|
||||
end
|
||||
|
||||
-- These keymaps are the defaults in Neovim v0.11
|
||||
bufmap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
|
||||
bufmap('n', 'grr', '<cmd>lua vim.lsp.buf.references()<cr>')
|
||||
bufmap('n', 'gri', '<cmd>lua vim.lsp.buf.implementation()<cr>')
|
||||
bufmap('n', 'grn', '<cmd>lua vim.lsp.buf.rename()<cr>')
|
||||
bufmap('n', 'gra', '<cmd>lua vim.lsp.buf.code_action()<cr>')
|
||||
bufmap('n', 'gO', '<cmd>lua vim.lsp.buf.document_symbol()<cr>')
|
||||
bufmap({'i', 's'}, '<C-s>', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
|
||||
end,
|
||||
})
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
callback = function(event)
|
||||
local bufmap = function(mode, rhs, lhs)
|
||||
vim.keymap.set(mode, rhs, lhs, {buffer = event.buf})
|
||||
end
|
||||
|
||||
-- These keymaps are the defaults in Neovim v0.11
|
||||
bufmap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
|
||||
bufmap('n', 'grr', '<cmd>lua vim.lsp.buf.references()<cr>')
|
||||
bufmap('n', 'gri', '<cmd>lua vim.lsp.buf.implementation()<cr>')
|
||||
bufmap('n', 'grn', '<cmd>lua vim.lsp.buf.rename()<cr>')
|
||||
bufmap('n', 'gra', '<cmd>lua vim.lsp.buf.code_action()<cr>')
|
||||
bufmap('n', 'gO', '<cmd>lua vim.lsp.buf.document_symbol()<cr>')
|
||||
bufmap({'i', 's'}, '<C-s>', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
|
||||
end,
|
||||
})
|
||||
|
||||
end
|
||||
}
|
||||
|
||||
@@ -2,45 +2,48 @@ return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate",
|
||||
config = function()
|
||||
require("nvim-treesitter.configs").setup {
|
||||
-- A list of parser names, or "all" (the five listed parsers should always be installed)
|
||||
ensure_installed = { "c", "lua", "vim", "vimdoc", "python", "bash", "make" },
|
||||
require("nvim-treesitter").install({})
|
||||
|
||||
-- Install parsers synchronously (only applied to `ensure_installed`)
|
||||
sync_install = false,
|
||||
--require("nvim-treesitter.configs").setup ({
|
||||
-- -- A list of parser names, or "all" (the five listed parsers should always be installed)
|
||||
-- ensure_installed = { "c", "lua", "vim", "vimdoc", "python", "bash", "make" },
|
||||
|
||||
-- Automatically install missing parsers when entering buffer
|
||||
-- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
|
||||
auto_install = true,
|
||||
-- -- Install parsers synchronously (only applied to `ensure_installed`)
|
||||
-- sync_install = false,
|
||||
|
||||
-- List of parsers to ignore installing (for "all")
|
||||
ignore_install = { "javascript" },
|
||||
-- -- Automatically install missing parsers when entering buffer
|
||||
-- -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
|
||||
-- auto_install = true,
|
||||
|
||||
---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
|
||||
-- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
|
||||
-- -- List of parsers to ignore installing (for "all")
|
||||
-- ignore_install = { "javascript" },
|
||||
|
||||
highlight = {
|
||||
enable = true,
|
||||
-- ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
|
||||
-- -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
|
||||
|
||||
-- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
|
||||
-- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
|
||||
-- the name of the parser)
|
||||
-- list of language that will be disabled
|
||||
-- disable = { "c", "rust" },
|
||||
-- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
|
||||
disable = function(lang, buf)
|
||||
local max_filesize = 100 * 1024 -- 100 KB
|
||||
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
||||
if ok and stats and stats.size > max_filesize then
|
||||
return true
|
||||
end
|
||||
end,
|
||||
-- highlight = {
|
||||
-- enable = true,
|
||||
|
||||
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
|
||||
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
||||
-- Using this option may slow down your editor, and you may see some duplicate highlights.
|
||||
-- Instead of true it can also be a list of languages
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
}
|
||||
end }
|
||||
-- -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
|
||||
-- -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
|
||||
-- -- the name of the parser)
|
||||
-- -- list of language that will be disabled
|
||||
-- -- disable = { "c", "rust" },
|
||||
-- -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
|
||||
-- disable = function(lang, buf)
|
||||
-- local max_filesize = 100 * 1024 -- 100 KB
|
||||
-- local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
||||
-- if ok and stats and stats.size > max_filesize then
|
||||
-- return true
|
||||
-- end
|
||||
-- end,
|
||||
|
||||
-- -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
|
||||
-- -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
||||
-- -- Using this option may slow down your editor, and you may see some duplicate highlights.
|
||||
-- -- Instead of true it can also be a list of languages
|
||||
-- additional_vim_regex_highlighting = false,
|
||||
-- },
|
||||
--})
|
||||
end
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user