move scripts, update other things
This commit is contained in:
fbachus committed
1 parent
8be9fe6370
commit
0c79acd431
61 files changed
+2728
-539
No files matched your search
@@ -2,6 +2,7 @@ return {
|
||||
{
|
||||
"mason-org/mason.nvim",
|
||||
lazy = false,
|
||||
-- event = { "UIEnter" },
|
||||
--cmd = { "Mason", "MasonInstall", "MasonUninstall", "MasonUpdate", "MasonUninstallAll", "MasonLog" },
|
||||
opts = {},
|
||||
},
|
||||
@@ -9,7 +10,7 @@ return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
lazy = false,
|
||||
build = ":TSUpdate",
|
||||
event = { "BufRead" },
|
||||
-- event = { "UIEnter" },
|
||||
opts = {
|
||||
sync_install = false,
|
||||
auto_install = true,
|
||||
@@ -28,6 +29,7 @@ return {
|
||||
},
|
||||
ensure_installed = {
|
||||
"bash",
|
||||
-- "dart",
|
||||
"html",
|
||||
"javascript",
|
||||
"gdscript",
|
||||
@@ -43,20 +45,21 @@ return {
|
||||
{
|
||||
"mason-org/mason-lspconfig.nvim",
|
||||
lazy = false,
|
||||
-- events = { "UIEnter" }
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
"rust_analyzer",
|
||||
"ruff",
|
||||
-- "ruff",
|
||||
"biome",
|
||||
--"quick_lint_js",
|
||||
--"eslint",
|
||||
"html",
|
||||
"cssls",
|
||||
"sqls",
|
||||
"hyprls",
|
||||
-- "sqls",
|
||||
-- "hyprls",
|
||||
"lua_ls",
|
||||
-- "pylyzer",
|
||||
"vimls",
|
||||
-- "vimls",
|
||||
"ts_ls",
|
||||
},
|
||||
automatic_enable = { true, rust_analyzer = false },
|
||||
@@ -74,24 +77,30 @@ return {
|
||||
|
||||
-- lua & third party sources -- See https://github.com/ms-jpq/coq.thirdparty
|
||||
-- Need to **configure separately**
|
||||
--{ "ms-jpq/coq.thirdparty", branch = "3p", lazy = false },
|
||||
{ "ms-jpq/coq.thirdparty", branch = "3p", lazy = false },
|
||||
-- - shell repl
|
||||
-- - nvim lua api
|
||||
-- - scientific calculator
|
||||
-- - comment banner
|
||||
-- - etc
|
||||
},
|
||||
opts = {
|
||||
-- inlay_hint = { enabled = true },
|
||||
-- lsp = {
|
||||
-- inlay_hint = { enabled = true },
|
||||
-- },
|
||||
},
|
||||
init = function()
|
||||
vim.g.coq_settings = {
|
||||
auto_start = true, -- if you want to start COQ at startup
|
||||
-- Your COQ settings here
|
||||
display = { statusline = { helo = false } }, -- disable greeting notification
|
||||
}
|
||||
vim.g.coq_settings = {} -- Your COQ settings here
|
||||
|
||||
-- vim.lsp.inlay_hints.enable()
|
||||
end,
|
||||
--coq.nvim: lsp_ensure_capabilities is a no-op in v2. neovim 0.12's vim.lsp.protocol.make_client_capabilities() already covers what v1 used to inject. Drop the wrapping call.
|
||||
---@type vim.lsp.Config
|
||||
config = function()
|
||||
vim.lsp.config(
|
||||
"rust_analyzer",
|
||||
coq.lsp_ensure_capabilities({
|
||||
vim.lsp.protocol.make_client_capabilities({
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
imports = {
|
||||
@@ -109,22 +118,27 @@ return {
|
||||
enable = true,
|
||||
},
|
||||
},
|
||||
-- inlay_hint = { enabled = true },
|
||||
},
|
||||
})
|
||||
)
|
||||
vim.lsp.config("gdscript", coq.lsp_ensure_capabilities({}))
|
||||
|
||||
--vim.lsp.enable({ "lua_ls" })
|
||||
-- vim.lsp.enable("gdscript")
|
||||
-- vim.lsp.enable({ "gdscript" })
|
||||
-- vim.lsp.enable({ "lua_ls" })
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
group = vim.api.nvim_create_augroup("UserLspConfig", {}),
|
||||
callback = function(ev)
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
vim.bo[ev.buf].omnifunc = "v:lua.vim.lsp.omnifunc"
|
||||
-- vim.o[ev.buf].omnifunc = vim.lsp.omnifunc -- TODO: fix this
|
||||
-- vim.o.omnifunc.set(vim.lsp.omnifunc)
|
||||
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev)
|
||||
vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
|
||||
vim.keymap.set("n", "<leader>le", vim.diagnostic.open_float)
|
||||
-- vim.keymap.set("n", "<leader>lh", vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()))
|
||||
vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts)
|
||||
vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
|
||||
vim.keymap.set("n", "gi", vim.lsp.buf.incoming_calls, opts)
|
||||
vim.keymap.set("n", "go", vim.lsp.buf.outgoing_calls, opts)
|
||||
vim.keymap.set("n", "<leader>K", vim.lsp.buf.hover, opts)
|
||||
vim.keymap.set("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, opts)
|
||||
vim.keymap.set("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, opts)
|
||||
@@ -132,6 +146,13 @@ return {
|
||||
end,
|
||||
})
|
||||
end,
|
||||
-- keys = {
|
||||
-- {
|
||||
-- "<leader>lh",
|
||||
-- function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) end,
|
||||
-- desc = "toggle inlay hints",
|
||||
-- },
|
||||
-- },
|
||||
},
|
||||
{
|
||||
"mfussenegger/nvim-lint",
|
||||
@@ -140,6 +161,7 @@ return {
|
||||
opts = {
|
||||
linters_by_ft = {
|
||||
cpp = { "cpplint" },
|
||||
dart = { "flutter" },
|
||||
gdscript = { "gdlint" },
|
||||
gitcommit = { "commitlint" },
|
||||
lua = { "ast-grep" },
|
||||
@@ -162,17 +184,17 @@ return {
|
||||
-- supposedly faster formatter
|
||||
{
|
||||
"stevearc/conform.nvim",
|
||||
event = { "BufWritePost" },
|
||||
event = { "BufWritePre" },
|
||||
keys = {
|
||||
{
|
||||
"<leader>i",
|
||||
function() require("conform").format({ async = true }) end,
|
||||
--function() require("conform").format({ async = true }) end,
|
||||
desc = "Auto format file with formatter, also on F3",
|
||||
},
|
||||
{
|
||||
"F3",
|
||||
function() require("conform").format({ async = true }) end,
|
||||
mode = { "n", "i" },
|
||||
--function() require("conform").format({ async = true }) end,
|
||||
--mode = { "n", "i" },
|
||||
desc = "Auto format file with formatter",
|
||||
},
|
||||
},
|
||||
@@ -224,10 +246,11 @@ return {
|
||||
end,
|
||||
},
|
||||
},
|
||||
{ "nvim-treesitter/nvim-treesitter-textobjects", lazy = true, event = "BufRead" },
|
||||
-- { "nvim-treesitter/nvim-treesitter-textobjects", lazy = true, event = "BufRead" },
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter-context",
|
||||
lazy = true,
|
||||
branch = "master",
|
||||
event = "BufRead",
|
||||
opts = {
|
||||
enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
|
||||
@@ -246,7 +269,17 @@ return {
|
||||
},
|
||||
},
|
||||
{
|
||||
"jubnzv/virtual-types.nvim",
|
||||
"nvim-flutter/flutter-tools.nvim",
|
||||
lazy = false,
|
||||
--event = { "BufEnter" },
|
||||
--ft = "*.dart",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
},
|
||||
config = true,
|
||||
},
|
||||
-- {
|
||||
-- "jubnzv/virtual-types.nvim",
|
||||
-- lazy = false,
|
||||
-- },
|
||||
}
|
||||
Reference in new issue
Block a user