Xetibo/DashNix
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: use proper floating terminal

Browse source
This commit is contained in:
Fabio Lenherr / DashieTM 2023-11-10 09:19:52 +01:00
parent 3b9752b5ee
commit 61072b816a
28 changed files with 294 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nvim/lua/config/keymaps.lua
View file

@ -82,10 +82,10 @@ map("n", "<leader>ga", function()
require("telescope.builtin").git_stash()
end, { desc = "Git stash" })
map("n", "<leader>gg", function()
Util.float_term({ "gitui" }, { cwd = Util.get_root() })
Util.terminal({ "gitui" }, { cwd = Util.root() })
end, { desc = "gitui (root dir)" })
map("n", "<leader>gG", function()
Util.float_term({ "gitui" })
Util.terminal({ "gitui" })
end, { desc = "gitui (cwd)" })
map("n", "<leader>gb", function()
require("gitblame")

1
nvim/lua/config/options.lua
View file

@ -12,6 +12,7 @@ local options = {
relativenumber = false,
scrolloff = 5,
scrolljump = 5,
wrap = false,
}
vim.o.guifont = "JetBrainsMono Nerd Font:h14"
vim.g.neovide_refresh_rate_idle = 180

2
nvim/lua/plugins/cmp.lua
View file

@ -106,7 +106,7 @@ return {
{ name = "crates" },
}),
sorting = {
priority_weight = 1,
priority_weight = 90,
comparators = {
compare.exact,
compare.score,

144
nvim/lua/plugins/lsp.lua
View file

@ -1,22 +1,6 @@
return {
{
"neovim/nvim-lspconfig",
lazy = true,
event = { "BufReadPre", "BufNewFile" },
dependencies = {
{ "folke/neoconf.nvim", cmd = "Neoconf", config = false, dependencies = { "nvim-lspconfig" } },
{ "folke/neodev.nvim", opts = { experimental = { pathStrict = true } } },
"mason.nvim",
"williamboman/mason-lspconfig.nvim",
"mfussenegger/nvim-jdtls",
{
"hrsh7th/cmp-nvim-lsp",
cond = function()
return require("lazyvim.util").has("nvim-cmp")
end,
},
{ "Hoffs/omnisharp-extended-lsp.nvim", lazy = true },
},
---@class PluginLspOpts
opts = {
-- options for vim.diagnostic.config()
@ -182,138 +166,12 @@ return {
end,
},
},
config = function(_, opts)
setup = function(_, _)
local Util = require("lazyvim.util")
if Util.has("neoconf.nvim") then
local plugin = require("lazy.core.config").spec.plugins["neoconf.nvim"]
require("neoconf").setup(require("lazy.core.plugin").values(plugin, "opts", false))
end
-- setup autoformat
Util.format.register(Util.lsp.formatter())
-- deprectaed options
if opts.autoformat ~= nil then
vim.g.autoformat = opts.autoformat
end
-- setup formatting and keymaps
Util.lsp.on_attach(function(client, buffer)
require("config.lsp-keymap").on_attach(client, buffer)
end)
local register_capability = vim.lsp.handlers["client/registerCapability"]
vim.lsp.handlers["client/registerCapability"] = function(err, res, ctx)
local ret = register_capability(err, res, ctx)
local client_id = ctx.client_id
---@type lsp.Client
local client = vim.lsp.get_client_by_id(client_id)
local buffer = vim.api.nvim_get_current_buf()
require("config.lsp-keymap").on_attach(client, buffer)
return ret
end
-- diagnostics
for name, icon in pairs(require("lazyvim.config").icons.diagnostics) do
name = "DiagnosticSign" .. name
vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" })
end
local inlay_hint = vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint
if opts.inlay_hints.enabled and inlay_hint then
Util.lsp.on_attach(function(client, buffer)
if client.supports_method("textDocument/inlayHint") then
inlay_hint(buffer, true)
end
end)
end
if type(opts.diagnostics.virtual_text) == "table" and opts.diagnostics.virtual_text.prefix == "icons" then
opts.diagnostics.virtual_text.prefix = vim.fn.has("nvim-0.10.0") == 0 and "●"
or function(diagnostic)
local icons = require("lazyvim.config").icons.diagnostics
for d, icon in pairs(icons) do
if diagnostic.severity == vim.diagnostic.severity[d:upper()] then
return icon
end
end
end
end
vim.diagnostic.config(vim.deepcopy(opts.diagnostics))
local servers = opts.servers
local has_cmp, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
local capabilities = vim.tbl_deep_extend(
"force",
{},
vim.lsp.protocol.make_client_capabilities(),
has_cmp and cmp_nvim_lsp.default_capabilities() or {},
opts.capabilities or {}
)
local function setup(server)
local server_opts = vim.tbl_deep_extend("force", {
capabilities = vim.deepcopy(capabilities),
}, servers[server] or {})
if opts.setup[server] then
if opts.setup[server](server, server_opts) then
return
end
elseif opts.setup["*"] then
if opts.setup["*"](server, server_opts) then
return
end
end
require("lspconfig")[server].setup(server_opts)
end
-- get all the servers that are available through mason-lspconfig
local have_mason, mlsp = pcall(require, "mason-lspconfig")
local all_mslp_servers = {}
if have_mason then
all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings.server").lspconfig_to_package)
end
local ensure_installed = {} ---@type string[]
for server, server_opts in pairs(servers) do
if server_opts then
server_opts = server_opts == true and {} or server_opts
-- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig
if server_opts.mason == false or not vim.tbl_contains(all_mslp_servers, server) then
setup(server)
else
ensure_installed[#ensure_installed + 1] = server
end
end
end
if have_mason then
mlsp.setup({ ensure_installed = ensure_installed, handlers = { setup } })
end
if Util.lsp.get_config("denols") and Util.lsp.get_config("tsserver") then
local is_deno = require("lspconfig.util").root_pattern("deno.json", "deno.jsonc")
Util.lsp.disable("tsserver", is_deno)
Util.lsp.disable("denols", function(root_dir)
return not is_deno(root_dir)
end)
end
require("lspconfig").ltex.setup({
capabilities = capabilities,
on_attach = Util.lsp.on_attach(function(client, buffer)
require("config.lsp-keymap").on_attach(client, buffer)
require("ltex_extra").setup({
path = vim.fn.expand("~") .. "/.local/share/ltex",
})
end),
})
vim.cmd([[highlight LspInlayHint guibg=#1A1B26]])
end,
},

151
nvim/lua/plugins/lspbackup → nvim/lua/plugins/lspbackup.lua
View file

@ -4,11 +4,10 @@ return {
lazy = true,
event = { "BufReadPre", "BufNewFile" },
dependencies = {
{ "folke/neoconf.nvim", cmd = "Neoconf", config = true },
{ "folke/neodev.nvim", opts = { experimental = { pathStrict = true } } },
{ "folke/neoconf.nvim", cmd = "Neoconf", config = false, dependencies = { "nvim-lspconfig" } },
{ "folke/neodev.nvim", opts = { experimental = { pathStrict = true } } },
"mason.nvim",
"williamboman/mason-lspconfig.nvim",
"lvimuser/lsp-inlayhints.nvim",
"mfussenegger/nvim-jdtls",
{
"hrsh7th/cmp-nvim-lsp",
@ -16,6 +15,7 @@ return {
return require("lazyvim.util").has("nvim-cmp")
end,
},
{ "Hoffs/omnisharp-extended-lsp.nvim", lazy = true },
},
---@class PluginLspOpts
opts = {
@ -23,14 +23,15 @@ return {
diagnostics = {
underline = true,
update_in_insert = false,
virtual_text = { spacing = 4, prefix = "●" },
virtual_text = { spacing = 4, source = "if_many", prefix = "●" },
severity_sort = true,
},
-- Automatically format on save
inlay_hints = {
enabled = true,
},
capabilities = {},
autoformat = false,
-- options for vim.lsp.buf.format
-- `bufnr` and `filter` is handled by the LazyVim formatter,
-- but can be also overridden when specified
format_notify = false,
format = {
formatting_options = nil,
timeout_ms = nil,
@ -69,7 +70,31 @@ return {
ansiblels = {},
marksman = {},
asm_lsp = {},
omnisharp = {},
omnisharp = {
handlers = {
["textDocument/definition"] = function(...)
return require("omnisharp_extended").handler(...)
end,
},
inlayHintsOptions = {
enableForParameters = true,
forLiteralParameters = true,
forIndexerParameters = true,
forObjectCreationParameters = true,
forOtherParameters = true,
suppressForParametersThatDifferOnlyBySuffix = false,
suppressForParametersThatMatchMethodIntent = false,
suppressForParametersThatMatchArgumentName = false,
enableForTypes = true,
forImplicitVariableTypes = true,
forLambdaParameterTypes = true,
forImplicitObjectCreation = true,
},
enable_roslyn_analyzers = true,
organize_imports_on_format = true,
enable_import_completion = true,
},
rnix = {},
rust_analyzer = {
diagnostics = {
enable = true,
@ -108,6 +133,7 @@ return {
exportPdf = "onSave",
},
},
texlab = {},
ltex = {
settings = {
ltex = {
@ -128,7 +154,6 @@ return {
"typ",
},
},
texlab = {},
gopls = {
staticcheck = true,
},
@ -158,44 +183,81 @@ return {
},
},
config = function(_, opts)
local Util = require("lazyvim.util")
if Util.has("neoconf.nvim") then
local plugin = require("lazy.core.config").spec.plugins["neoconf.nvim"]
require("neoconf").setup(require("lazy.core.plugin").values(plugin, "opts", false))
end
-- setup autoformat
require("lazyvim.plugins.lsp.format").autoformat = opts.autoformat
Util.format.register(Util.lsp.formatter())
-- deprectaed options
if opts.autoformat ~= nil then
vim.g.autoformat = opts.autoformat
end
-- setup formatting and keymaps
require("lazyvim.util").on_attach(function(client, buffer)
require("lazyvim.plugins.lsp.format").setup(opts)
Util.lsp.on_attach(function(client, buffer)
require("config.lsp-keymap").on_attach(client, buffer)
end)
local register_capability = vim.lsp.handlers["client/registerCapability"]
vim.lsp.handlers["client/registerCapability"] = function(err, res, ctx)
local ret = register_capability(err, res, ctx)
local client_id = ctx.client_id
---@type lsp.Client
local client = vim.lsp.get_client_by_id(client_id)
local buffer = vim.api.nvim_get_current_buf()
require("config.lsp-keymap").on_attach(client, buffer)
return ret
end
-- diagnostics
for name, icon in pairs(require("lazyvim.config").icons.diagnostics) do
name = "DiagnosticSign" .. name
vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" })
end
vim.diagnostic.config(opts.diagnostics)
require("lsp-inlayhints").setup({})
local inlay_hint = vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint
if opts.inlay_hints.enabled and inlay_hint then
Util.lsp.on_attach(function(client, buffer)
if client.supports_method("textDocument/inlayHint") then
inlay_hint(buffer, true)
end
end)
end
if type(opts.diagnostics.virtual_text) == "table" and opts.diagnostics.virtual_text.prefix == "icons" then
opts.diagnostics.virtual_text.prefix = vim.fn.has("nvim-0.10.0") == 0 and "●"
or function(diagnostic)
local icons = require("lazyvim.config").icons.diagnostics
for d, icon in pairs(icons) do
if diagnostic.severity == vim.diagnostic.severity[d:upper()] then
return icon
end
end
end
end
vim.diagnostic.config(vim.deepcopy(opts.diagnostics))
local servers = opts.servers
local has_cmp, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
local capabilities = vim.tbl_deep_extend(
"force",
{},
vim.lsp.protocol.make_client_capabilities(),
require("cmp_nvim_lsp").default_capabilities(),
has_cmp and cmp_nvim_lsp.default_capabilities() or {},
opts.capabilities or {}
)
local on_attach = function(client, bufnr)
vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
vim.api.nvim_buf_set_option(bufnr, "tagfunc", "v:lua.vim.lsp.tagfunc")
require("lsp-inlayhints").on_attach(client, bufnr, true)
end
local function setup(server)
local server_opts = vim.tbl_deep_extend("force", {
capabilities = vim.deepcopy(capabilities),
on_attach = on_attach,
vim.lsp.diagnostic.on_publish_diagnostics,
{
virtual_text = true,
},
}, servers[server] or {})
if opts.setup[server] then
@ -210,15 +272,19 @@ return {
require("lspconfig")[server].setup(server_opts)
end
local mlsp = require("mason-lspconfig")
local available = mlsp.get_available_servers()
-- get all the servers that are available through mason-lspconfig
local have_mason, mlsp = pcall(require, "mason-lspconfig")
local all_mslp_servers = {}
if have_mason then
all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings.server").lspconfig_to_package)
end
local ensure_installed = {} ---@type string[]
for server, server_opts in pairs(servers) do
if server_opts then
server_opts = server_opts == true and {} or server_opts
-- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig
if server_opts.mason == false or not vim.tbl_contains(available, server) then
if server_opts.mason == false or not vim.tbl_contains(all_mslp_servers, server) then
setup(server)
else
ensure_installed[#ensure_installed + 1] = server
@ -226,20 +292,40 @@ return {
end
end
require("mason-lspconfig").setup({ ensure_installed = ensure_installed })
require("mason-lspconfig").setup_handlers({ setup })
if have_mason then
mlsp.setup({ ensure_installed = ensure_installed, handlers = { setup } })
end
if Util.lsp.get_config("denols") and Util.lsp.get_config("tsserver") then
local is_deno = require("lspconfig.util").root_pattern("deno.json", "deno.jsonc")
Util.lsp.disable("tsserver", is_deno)
Util.lsp.disable("denols", function(root_dir)
return not is_deno(root_dir)
end)
end
require("lspconfig").ltex.setup({
capabilities = capabilities,
on_attach = Util.lsp.on_attach(function(client, buffer)
require("config.lsp-keymap").on_attach(client, buffer)
require("ltex_extra").setup({
path = vim.fn.expand("~") .. "/.local/share/ltex",
})
end),
})
vim.cmd([[highlight LspInlayHint guibg=#1A1B26]])
end,
},
{
"jose-elias-alvarez/null-ls.nvim",
"DashieTM/null.nvim",
event = { "BufReadPre", "BufNewFile" },
dependencies = { "mason.nvim" },
opts = function()
local nls = require("null-ls")
return {
root_dir = require("null-ls.utils").root_pattern(".null-ls-root", ".neoconf.json", "Makefile", ".git"),
sources = {
nls.builtins.formatting.fish_indent,
nls.builtins.diagnostics.fish,
@ -248,6 +334,7 @@ return {
nls.builtins.diagnostics.flake8,
nls.builtins.formatting.autopep8,
nls.builtins.formatting.prettierd,
nls.builtins.formatting.typst,
},
}
end,

74
nvim/lua/plugins/plugins.lua
View file

@ -86,10 +86,6 @@ return {
)
end,
},
{
"echasnovski/mini.ai",
diabled = true,
},
{
"rcarriga/nvim-notify",
opts = {
@ -265,76 +261,6 @@ return {
{ "<leader>tS", function() require("neotest").run.stop() end, desc = "Stop" },
},
},
{
"echasnovski/mini.hipatterns",
event = "BufReadPre",
opts = function()
local hi = require("mini.hipatterns")
return {
-- custom LazyVim option to enable the tailwind integration
tailwind = {
enabled = true,
ft = { "typescriptreact", "javascriptreact", "css", "javascript", "typescript", "html" },
-- full: the whole css class will be highlighted
-- compact: only the color will be highlighted
style = "full",
},
highlighters = {
hex_color = hi.gen_highlighter.hex_color({ priority = 2000 }),
},
}
end,
config = function(_, opts)
-- backward compatibility
if opts.tailwind == true then
opts.tailwind = {
enabled = true,
ft = { "typescriptreact", "javascriptreact", "css", "javascript", "typescript", "html" },
style = "full",
}
end
if type(opts.tailwind) == "table" and opts.tailwind.enabled then
-- reset hl groups when colorscheme changes
vim.api.nvim_create_autocmd("ColorScheme", {
callback = function()
M.hl = {}
end,
})
opts.highlighters.tailwind = {
pattern = function()
if not vim.tbl_contains(opts.tailwind.ft, vim.bo.filetype) then
return
end
if opts.tailwind.style == "full" then
return "%f[%w:-]()[%w:-]+%-[a-z%-]+%-%d+()%f[^%w:-]"
elseif opts.tailwind.style == "compact" then
return "%f[%w:-][%w:-]+%-()[a-z%-]+%-%d+()%f[^%w:-]"
end
end,
group = function(_, _, m)
---@type string
local match = m.full_match
---@type string, number
local color, shade = match:match("[%w-]+%-([a-z%-]+)%-(%d+)")
shade = tonumber(shade)
local bg = vim.tbl_get(M.colors, color, shade)
if bg then
local hl = "MiniHipatternsTailwind" .. color .. shade
if not M.hl[hl] then
M.hl[hl] = true
local bg_shade = shade == 500 and 950 or shade < 500 and 900 or 100
local fg = vim.tbl_get(M.colors, color, bg_shade)
vim.api.nvim_set_hl(0, hl, { bg = "#" .. bg, fg = "#" .. fg })
end
return hl
end
end,
priority = 2000,
}
end
require("mini.hipatterns").setup(opts)
end,
},
{
"barreiroleo/ltex_extra.nvim",
ft = { "markdown", "tex", "typst", "typ" },