mirror of
https://github.com/marianozunino/nvim.git
synced 2025-10-28 19:30:41 -03:00
dev: automated commit - 2025-06-30 13:03:02
This commit is contained in:
parent
249a24b851
commit
979a043670
8 changed files with 420 additions and 174 deletions
|
|
@ -28,6 +28,7 @@ return {
|
|||
cpp = { "clang-format" },
|
||||
hcl = { "hcl" },
|
||||
toml = { "taplo" },
|
||||
typst = { "prettypst" },
|
||||
},
|
||||
formatters = {
|
||||
csharpier = {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ M.config = function()
|
|||
nmap("<leader>D", fzf_lua.lsp_typedefs, { desc = "Type Definition" })
|
||||
nmap("<leader>ca", fzf_lua.lsp_code_actions, { desc = "Code Action" })
|
||||
nmap("<leader>ds", fzf_lua.lsp_document_symbols, { desc = "Document Symbols" })
|
||||
nmap("<leader>ws", fzf_lua.lsp_workspace_symbols, { desc = "Workspace Symbols" })
|
||||
nmap("<leader>ic", fzf_lua.lsp_incoming_calls, { desc = "Incoming Calls" })
|
||||
nmap("<leader>oc", fzf_lua.lsp_outgoing_calls, { desc = "Outgoing Calls" })
|
||||
nmap("<leader>gf", fzf_lua.live_grep, { desc = "Find Live Grep" })
|
||||
|
|
|
|||
|
|
@ -88,6 +88,149 @@ local M = {
|
|||
nmap("<leader>gy", "<cmd>lua require('gitlinker').get_buf_range_url('n')<cr>")
|
||||
end,
|
||||
},
|
||||
{
|
||||
"polarmutex/git-worktree.nvim",
|
||||
version = "^2",
|
||||
dependencies = { "nvim-lua/plenary.nvim", "ibhagwan/fzf-lua", "folke/snacks.nvim" },
|
||||
config = function()
|
||||
local fzf_lua = require("fzf-lua")
|
||||
local git_worktree = require("git-worktree")
|
||||
|
||||
-- Basic hooks
|
||||
local Hooks = require("git-worktree.hooks")
|
||||
Hooks.register(Hooks.type.SWITCH, Hooks.builtins.update_current_buffer_on_switch)
|
||||
|
||||
-- Switch worktrees
|
||||
local function switch_worktree()
|
||||
vim.system({ "git", "worktree", "list" }, {}, function(result)
|
||||
if result.code ~= 0 then
|
||||
return
|
||||
end
|
||||
|
||||
local items = {}
|
||||
for line in result.stdout:gmatch("[^\n]+") do
|
||||
local path, branch = line:match("^([^%s]+)%s+%[?([^%]]*)")
|
||||
if path and branch then
|
||||
table.insert(items, path .. " (" .. (branch ~= "" and branch or "detached") .. ")")
|
||||
end
|
||||
end
|
||||
|
||||
vim.schedule(function()
|
||||
fzf_lua.fzf_exec(items, {
|
||||
prompt = "Worktrees> ",
|
||||
actions = {
|
||||
default = function(selected)
|
||||
local path = selected[1]:match("^([^%(]+)")
|
||||
git_worktree.switch_worktree(path:gsub("%s+$", ""))
|
||||
end,
|
||||
},
|
||||
})
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
-- Create worktree
|
||||
local function create_worktree()
|
||||
-- Get the git directory (works for both regular and bare repos)
|
||||
vim.system({ "git", "rev-parse", "--git-dir" }, {}, function(result)
|
||||
if result.code ~= 0 then
|
||||
vim.schedule(function()
|
||||
vim.notify("Not in a git repository", vim.log.levels.ERROR)
|
||||
end)
|
||||
return
|
||||
end
|
||||
|
||||
local git_dir = result.stdout:gsub("\n", "")
|
||||
-- For bare repos, git-dir is the repo itself; for regular repos, get parent
|
||||
local repo_root = git_dir:match("%.git$") and git_dir:gsub("/%.git$", "") or git_dir
|
||||
|
||||
vim.system({ "git", "branch", "-a" }, { cwd = repo_root }, function(branch_result)
|
||||
if branch_result.code ~= 0 then
|
||||
return
|
||||
end
|
||||
|
||||
local branches = {}
|
||||
for line in branch_result.stdout:gmatch("[^\n]+") do
|
||||
local branch = line:gsub("^%s*%*?%s*", ""):gsub("^remotes/", "")
|
||||
if branch ~= "" and not branch:match("HEAD") then
|
||||
table.insert(branches, branch)
|
||||
end
|
||||
end
|
||||
|
||||
vim.schedule(function()
|
||||
fzf_lua.fzf_exec(branches, {
|
||||
prompt = "Base Branch> ",
|
||||
actions = {
|
||||
default = function(selected)
|
||||
if not selected or #selected == 0 then
|
||||
return
|
||||
end
|
||||
local base_branch = selected[1]
|
||||
local default_name = base_branch:gsub(".*/", "")
|
||||
|
||||
require("snacks").input({
|
||||
prompt = "Worktree name",
|
||||
default = default_name,
|
||||
icon = "🌿",
|
||||
}, function(name)
|
||||
if name then
|
||||
git_worktree.create_worktree(name, base_branch, "origin")
|
||||
end
|
||||
end)
|
||||
end,
|
||||
},
|
||||
})
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
-- Delete worktree
|
||||
local function delete_worktree()
|
||||
local cwd = vim.fn.getcwd() -- Get this before async call
|
||||
|
||||
vim.system({ "git", "worktree", "list" }, {}, function(result)
|
||||
if result.code ~= 0 then
|
||||
return
|
||||
end
|
||||
|
||||
local items = {}
|
||||
|
||||
for line in result.stdout:gmatch("[^\n]+") do
|
||||
local path, branch = line:match("^([^%s]+)%s+%[?([^%]]*)")
|
||||
if path and path ~= cwd then
|
||||
table.insert(items, path .. " (" .. (branch ~= "" and branch or "detached") .. ")")
|
||||
end
|
||||
end
|
||||
|
||||
vim.schedule(function()
|
||||
fzf_lua.fzf_exec(items, {
|
||||
prompt = "Delete> ",
|
||||
actions = {
|
||||
default = function(selected)
|
||||
local path = selected[1]:match("^([^%(]+)"):gsub("%s+$", "")
|
||||
|
||||
-- Simple vim.ui.select for yes/no
|
||||
vim.ui.select({ "Yes", "No" }, {
|
||||
prompt = "Delete worktree '" .. path .. "'?",
|
||||
}, function(choice)
|
||||
if choice == "Yes" then
|
||||
git_worktree.delete_worktree(path, true)
|
||||
end
|
||||
end)
|
||||
end,
|
||||
},
|
||||
})
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
-- Keymaps
|
||||
vim.keymap.set("n", "<leader>ws", switch_worktree, { desc = "Switch Worktree" })
|
||||
vim.keymap.set("n", "<leader>wc", create_worktree, { desc = "Create Worktree" })
|
||||
vim.keymap.set("n", "<leader>wd", delete_worktree, { desc = "Delete Worktree" })
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -1,155 +1,206 @@
|
|||
local M = {
|
||||
"WhoIsSethDaniel/mason-tool-installer.nvim",
|
||||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
require("plugins.lsp.extras.lazydev"),
|
||||
require("plugins.lsp.extras.gopher"),
|
||||
"mason-org/mason-lspconfig.nvim",
|
||||
"mason-org/mason.nvim",
|
||||
"j-hui/fidget.nvim",
|
||||
"ibhagwan/fzf-lua",
|
||||
require("plugins.lsp.extras.lazydev"),
|
||||
require("plugins.lsp.extras.gopher"),
|
||||
"WhoIsSethDaniel/mason-tool-installer.nvim",
|
||||
},
|
||||
|
||||
config = function()
|
||||
-- Mason setup
|
||||
require("mason").setup({ max_concurrent_installers = 4 })
|
||||
require("fidget").setup({})
|
||||
|
||||
-- Enhance floating preview windows
|
||||
local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview
|
||||
function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
|
||||
opts = opts or {}
|
||||
opts.border = opts.border or "rounded"
|
||||
opts.max_width = opts.max_width or 80
|
||||
opts.max_height = opts.max_height or 20
|
||||
return orig_util_open_floating_preview(contents, syntax, opts, ...)
|
||||
end
|
||||
|
||||
-- Diagnostics configuration
|
||||
vim.diagnostic.config({
|
||||
virtual_text = { spacing = 2, source = "if_many" },
|
||||
float = { border = "rounded", source = "if_many" },
|
||||
signs = vim.g.have_nerd_font and {
|
||||
text = {
|
||||
[vim.diagnostic.severity.ERROR] = "",
|
||||
[vim.diagnostic.severity.WARN] = "",
|
||||
[vim.diagnostic.severity.INFO] = "",
|
||||
[vim.diagnostic.severity.HINT] = "",
|
||||
},
|
||||
} or true,
|
||||
underline = true,
|
||||
update_in_insert = true,
|
||||
severity_sort = true,
|
||||
})
|
||||
|
||||
-- Global floating options
|
||||
_G.floating_options = {
|
||||
focusable = true,
|
||||
focus = false,
|
||||
max_height = 50,
|
||||
max_width = 100,
|
||||
}
|
||||
|
||||
-- Auto-format on save
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
callback = function()
|
||||
if vim.lsp.buf_is_attached() then
|
||||
vim.lsp.buf.format()
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
-- Filter out unwanted code actions
|
||||
vim.lsp.buf.code_action = (function(orig)
|
||||
return function(opts)
|
||||
opts = opts or {}
|
||||
opts.filter = function(action)
|
||||
if not action then
|
||||
return false
|
||||
end
|
||||
-- Ignore gopls "Browse" actions
|
||||
if action.title and action.title:match("Browse gopls") then
|
||||
return false
|
||||
end
|
||||
return true
|
||||
end
|
||||
return orig(opts)
|
||||
end
|
||||
end)(vim.lsp.buf.code_action)
|
||||
|
||||
-- Keymaps setup function
|
||||
local function setup_keymaps(bufnr)
|
||||
local fzf = require("fzf-lua")
|
||||
local opts = { buffer = bufnr }
|
||||
|
||||
-- Helper function for mapping
|
||||
local function nmap(key, func, desc_opts)
|
||||
vim.keymap.set("n", key, func, desc_opts)
|
||||
end
|
||||
|
||||
-- Basic LSP
|
||||
nmap("K", vim.lsp.buf.hover, vim.tbl_extend("force", opts, { desc = "Hover Doc" }))
|
||||
nmap("<C-h>", vim.lsp.buf.signature_help, vim.tbl_extend("force", opts, { desc = "Signature Help" }))
|
||||
nmap("<leader>r", vim.lsp.buf.rename, vim.tbl_extend("force", opts, { desc = "Rename" }))
|
||||
nmap("<leader>ca", vim.lsp.buf.code_action, vim.tbl_extend("force", opts, { desc = "Code Action" }))
|
||||
|
||||
-- Navigation
|
||||
nmap("gd", fzf.lsp_definitions, vim.tbl_extend("force", opts, { desc = "Go to Definition" }))
|
||||
nmap("gr", fzf.lsp_references, vim.tbl_extend("force", opts, { desc = "Go to References" }))
|
||||
nmap("gD", vim.lsp.buf.declaration, vim.tbl_extend("force", opts, { desc = "Go to Declaration" }))
|
||||
nmap("gi", fzf.lsp_implementations, vim.tbl_extend("force", opts, { desc = "Go to Implementation" }))
|
||||
nmap("gt", fzf.lsp_typedefs, vim.tbl_extend("force", opts, { desc = "Go to Type Definition" }))
|
||||
|
||||
-- Diagnostics
|
||||
nmap("vd", vim.diagnostic.open_float, vim.tbl_extend("force", opts, { desc = "View Diagnostics" }))
|
||||
nmap("<leader>dl", fzf.diagnostics_document, vim.tbl_extend("force", opts, { desc = "Document Diagnostics" }))
|
||||
nmap("<leader>dw", fzf.diagnostics_workspace, vim.tbl_extend("force", opts, { desc = "Workspace Diagnostics" }))
|
||||
nmap("<leader>ds", fzf.lsp_document_symbols, vim.tbl_extend("force", opts, { desc = "Document Symbols" }))
|
||||
nmap("<leader>ws", fzf.lsp_workspace_symbols, vim.tbl_extend("force", opts, { desc = "Workspace Symbols" }))
|
||||
|
||||
-- LSP management
|
||||
nmap("<leader>lr", function()
|
||||
local clients = vim.lsp.get_clients({ bufnr = bufnr })
|
||||
if #clients == 0 then
|
||||
vim.notify("No LSP clients attached to buffer", vim.log.levels.WARN)
|
||||
return
|
||||
end
|
||||
|
||||
local client_names = {}
|
||||
for _, client in ipairs(clients) do
|
||||
table.insert(client_names, client.name)
|
||||
vim.cmd("LspRestart " .. client.name)
|
||||
end
|
||||
vim.notify("Restarted LSP clients: " .. table.concat(client_names, ", "), vim.log.levels.INFO)
|
||||
end, vim.tbl_extend("force", opts, { desc = "Restart LSP" }))
|
||||
nmap("<leader>li", ":LspInfo<CR>", vim.tbl_extend("force", opts, { desc = "LSP Info" }))
|
||||
end
|
||||
|
||||
-- LSP servers configuration
|
||||
local servers = {
|
||||
"gopls",
|
||||
"jsonls",
|
||||
"lua_ls",
|
||||
"yamlls",
|
||||
"graphql",
|
||||
"html",
|
||||
"omnisharp",
|
||||
"svelte",
|
||||
"vtsls",
|
||||
"ccls",
|
||||
"templ",
|
||||
"tinymist",
|
||||
}
|
||||
|
||||
-- Tools for mason-tool-installer
|
||||
local tools = {
|
||||
"prettierd",
|
||||
"shfmt",
|
||||
"stylua",
|
||||
"latexindent",
|
||||
"clang-format",
|
||||
"csharpier",
|
||||
"quick-lint-js",
|
||||
}
|
||||
|
||||
-- Servers not supported by mason
|
||||
local mason_unsupported = { "ccls" }
|
||||
|
||||
local mason_servers = vim.tbl_filter(function(server)
|
||||
return not vim.tbl_contains(mason_unsupported, server)
|
||||
end, servers)
|
||||
|
||||
-- Mason setup
|
||||
require("mason-lspconfig").setup({
|
||||
ensure_installed = mason_servers,
|
||||
automatic_installation = true,
|
||||
automatic_enable = false,
|
||||
})
|
||||
require("mason-tool-installer").setup({ ensure_installed = tools })
|
||||
|
||||
-- Enable LSP servers
|
||||
vim.lsp.enable(servers)
|
||||
|
||||
-- LSP Attach autocmd
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
group = vim.api.nvim_create_augroup("UserLspConfig", { clear = true }),
|
||||
callback = function(args)
|
||||
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
||||
if not client then
|
||||
return
|
||||
end
|
||||
|
||||
-- Setup keymaps
|
||||
setup_keymaps(args.buf)
|
||||
|
||||
-- Inlay hints
|
||||
if client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, args.buf) then
|
||||
vim.keymap.set("n", "<leader>th", function()
|
||||
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = args.buf }), { bufnr = args.buf })
|
||||
end, { buffer = args.buf, desc = "Toggle Inlay Hints" })
|
||||
end
|
||||
|
||||
-- Document highlights
|
||||
if client.server_capabilities.documentHighlightProvider then
|
||||
vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
|
||||
buffer = args.buf,
|
||||
callback = vim.lsp.buf.document_highlight,
|
||||
})
|
||||
vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
|
||||
buffer = args.buf,
|
||||
callback = vim.lsp.buf.clear_references,
|
||||
})
|
||||
end
|
||||
end,
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
local function setup_keymaps(bufnr)
|
||||
local fzf = require("fzf-lua")
|
||||
local opts = { buffer = bufnr }
|
||||
|
||||
-- Basic LSP
|
||||
nmap("K", vim.lsp.buf.hover, vim.tbl_extend("force", opts, { desc = "Hover Doc" }))
|
||||
nmap("<C-h>", vim.lsp.buf.signature_help, vim.tbl_extend("force", opts, { desc = "Signature Help" }))
|
||||
nmap("<leader>r", vim.lsp.buf.rename, vim.tbl_extend("force", opts, { desc = "Rename" }))
|
||||
nmap("<leader>ca", vim.lsp.buf.code_action, vim.tbl_extend("force", opts, { desc = "Code Action" }))
|
||||
|
||||
-- Navigation
|
||||
nmap("gd", fzf.lsp_definitions, vim.tbl_extend("force", opts, { desc = "Go to Definition" }))
|
||||
nmap("gr", fzf.lsp_references, vim.tbl_extend("force", opts, { desc = "Go to References" }))
|
||||
nmap("gD", vim.lsp.buf.declaration, vim.tbl_extend("force", opts, { desc = "Go to Declaration" }))
|
||||
nmap("gi", fzf.lsp_implementations, vim.tbl_extend("force", opts, { desc = "Go to Implementation" }))
|
||||
nmap("gt", fzf.lsp_typedefs, vim.tbl_extend("force", opts, { desc = "Go to Type Definition" }))
|
||||
|
||||
-- Diagnostics
|
||||
nmap("vd", vim.diagnostic.open_float, vim.tbl_extend("force", opts, { desc = "View Diagnostics" }))
|
||||
nmap("<leader>dl", fzf.diagnostics_document, vim.tbl_extend("force", opts, { desc = "Document Diagnostics" }))
|
||||
nmap("<leader>dw", fzf.diagnostics_workspace, vim.tbl_extend("force", opts, { desc = "Workspace Diagnostics" }))
|
||||
nmap("<leader>ds", fzf.lsp_document_symbols, vim.tbl_extend("force", opts, { desc = "Document Symbols" }))
|
||||
nmap("<leader>ws", fzf.lsp_workspace_symbols, vim.tbl_extend("force", opts, { desc = "Workspace Symbols" }))
|
||||
|
||||
-- LSP management
|
||||
nmap("<leader>lr", function()
|
||||
local clients = vim.lsp.get_clients({ bufnr = bufnr })
|
||||
if #clients == 0 then
|
||||
vim.notify("No LSP clients attached to buffer", vim.log.levels.WARN)
|
||||
return
|
||||
end
|
||||
|
||||
local client_names = {}
|
||||
for _, client in ipairs(clients) do
|
||||
table.insert(client_names, client.name)
|
||||
vim.cmd("LspRestart " .. client.name)
|
||||
end
|
||||
vim.notify("Restarted LSP clients: " .. table.concat(client_names, ", "), vim.log.levels.INFO)
|
||||
end, vim.tbl_extend("force", opts, { desc = "Restart LSP" }))
|
||||
nmap("<leader>li", ":LspInfo<CR>", vim.tbl_extend("force", opts, { desc = "LSP Info" }))
|
||||
end
|
||||
|
||||
function M.config()
|
||||
require("mason").setup({ max_concurrent_installers = 4 })
|
||||
require("fidget").setup({})
|
||||
|
||||
local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview
|
||||
function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
|
||||
opts = opts or {}
|
||||
opts.border = opts.border or "rounded"
|
||||
opts.max_width = opts.max_width or 80
|
||||
opts.max_height = opts.max_height or 20
|
||||
return orig_util_open_floating_preview(contents, syntax, opts, ...)
|
||||
end
|
||||
|
||||
-- Diagnostics
|
||||
vim.diagnostic.config({
|
||||
virtual_text = { spacing = 2, source = "if_many" },
|
||||
float = { border = "rounded", source = "if_many" },
|
||||
severity_sort = true,
|
||||
signs = vim.g.have_nerd_font and {
|
||||
text = {
|
||||
[vim.diagnostic.severity.ERROR] = "",
|
||||
[vim.diagnostic.severity.WARN] = "",
|
||||
[vim.diagnostic.severity.INFO] = "",
|
||||
[vim.diagnostic.severity.HINT] = "",
|
||||
},
|
||||
} or {},
|
||||
})
|
||||
|
||||
local servers = {
|
||||
"gopls",
|
||||
"jsonls",
|
||||
"lua_ls",
|
||||
"yamlls",
|
||||
"graphql",
|
||||
"html",
|
||||
"omnisharp",
|
||||
"svelte",
|
||||
"vtsls",
|
||||
"ccls",
|
||||
"templ",
|
||||
}
|
||||
|
||||
local tools = {
|
||||
"prettierd",
|
||||
"shfmt",
|
||||
"stylua",
|
||||
"latexindent",
|
||||
"clang-format",
|
||||
"csharpier",
|
||||
"quick-lint-js",
|
||||
}
|
||||
|
||||
local mason_unsupported = { "ccls" }
|
||||
|
||||
local mason_servers = vim.tbl_filter(function(server)
|
||||
return not vim.tbl_contains(mason_unsupported, server)
|
||||
end, servers)
|
||||
|
||||
require("mason-lspconfig").setup({
|
||||
ensure_installed = mason_servers,
|
||||
automatic_installation = true,
|
||||
automatic_enable = true,
|
||||
})
|
||||
require("mason-tool-installer").setup({ ensure_installed = tools })
|
||||
|
||||
vim.lsp.enable(servers)
|
||||
|
||||
-- LSP Attach
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
group = vim.api.nvim_create_augroup("UserLspConfig", { clear = true }),
|
||||
callback = function(args)
|
||||
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
||||
if not client then
|
||||
return
|
||||
end
|
||||
|
||||
setup_keymaps(args.buf)
|
||||
|
||||
-- Inlay hints
|
||||
if client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, args.buf) then
|
||||
nmap("<leader>th", function()
|
||||
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = args.buf }), { bufnr = args.buf })
|
||||
end, { buffer = args.buf, desc = "Toggle Inlay Hints" })
|
||||
end
|
||||
|
||||
-- Document highlights
|
||||
if client.server_capabilities.documentHighlightProvider then
|
||||
vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
|
||||
buffer = args.buf,
|
||||
callback = vim.lsp.buf.document_highlight,
|
||||
})
|
||||
vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
|
||||
buffer = args.buf,
|
||||
callback = vim.lsp.buf.clear_references,
|
||||
})
|
||||
end
|
||||
end,
|
||||
})
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ local M = {
|
|||
require("mini.surround").setup({})
|
||||
end,
|
||||
},
|
||||
|
||||
{
|
||||
"echasnovski/mini.statusline",
|
||||
version = false,
|
||||
|
|
@ -37,16 +38,42 @@ local M = {
|
|||
MiniStatusline.section_codeium = function(args)
|
||||
args = args or {}
|
||||
local trunc_width = args.trunc_width or 75
|
||||
if MiniStatusline.is_truncated(trunc_width) then
|
||||
return ""
|
||||
end
|
||||
local status = vim.fn["codeium#GetStatusString"]()
|
||||
if status and status ~= "" then
|
||||
local icon = args.icon or " "
|
||||
return icon .. status
|
||||
end
|
||||
return ""
|
||||
end
|
||||
|
||||
MiniStatusline.section_worktree = function(args)
|
||||
args = args or {}
|
||||
local trunc_width = args.trunc_width or 75
|
||||
if MiniStatusline.is_truncated(trunc_width) then
|
||||
return ""
|
||||
end
|
||||
|
||||
local status = vim.fn["codeium#GetStatusString"]()
|
||||
-- Get current directory
|
||||
local cwd = vim.fn.getcwd()
|
||||
|
||||
if status and status ~= "" then
|
||||
local icon = args.icon or " "
|
||||
return icon .. status
|
||||
-- Run git worktree list to check if we're in a worktree
|
||||
local handle = io.popen("git worktree list 2>/dev/null")
|
||||
if not handle then
|
||||
return ""
|
||||
end
|
||||
|
||||
local output = handle:read("*a")
|
||||
handle:close()
|
||||
|
||||
for line in output:gmatch("[^\n]+") do
|
||||
local path, branch = line:match("^([^%s]+)%s+%[?([^%]]*)")
|
||||
if path and path == cwd and branch and branch ~= "" then
|
||||
local icon = args.icon or "🌿 "
|
||||
return icon .. branch
|
||||
end
|
||||
end
|
||||
|
||||
return ""
|
||||
|
|
@ -63,6 +90,7 @@ local M = {
|
|||
local location = MiniStatusline.section_location({ trunc_width = 75 })
|
||||
local search = MiniStatusline.section_searchcount({ trunc_width = 75 })
|
||||
local codeium = MiniStatusline.section_codeium({ trunc_width = 75 })
|
||||
local worktree = MiniStatusline.section_worktree({ trunc_width = 75 })
|
||||
|
||||
return MiniStatusline.combine_groups({
|
||||
{ hl = mode_hl, strings = { mode } },
|
||||
|
|
@ -70,7 +98,7 @@ local M = {
|
|||
"%<", -- Mark general truncate point
|
||||
{ hl = "MiniStatuslineFilename", strings = { filename } },
|
||||
"%=", -- End left alignment
|
||||
{ hl = "MiniStatuslineFileinfo", strings = { fileinfo } },
|
||||
{ hl = "MiniStatuslineFileinfo", strings = { fileinfo, worktree } },
|
||||
{ hl = mode_hl, strings = { codeium, search, location } },
|
||||
})
|
||||
end
|
||||
|
|
|
|||
6
lua/plugins/typ.lua
Normal file
6
lua/plugins/typ.lua
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
return {
|
||||
"chomosuke/typst-preview.nvim",
|
||||
ft = "typst",
|
||||
version = "1.*",
|
||||
opts = {},
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue