stuff and things
This commit is contained in:
Christian Nieves
@ -1,6 +1,6 @@
|
|||||||
[font]
|
[font]
|
||||||
size = 12
|
size = 14
|
||||||
normal = { family = "ComicCodeLigatures Nerd Font Light" }
|
normal = { family = "CommitMono Nerd Font" }
|
||||||
|
|
||||||
[window]
|
[window]
|
||||||
option_as_alt = "OnlyLeft"
|
option_as_alt = "OnlyLeft"
|
||||||
|
|||||||
@ -1,14 +1,15 @@
|
|||||||
vim.cmd("source " .. vim.env.HOME .. "/.vimrc")
|
vim.cmd("source " .. vim.env.HOME .. "/.vimrc")
|
||||||
|
|
||||||
|
vim.g.maplocalleader = ","
|
||||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||||
if not vim.loop.fs_stat(lazypath) then
|
if not vim.loop.fs_stat(lazypath) then
|
||||||
vim.fn.system({
|
vim.fn.system({
|
||||||
"git",
|
"git",
|
||||||
"clone",
|
"clone",
|
||||||
"--filter=blob:none",
|
"--filter=blob:none",
|
||||||
"https://github.com/folke/lazy.nvim.git",
|
"https://github.com/folke/lazy.nvim.git",
|
||||||
lazypath,
|
lazypath,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
vim.opt.rtp:prepend(lazypath)
|
vim.opt.rtp:prepend(lazypath)
|
||||||
vim.opt.rtp:prepend(vim.env.HOME .. "/.vim")
|
vim.opt.rtp:prepend(vim.env.HOME .. "/.vim")
|
||||||
@ -21,16 +22,16 @@ require("config.tmpl")
|
|||||||
require("config.zip")
|
require("config.zip")
|
||||||
|
|
||||||
require("lazy").setup({
|
require("lazy").setup({
|
||||||
-- this entry tells lazy.nvim to load the list of of *.lua files from plugins/
|
-- this entry tells lazy.nvim to load the list of of *.lua files from plugins/
|
||||||
import = "plugins" ,
|
import = "plugins",
|
||||||
-- Dev configuration
|
-- Dev configuration
|
||||||
dev = {
|
dev = {
|
||||||
-- Directory where you store your local plugin projects
|
-- Directory where you store your local plugin projects
|
||||||
path = "~/neovim-plugins/squk/",
|
path = "~/neovim-plugins/squk/",
|
||||||
-- @type string[] plugins that match these patterns will use your local versions instead of being fetched from GitHub
|
-- @type string[] plugins that match these patterns will use your local versions instead of being fetched from GitHub
|
||||||
patterns = { "squk" },
|
patterns = { "squk" },
|
||||||
fallback = false, -- Fallback to git when local plugin doesn't exist
|
fallback = false, -- Fallback to git when local plugin doesn't exist
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.opt.undodir = vim.fn.expand("$HOME") .. "/.undo/"
|
vim.opt.undodir = vim.fn.expand("$HOME") .. "/.undo/"
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }
|
"lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" }
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,165 +1,154 @@
|
|||||||
local use_google = require("utils").use_google
|
local use_google = require("utils").use_google
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"sindrets/diffview.nvim",
|
{
|
||||||
--{ "mizlan/iswap.nvim", event = "VeryLazy" },
|
"adelarsq/image_preview.nvim",
|
||||||
{ "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
|
event = "VeryLazy",
|
||||||
{
|
config = function()
|
||||||
"folke/flash.nvim",
|
require("image_preview").setup()
|
||||||
event = "VeryLazy",
|
end,
|
||||||
---@type Flash.Config
|
},
|
||||||
opts = {
|
"sindrets/diffview.nvim",
|
||||||
jump = {
|
--{ "mizlan/iswap.nvim", event = "VeryLazy" },
|
||||||
nohlsearch = true,
|
{ "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
|
||||||
},
|
{
|
||||||
},
|
"MagicDuck/grug-far.nvim",
|
||||||
-- stylua: ignore
|
config = function()
|
||||||
keys = {
|
require("grug-far").setup({
|
||||||
{ "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
|
-- search and replace engines configuration
|
||||||
{ "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
|
engines = {
|
||||||
{ "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
|
-- see https://github.com/BurntSushi/ripgrep
|
||||||
{ "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
|
ripgrep = {
|
||||||
{ "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
|
-- ripgrep executable to use, can be a different path if you need to configure
|
||||||
},
|
path = "rg",
|
||||||
},
|
-- extraArgs = "-.",
|
||||||
{
|
},
|
||||||
"MagicDuck/grug-far.nvim",
|
},
|
||||||
config = function()
|
})
|
||||||
require("grug-far").setup({
|
end,
|
||||||
-- search and replace engines configuration
|
},
|
||||||
engines = {
|
|
||||||
-- see https://github.com/BurntSushi/ripgrep
|
|
||||||
ripgrep = {
|
|
||||||
-- ripgrep executable to use, can be a different path if you need to configure
|
|
||||||
path = "rg",
|
|
||||||
-- extraArgs = "-.",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"shellRaining/hlchunk.nvim",
|
"shellRaining/hlchunk.nvim",
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
opts = {
|
opts = {
|
||||||
line_num = { enable = true },
|
line_num = { enable = true },
|
||||||
chunk = {
|
chunk = {
|
||||||
enable = true,
|
enable = true,
|
||||||
priority = 15,
|
priority = 15,
|
||||||
style = {
|
style = {
|
||||||
{ fg = "#393d4c" },
|
{ fg = "#393d4c" },
|
||||||
},
|
},
|
||||||
chars = {
|
chars = {
|
||||||
horizontal_line = "─",
|
horizontal_line = "─",
|
||||||
-- vertical_line = "│",
|
-- vertical_line = "│",
|
||||||
vertical_line = "┊",
|
vertical_line = "┊",
|
||||||
left_top = "╭",
|
left_top = "╭",
|
||||||
left_bottom = "╰",
|
left_bottom = "╰",
|
||||||
right_arrow = ">",
|
right_arrow = ">",
|
||||||
},
|
},
|
||||||
use_treesitter = true,
|
use_treesitter = true,
|
||||||
textobject = "",
|
textobject = "",
|
||||||
max_file_size = 1024 * 1024,
|
max_file_size = 1024 * 1024,
|
||||||
error_sign = true,
|
error_sign = true,
|
||||||
-- animation related
|
-- animation related
|
||||||
duration = 0,
|
duration = 0,
|
||||||
delay = 0,
|
delay = 0,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"RRethy/vim-illuminate",
|
"RRethy/vim-illuminate",
|
||||||
"kdheepak/lazygit.nvim",
|
"kdheepak/lazygit.nvim",
|
||||||
"flwyd/vim-conjoin",
|
"flwyd/vim-conjoin",
|
||||||
"rafcamlet/nvim-luapad",
|
"rafcamlet/nvim-luapad",
|
||||||
"vim-scripts/vcscommand.vim",
|
"vim-scripts/vcscommand.vim",
|
||||||
"AndrewRadev/tagalong.vim",
|
"AndrewRadev/tagalong.vim",
|
||||||
"AndrewRadev/yankwin.vim",
|
"AndrewRadev/yankwin.vim",
|
||||||
{ "squk/gdrama-syntax.vim", ft = "gdrama" },
|
{ "squk/gdrama-syntax.vim", ft = "gdrama" },
|
||||||
{ "nvim-lua/plenary.nvim", lazy = false },
|
{ "nvim-lua/plenary.nvim", lazy = false },
|
||||||
{ "squk/java-syntax.vim", ft = "java" },
|
{ "squk/java-syntax.vim", ft = "java" },
|
||||||
{ "udalov/kotlin-vim", event = "VeryLazy", ft = "kotlin" },
|
{ "udalov/kotlin-vim", event = "VeryLazy", ft = "kotlin" },
|
||||||
{ "andymass/vim-matchup", event = "VimEnter" },
|
{ "andymass/vim-matchup", event = "VimEnter" },
|
||||||
{ "jghauser/mkdir.nvim", event = "BufWritePre" },
|
{ "jghauser/mkdir.nvim", event = "BufWritePre" },
|
||||||
{
|
{
|
||||||
"rmagatti/auto-session",
|
"rmagatti/auto-session",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-telescope/telescope.nvim", -- Only needed if you want to use session lens
|
"nvim-telescope/telescope.nvim", -- Only needed if you want to use session lens
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
require("auto-session").setup({
|
require("auto-session").setup({
|
||||||
auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
|
auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
|
||||||
args_allow_single_directory = false,
|
args_allow_single_directory = false,
|
||||||
bypass_save_filetypes = { "netrw" },
|
bypass_save_filetypes = { "netrw" },
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
"tpope/vim-abolish",
|
"tpope/vim-abolish",
|
||||||
{
|
{
|
||||||
"johmsalas/text-case.nvim",
|
"johmsalas/text-case.nvim",
|
||||||
dependencies = { "nvim-telescope/telescope.nvim" },
|
dependencies = { "nvim-telescope/telescope.nvim" },
|
||||||
config = function()
|
config = function()
|
||||||
require("textcase").setup({})
|
require("textcase").setup({})
|
||||||
require("telescope").load_extension("textcase")
|
require("telescope").load_extension("textcase")
|
||||||
end,
|
end,
|
||||||
cmd = {
|
cmd = {
|
||||||
"Subs",
|
"Subs",
|
||||||
},
|
},
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>tc", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
|
{ "<leader>tc", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"NvChad/nvim-colorizer.lua",
|
"NvChad/nvim-colorizer.lua",
|
||||||
ft = "lua",
|
ft = "lua",
|
||||||
config = function()
|
config = function()
|
||||||
require("colorizer").setup()
|
require("colorizer").setup()
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
||||||
"andweeb/presence.nvim",
|
"andweeb/presence.nvim",
|
||||||
cond = not use_google(),
|
cond = not use_google(),
|
||||||
config = function()
|
config = function()
|
||||||
require("presence").setup({
|
require("presence").setup({
|
||||||
main_image = "file",
|
main_image = "file",
|
||||||
show_time = false,
|
show_time = false,
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ntpeters/vim-better-whitespace",
|
"ntpeters/vim-better-whitespace",
|
||||||
config = function()
|
config = function()
|
||||||
vim.g.better_whitespace_filetypes_blacklist = { "dashboard" }
|
vim.g.better_whitespace_filetypes_blacklist = { "dashboard" }
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"mbbill/undotree",
|
"mbbill/undotree",
|
||||||
cmd = "UndotreeToggle",
|
cmd = "UndotreeToggle",
|
||||||
config = function()
|
config = function()
|
||||||
vim.g.undotree_SetFocusWhenToggle = 1
|
vim.g.undotree_SetFocusWhenToggle = 1
|
||||||
end,
|
end,
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
|
keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"stevearc/aerial.nvim",
|
"stevearc/aerial.nvim",
|
||||||
opts = {},
|
opts = {},
|
||||||
cmd = { "AerialToggle", "AerialOn" },
|
cmd = { "AerialToggle", "AerialOn" },
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } },
|
keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"andrewferrier/debugprint.nvim",
|
"andrewferrier/debugprint.nvim",
|
||||||
opts = {},
|
opts = {},
|
||||||
-- Dependency only needed for NeoVim 0.8
|
-- Dependency only needed for NeoVim 0.8
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
},
|
},
|
||||||
-- Remove the following line to use development versions,
|
-- Remove the following line to use development versions,
|
||||||
-- not just the formal releases
|
-- not just the formal releases
|
||||||
version = "*",
|
version = "*",
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" },
|
{ "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" },
|
||||||
@ -167,5 +156,5 @@ return {
|
|||||||
{ "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" },
|
{ "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" },
|
||||||
{ "<leader>dQ", ":lua require('debugprint').debugprint({variable = true, above = true})<cr>", desc = "Debug print", },
|
{ "<leader>dQ", ":lua require('debugprint').debugprint({variable = true, above = true})<cr>", desc = "Debug print", },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -77,11 +77,10 @@ return {
|
|||||||
["_"] = { "trim_whitespace" },
|
["_"] = { "trim_whitespace" },
|
||||||
},
|
},
|
||||||
formatters = {
|
formatters = {
|
||||||
ronfmt = {
|
-- ronfmt = {
|
||||||
command = "ronfmt",
|
-- command = "ronfmt",
|
||||||
args = { "$FILENAME" },
|
-- args = { "-d", "$FILENAME" },
|
||||||
stdin = false,
|
-- },
|
||||||
},
|
|
||||||
gdformat = {
|
gdformat = {
|
||||||
prepend_args = { "-l", "100" },
|
prepend_args = { "-l", "100" },
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
-- disable underline
|
-- disable underline
|
||||||
|
local use_google = require("utils").use_google
|
||||||
vim.diagnostic.handlers.underline.show = function() end
|
vim.diagnostic.handlers.underline.show = function() end
|
||||||
|
|
||||||
local signs = {
|
local signs = {
|
||||||
@ -35,34 +36,36 @@ return {
|
|||||||
{ "]g", ":lua vim.diagnostic.goto_next()<CR>" },
|
{ "]g", ":lua vim.diagnostic.goto_next()<CR>" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
-- {
|
{
|
||||||
-- "rachartier/tiny-inline-diagnostic.nvim",
|
"rachartier/tiny-inline-diagnostic.nvim",
|
||||||
-- event = "LspAttach",
|
event = "LspAttach",
|
||||||
-- priority = 1000, -- needs to be loaded in first
|
priority = 1000, -- needs to be loaded in first
|
||||||
-- config = function()
|
cond = not use_google(),
|
||||||
-- vim.diagnostic.config({ virtual_text = false })
|
config = function()
|
||||||
--
|
vim.diagnostic.config({ virtual_text = false })
|
||||||
-- require("tiny-inline-diagnostic").setup({
|
|
||||||
-- preset = "classic", -- Can be: "modern", "classic", "minimal", "powerline", ghost", "simple", "nonerdfont", "amongus"
|
require("tiny-inline-diagnostic").setup({
|
||||||
--
|
preset = "classic", -- Can be: "modern", "classic", "minimal", "powerline", ghost", "simple", "nonerdfont", "amongus"
|
||||||
-- -- Show the source of the diagnostic.
|
|
||||||
-- show_source = false,
|
-- Show the source of the diagnostic.
|
||||||
--
|
show_source = false,
|
||||||
-- -- Use your defined signs in the diagnostic config table.
|
|
||||||
-- use_icons_from_diagnostic = true,
|
-- Use your defined signs in the diagnostic config table.
|
||||||
--
|
use_icons_from_diagnostic = true,
|
||||||
-- -- Enable diagnostic message on all lines.
|
|
||||||
-- multilines = true,
|
-- Enable diagnostic message on all lines.
|
||||||
--
|
multilines = true,
|
||||||
-- -- Show all diagnostics on the cursor line.
|
|
||||||
-- show_all_diags_on_cursorline = false,
|
-- Show all diagnostics on the cursor line.
|
||||||
-- })
|
show_all_diags_on_cursorline = false,
|
||||||
-- end,
|
})
|
||||||
-- },
|
end,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"ErichDonGubler/lsp_lines.nvim",
|
"ErichDonGubler/lsp_lines.nvim",
|
||||||
event = { "LspAttach" },
|
event = { "LspAttach" },
|
||||||
name = "lsp_lines.nvim",
|
name = "lsp_lines.nvim",
|
||||||
|
cond = use_google(),
|
||||||
config = function()
|
config = function()
|
||||||
require("lsp_lines").setup()
|
require("lsp_lines").setup()
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +0,0 @@
|
|||||||
return {
|
|
||||||
"ggandor/leap.nvim",
|
|
||||||
config = function()
|
|
||||||
require("leap").add_default_mappings()
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
@ -2,148 +2,148 @@ local use_google = require("utils").use_google
|
|||||||
local flags = require("utils").flags
|
local flags = require("utils").flags
|
||||||
|
|
||||||
return {
|
return {
|
||||||
-- {
|
-- {
|
||||||
-- "ray-x/lsp_signature.nvim",
|
-- "ray-x/lsp_signature.nvim",
|
||||||
-- event = "VeryLazy",
|
-- event = "VeryLazy",
|
||||||
-- opts = {
|
-- opts = {
|
||||||
-- floating_window = true,
|
-- floating_window = true,
|
||||||
-- hint_prefix = " ",
|
-- hint_prefix = " ",
|
||||||
-- },
|
-- },
|
||||||
-- config = function(_, opts)
|
-- config = function(_, opts)
|
||||||
-- require("lsp_signature").setup(opts)
|
-- require("lsp_signature").setup(opts)
|
||||||
-- end,
|
-- end,
|
||||||
-- },
|
-- },
|
||||||
{
|
{
|
||||||
"kosayoda/nvim-lightbulb",
|
"kosayoda/nvim-lightbulb",
|
||||||
commit = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49",
|
commit = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49",
|
||||||
event = { "LspAttach" },
|
event = { "LspAttach" },
|
||||||
opts = {
|
opts = {
|
||||||
autocmd = { enabled = true },
|
autocmd = { enabled = true },
|
||||||
virtual_text = {
|
virtual_text = {
|
||||||
enabled = true,
|
enabled = true,
|
||||||
text = " ",
|
text = " ",
|
||||||
hl = "DiagnosticWarn",
|
hl = "DiagnosticWarn",
|
||||||
},
|
},
|
||||||
sign = { enabled = false },
|
sign = { enabled = false },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"L3MON4D3/LuaSnip",
|
"L3MON4D3/LuaSnip",
|
||||||
build = "make install_jsregexp",
|
build = "make install_jsregexp",
|
||||||
config = function()
|
config = function()
|
||||||
require("luasnip.loaders.from_vscode").lazy_load()
|
require("luasnip.loaders.from_vscode").lazy_load()
|
||||||
end,
|
end,
|
||||||
dependencies = { "rafamadriz/friendly-snippets" },
|
dependencies = { "rafamadriz/friendly-snippets" },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"hinell/lsp-timeout.nvim",
|
"ray-x/go.nvim",
|
||||||
event = { "LspAttach" },
|
dependencies = { -- optional packages
|
||||||
dependencies = { "neovim/nvim-lspconfig" },
|
"ray-x/guihua.lua",
|
||||||
-- cond = not use_google(),
|
"neovim/nvim-lspconfig",
|
||||||
config = function()
|
"nvim-treesitter/nvim-treesitter",
|
||||||
vim.g.lspTimeoutConfig = {
|
},
|
||||||
filetypes = {
|
-- cond = not use_google(),
|
||||||
ignore = { -- filetypes to ignore; empty by default
|
config = function()
|
||||||
"gdscript",
|
local capabilities = flags.blink
|
||||||
"rust",
|
and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||||
}, -- for these filetypes
|
or require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||||
},
|
capabilities.offsetEncoding = { "utf-16" }
|
||||||
}
|
require("go").setup({
|
||||||
end,
|
lsp_cfg = { capabilities = capabilities },
|
||||||
},
|
lsp_keymaps = false,
|
||||||
{
|
lsp_inlay_hints = {
|
||||||
"ray-x/go.nvim",
|
enable = not use_google(), -- doesn't work with ciderlsp
|
||||||
dependencies = { -- optional packages
|
},
|
||||||
"ray-x/guihua.lua",
|
})
|
||||||
"neovim/nvim-lspconfig",
|
-- Run gofmt + goimports on save
|
||||||
"nvim-treesitter/nvim-treesitter",
|
|
||||||
},
|
|
||||||
-- cond = not use_google(),
|
|
||||||
config = function()
|
|
||||||
local capabilities = flags.blink
|
|
||||||
and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
|
|
||||||
or require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
|
|
||||||
capabilities.offsetEncoding = { "utf-16" }
|
|
||||||
require("go").setup({
|
|
||||||
lsp_cfg = { capabilities = capabilities },
|
|
||||||
lsp_keymaps = false,
|
|
||||||
lsp_inlay_hints = {
|
|
||||||
enable = not use_google(), -- doesn't work with ciderlsp
|
|
||||||
},
|
|
||||||
})
|
|
||||||
-- Run gofmt + goimports on save
|
|
||||||
|
|
||||||
local format_sync_grp = vim.api.nvim_create_augroup("goimports", {})
|
local format_sync_grp = vim.api.nvim_create_augroup("goimports", {})
|
||||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||||
pattern = "*.go",
|
pattern = "*.go",
|
||||||
callback = function()
|
callback = function()
|
||||||
require("go.format").goimports()
|
require("go.format").goimports()
|
||||||
end,
|
end,
|
||||||
group = format_sync_grp,
|
group = format_sync_grp,
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
ft = { "go", "gomod" },
|
ft = { "go", "gomod" },
|
||||||
build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries
|
build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"hrsh7th/nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
"saghen/blink.cmp",
|
"saghen/blink.cmp",
|
||||||
"saghen/blink.compat",
|
"saghen/blink.compat",
|
||||||
"nvim-lua/lsp-status.nvim",
|
"nvim-lua/lsp-status.nvim",
|
||||||
"VonHeikemen/lsp-zero.nvim",
|
"VonHeikemen/lsp-zero.nvim",
|
||||||
},
|
},
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>F", ":lua vim.lsp.buf.format()<CR>" },
|
{ "<leader>F", ":lua vim.lsp.buf.format()<CR>" },
|
||||||
{ "<leader>rn", ":lua vim.lsp.buf.rename()<CR>" },
|
{ "<leader>rn", ":lua vim.lsp.buf.rename()<CR>" },
|
||||||
{ "L", ":lua vim.lsp.buf.hover()<CR>" },
|
{ "L", ":lua vim.lsp.buf.hover()<CR>" },
|
||||||
{ "gr", ":Telescope lsp_references<CR>" },
|
{ "gr", ":Telescope lsp_references<CR>" },
|
||||||
{ "gd", ":lua vim.lsp.buf.definition()<CR>" },
|
{ "gd", ":lua vim.lsp.buf.definition()<CR>" },
|
||||||
-- { "gd", "<cmd>Telescope lsp_definitions<CR>" },
|
-- { "gd", "<cmd>Telescope lsp_definitions<CR>" },
|
||||||
{ "gD", ":tab split | lua vim.lsp.buf.definition()<CR>" },
|
{ "gD", ":tab split | lua vim.lsp.buf.definition()<CR>" },
|
||||||
{ "gi", ":lua vim.lsp.buf.implementation()<CR>" },
|
{ "gi", ":lua vim.lsp.buf.implementation()<CR>" },
|
||||||
{ "gI", ":lua vim.lsp.buf.implementation()<CR>" },
|
{ "gI", ":lua vim.lsp.buf.implementation()<CR>" },
|
||||||
{ "gR", ":lua vim.lsp.buf.references()<CR>" },
|
{ "gR", ":lua vim.lsp.buf.references()<CR>" },
|
||||||
{ "gt", ":lua vim.lsp.buf.type_definition()<CR>" },
|
{ "gt", ":lua vim.lsp.buf.type_definition()<CR>" },
|
||||||
{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>" },
|
{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>" },
|
||||||
{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
|
{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
local lsp_status = require("lsp-status")
|
local lsp_status = require("lsp-status")
|
||||||
lsp_status.register_progress()
|
lsp_status.register_progress()
|
||||||
|
|
||||||
local capabilities = flags.blink
|
local capabilities = flags.blink
|
||||||
and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
|
and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||||
or require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
|
or require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||||
capabilities = vim.tbl_extend("keep", capabilities or {}, lsp_status.capabilities)
|
capabilities = vim.tbl_extend("keep", capabilities or {}, lsp_status.capabilities)
|
||||||
capabilities.offsetEncoding = { "utf-16" }
|
capabilities.offsetEncoding = { "utf-16" }
|
||||||
|
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require("lspconfig")
|
||||||
local configs = require("lspconfig.configs")
|
local configs = require("lspconfig.configs")
|
||||||
|
|
||||||
local nvim_lspconfig = require("lspconfig")
|
local nvim_lspconfig = require("lspconfig")
|
||||||
local lsp_configs = require("lspconfig.configs")
|
local lsp_configs = require("lspconfig.configs")
|
||||||
|
|
||||||
lsp_configs.ciderlsp = {
|
lsp_configs.ciderlsp = {
|
||||||
default_config = {
|
default_config = {
|
||||||
cmd = { '/google/bin/releases/cider/ciderlsp/ciderlsp', '--tooltag=nvim-lsp', '--noforward_sync_responses' },
|
cmd = {
|
||||||
filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl", "typescript" },
|
"/google/bin/releases/cider/ciderlsp/ciderlsp",
|
||||||
offset_encoding = 'utf-8',
|
"--tooltag=nvim-lsp",
|
||||||
root_dir = nvim_lspconfig.util.root_pattern('.citc'),
|
"--noforward_sync_responses",
|
||||||
settings = {},
|
},
|
||||||
}
|
filetypes = {
|
||||||
}
|
"c",
|
||||||
|
"cpp",
|
||||||
|
"java",
|
||||||
|
"kotlin",
|
||||||
|
"objc",
|
||||||
|
"proto",
|
||||||
|
"textproto",
|
||||||
|
"go",
|
||||||
|
"python",
|
||||||
|
"bzl",
|
||||||
|
"typescript",
|
||||||
|
},
|
||||||
|
offset_encoding = "utf-8",
|
||||||
|
root_dir = nvim_lspconfig.util.root_pattern(".citc"),
|
||||||
|
settings = {},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
nvim_lspconfig.ciderlsp.setup {}
|
nvim_lspconfig.ciderlsp.setup({})
|
||||||
-- Godot
|
-- Godot
|
||||||
lspconfig.gdscript.setup({
|
lspconfig.gdscript.setup({
|
||||||
-- flags = {
|
-- flags = {
|
||||||
-- debounce_text_changes = 2000, -- Wait 5 seconds before sending didChange
|
-- debounce_text_changes = 2000, -- Wait 5 seconds before sending didChange
|
||||||
-- },
|
-- },
|
||||||
})
|
})
|
||||||
vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
|
vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
|
||||||
vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4]])
|
vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4]])
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,11 +1,10 @@
|
|||||||
return {
|
return {
|
||||||
|
{ "ron-rs/ron.vim" },
|
||||||
{
|
{
|
||||||
"mrcjkb/rustaceanvim",
|
"mrcjkb/rustaceanvim",
|
||||||
version = "^5", -- Recommended
|
version = "^5", -- Recommended
|
||||||
lazy = false, -- This plugin is already lazy
|
lazy = false, -- This plugin is already lazy
|
||||||
keys = {
|
keys = {},
|
||||||
-- { "" },
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"saecki/crates.nvim",
|
"saecki/crates.nvim",
|
||||||
|
|||||||
Reference in New Issue
Block a user