diff options
| -rw-r--r-- | lazy-lock.json | 18 | ||||
| -rw-r--r-- | lua/config/autocmds.lua | 8 | ||||
| -rw-r--r-- | lua/config/native-statusline.lua | 185 | ||||
| -rw-r--r-- | lua/pi/lsp/attach.lua | 2 | ||||
| -rw-r--r-- | lua/pi/lsp/null-ls.lua | 26 | ||||
| -rw-r--r-- | lua/plugins/foatterm.lua | 18 | ||||
| -rw-r--r-- | lua/plugins/noice.lua | 1 |
7 files changed, 165 insertions, 93 deletions
diff --git a/lazy-lock.json b/lazy-lock.json index f646100..dc68f46 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,6 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "CopilotChat.nvim": { "branch": "main", "commit": "ae2f5932983f42d54bee9ff803b5ab157b145787" }, + "CopilotChat.nvim": { "branch": "main", "commit": "1d8aa27e2317950b0b7ddc023487c6f2b7b074ca" }, "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, @@ -12,7 +12,7 @@ "blink-cmp-latex": { "branch": "main", "commit": "3a958361e275bb5996e8393e7b2595b2f40c15ca" }, "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, "buffer_manager.nvim": { "branch": "main", "commit": "4ae0b2de328ef1a7effad830d716c231fe9a6af2" }, - "codecompanion.nvim": { "branch": "main", "commit": "dfd894a3888a87725eb6285b97bb69f7d8e07824" }, + "codecompanion.nvim": { "branch": "main", "commit": "2b5aea7a371af96a08e984b42795ce8f5ae70e49" }, "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" }, "composer.nvim": { "branch": "main", "commit": "ec9537969adc7fc128cfe9c3a9925850455896c8" }, "copilot.lua": { "branch": "master", "commit": "e73fe7c43c68aeb84fbeed12ee6cc60a29e78fbb" }, @@ -23,13 +23,12 @@ "floaterm": { "branch": "main", "commit": "ae3de018d20dccd9372bbff7137e8a6d6030f69e" }, "flutter-tools.nvim": { "branch": "main", "commit": "65b7399804315a1160933b64292d3c5330aa4e9f" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "fzf": { "branch": "master", "commit": "59dc7f178f9ef6fa1d10bc4e0637a2254c6f3868" }, - "fzf-lua": { "branch": "main", "commit": "96dede0bca5cc24868df7c8b46b5a32b89c2f19d" }, + "fzf": { "branch": "master", "commit": "416aff86e9d550d0a34af9d3cc12dfede25354c3" }, + "fzf-lua": { "branch": "main", "commit": "091bcd0c925199b1371ea81ec79278611d299627" }, "fzf.vim": { "branch": "master", "commit": "3725f364ccd25b85a91970720ba9bc2931861910" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "guihua.lua": { "branch": "master", "commit": "87bea7b98429405caf2a0ce4d029b027bb017c70" }, - "hurl.nvim": { "branch": "main", "commit": "33ff81c0027c1d0071174eb40257010c7ce61e62" }, "hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" }, "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" }, "image.nvim": { "branch": "main", "commit": "acbd1d7d64ac0643021a6146eb0557e7c2e793d0" }, @@ -37,12 +36,12 @@ "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "indent-o-matic": { "branch": "master", "commit": "4d11e98f523d3c4500b1dc33f0d1a248a4f69719" }, "json-nvim": { "branch": "master", "commit": "beb76a5ffa0a936677695bc82cc868654aad4398" }, - "laravel.nvim": { "branch": "main", "commit": "ea41c6d46bfff2fab0a78b7370fdbc335a0a8101" }, + "laravel.nvim": { "branch": "main", "commit": "ae0f3794fed6b6bee632eabe40a9057b7075587f" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, "markdown-preview.nvim": { "branch": "main", "commit": "cc05a30393e2bf9f12e2d59fc35a1aa928ed1727" }, - "markview.nvim": { "branch": "main", "commit": "4e5f93e054b1c3dce026731dfcea1e44b0941137" }, + "markview.nvim": { "branch": "main", "commit": "e6b0f5aee8105adab6077509c46459812db4cffa" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, @@ -57,7 +56,7 @@ "navigator.lua": { "branch": "master", "commit": "f5dad314dadfa742127d820ed233265d71670ee9" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" }, - "neorg": { "branch": "main", "commit": "790b0444c0c654131a722817dc893332e06c72b9" }, + "neorg": { "branch": "main", "commit": "bc99b8669e4c99e7d4d6ea54fb6fdb28ab8c58b7" }, "neotest": { "branch": "master", "commit": "35a59c1f59dbb954d92b74ab64a966a668cea495" }, "neotest-go": { "branch": "main", "commit": "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6" }, "neotest-plenary": { "branch": "master", "commit": "3523adcf9ffaad1911960c5813b0136c1b63a2ec" }, @@ -80,7 +79,7 @@ "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, "nvim-early-retirement": { "branch": "main", "commit": "1a5b09db3874f9e2c5b3f332b372c8cc972370f8" }, - "nvim-lspconfig": { "branch": "master", "commit": "f8474abbe3f0cf7cf2476331313b583207787148" }, + "nvim-lspconfig": { "branch": "master", "commit": "cb4765526f7201ce4ff0c49888f80c18da614e68" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" }, "nvim-python-repl": { "branch": "main", "commit": "952a4e26f0492ceea0054f274bde2702e506b87d" }, @@ -99,7 +98,6 @@ "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "rayso.nvim": { "branch": "main", "commit": "4a94c6fa2410e3800cf47a03b8f5e5315595ba99" }, "refactoring.nvim": { "branch": "master", "commit": "74b608dfee827c2372250519d433cc21cb083407" }, "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, "rustowl": { "branch": "main", "commit": "d95b4c5de6a373cf5030794dca1b0bbd83185ce8" }, diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua index 50e8cae..a18bc1a 100644 --- a/lua/config/autocmds.lua +++ b/lua/config/autocmds.lua @@ -38,6 +38,14 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, { end, }) +-- Auto-format C/C++ files with clang-format on save +vim.api.nvim_create_autocmd("BufWritePre", { + pattern = { "*.c", "*.h", "*.cpp", "*.hpp", "*.cc", "*.cxx" }, + callback = function() + vim.lsp.buf.format({ async = false }) + end, +}) + -- Función para alternar el ajuste de línea function ToggleWrap() local wrap = vim.wo.wrap diff --git a/lua/config/native-statusline.lua b/lua/config/native-statusline.lua index c7dea6e..61ac97a 100644 --- a/lua/config/native-statusline.lua +++ b/lua/config/native-statusline.lua @@ -38,8 +38,12 @@ local colors = get_colors() local function create_highlight(name, fg, bg, style) local hl = { fg = fg, bg = bg } if style then - if style:find("bold") then hl.bold = true end - if style:find("italic") then hl.italic = true end + if style:find "bold" then + hl.bold = true + end + if style:find "italic" then + hl.italic = true + end end vim.api.nvim_set_hl(0, name, hl) return "%#" .. name .. "#" @@ -53,93 +57,103 @@ local function setup_highlights() create_highlight("StatuslineModeReplace", colors.red100, colors.base03, "bold") create_highlight("StatuslineModeCommand", colors.yellow100, colors.base03, "bold") create_highlight("StatuslineModeTerminal", colors.orange100, colors.base03, "bold") - + create_highlight("StatuslineBranch", colors.orange100, colors.base03, "bold") create_highlight("StatuslineFilename", colors.yellow100, colors.base03, "bold") create_highlight("StatuslineLSP", colors.base4, colors.base03, "bold") create_highlight("StatuslineFiletype", colors.magenta100, colors.base03, "bold") create_highlight("StatuslineProgress", colors.cyan100, colors.base03, "bold") - + create_highlight("StatuslineGitAdd", colors.green300, colors.base03, "bold") create_highlight("StatuslineGitChange", colors.yellow300, colors.base03, "bold") create_highlight("StatuslineGitDelete", colors.red300, colors.base03, "bold") - + create_highlight("StatuslineDiagError", colors.red300, colors.base03, "bold") create_highlight("StatuslineDiagWarn", colors.yellow300, colors.base03, "bold") create_highlight("StatuslineDiagInfo", colors.blue300, colors.base03, "bold") create_highlight("StatuslineDiagHint", colors.cyan300, colors.base03, "bold") - + create_highlight("StatuslineSeparator", colors.base03, colors.base03, "") end -- Get current mode local function get_mode() local mode_map = { - n = { "NORMAL", "StatuslineModeNormal", " " }, - i = { "INSERT", "StatuslineModeInsert", " " }, + n = { "NORMAL", "StatuslineModeNormal", " " }, + i = { "INSERT", "StatuslineModeInsert", " " }, v = { "VISUAL", "StatuslineModeVisual", " " }, - V = { "V-LINE", "StatuslineModeVisual", " " }, - [""] = { "V-BLOCK", "StatuslineModeVisual", " " }, - c = { "COMMAND", "StatuslineModeCommand", " " }, + V = { "V-LINE", "StatuslineModeVisual", " " }, + ["\22"] = { "V-BLOCK", "StatuslineModeVisual", " " }, -- Ctrl+v visual block mode + c = { "COMMAND", "StatuslineModeCommand", " " }, R = { "REPLACE", "StatuslineModeReplace", " " }, - t = { "TERMINAL", "StatuslineModeTerminal", " " }, + t = { "TERMINAL", "StatuslineModeTerminal", " " }, } - + local current_mode = vim.fn.mode() local mode_info = mode_map[current_mode] or { "UNKNOWN", "StatuslineModeNormal", " " } - + return "%#" .. mode_info[2] .. "#" .. mode_info[3] .. mode_info[1] .. " " end -- Get git branch local function get_git_branch() - local handle = io.popen("git branch --show-current 2>/dev/null") - if not handle then return "" end - - local branch = handle:read("*l") + local handle = io.popen "git branch --show-current 2>/dev/null" + if not handle then + return "" + end + + local branch = handle:read "*l" handle:close() - + if not branch or branch == "" then return "" end - return "%#StatuslineBranch# " .. branch .. " " + return "%#StatuslineBranch# " .. " " .. branch .. " " end -- Get git diff stats local function get_git_diff() -- Check if we're in a git repository - local handle = io.popen("git rev-parse --is-inside-work-tree 2>/dev/null") - if not handle then return "" end - - local is_git = handle:read("*l") + local handle = io.popen "git rev-parse --is-inside-work-tree 2>/dev/null" + if not handle then + return "" + end + + local is_git = handle:read "*l" handle:close() - - if is_git ~= "true" then return "" end - + + if is_git ~= "true" then + return "" + end + -- Get staged changes - local staged_handle = io.popen("git diff --cached --numstat 2>/dev/null | wc -l") - local added = staged_handle and staged_handle:read("*l") or "0" - if staged_handle then staged_handle:close() end - + local staged_handle = io.popen "git diff --cached --numstat 2>/dev/null | wc -l" + local added = staged_handle and staged_handle:read "*l" or "0" + if staged_handle then + staged_handle:close() + end + -- Get unstaged changes - local unstaged_handle = io.popen("git diff --numstat 2>/dev/null | wc -l") - local modified = unstaged_handle and unstaged_handle:read("*l") or "0" - if unstaged_handle then unstaged_handle:close() end - + local unstaged_handle = io.popen "git diff --numstat 2>/dev/null | wc -l" + local modified = unstaged_handle and unstaged_handle:read "*l" or "0" + if unstaged_handle then + unstaged_handle:close() + end + local result = "" if tonumber(added) and tonumber(added) > 0 then - result = result .. "%#StatuslineGitAdd# +" .. added .. " " + result = result .. "%#StatuslineGitAdd# +" .. added .. " " end if tonumber(modified) and tonumber(modified) > 0 then - result = result .. "%#StatuslineGitChange# ~" .. modified .. " " + result = result .. "%#StatuslineGitChange# ~" .. modified .. " " end - + return result end -- Get filename with path local function get_filename() - local filename = vim.fn.expand("%:t") + local filename = vim.fn.expand "%:t" if filename == "" then filename = "[No Name]" end @@ -148,24 +162,52 @@ end -- Get LSP clients local function get_lsp_clients() - local clients = vim.lsp.get_clients({ bufnr = 0 }) + local clients = vim.lsp.get_clients { bufnr = 0 } if #clients == 0 then return "%#StatuslineLSP#No LSP " end - + + -- Map common LSP names to icons (nerdfonts / devicons style). Add or adjust as you like. + local lsp_icons = { + lua_ls = "", + sumneko_lua = "", + pyright = "", + pylsp = "", + tsserver = "", + denols = "", + rust_analyzer = "", + gopls = "", + clangd = "", + html = "", + cssls = "", + bashls = "", + jsonls = "ﬥ", + tailwindcss = "", + angularls = "", + emmet_ls = "", + ["null-ls"] = "ﳠ", + copilot = "", + } + + local seen = {} local client_names = {} for _, client in ipairs(clients) do - table.insert(client_names, client.name) + local name = client.name or "unknown" + if not seen[name] then + seen[name] = true + local icon = lsp_icons[name] or "" + table.insert(client_names, icon .. " " .. name) + end end - - return "%#StatuslineLSP#" .. table.concat(client_names, ",") .. " " + + return "%#StatuslineLSP#" .. "LSP: " .. table.concat(client_names, ", ") .. " " end -- Get diagnostics local function get_diagnostics() local diagnostics = vim.diagnostic.get(0) local counts = { error = 0, warn = 0, info = 0, hint = 0 } - + for _, diagnostic in ipairs(diagnostics) do if diagnostic.severity == vim.diagnostic.severity.ERROR then counts.error = counts.error + 1 @@ -177,21 +219,23 @@ local function get_diagnostics() counts.hint = counts.hint + 1 end end - + local result = "" + + -- Add icons for each diagnostic type (uses nerdfonts/devicons where available) if counts.error > 0 then - result = result .. "%#StatuslineDiagError# " .. counts.error .. " " + result = result .. "%#StatuslineDiagError# " .. counts.error .. " " end if counts.warn > 0 then - result = result .. "%#StatuslineDiagWarn# " .. counts.warn .. " " + result = result .. "%#StatuslineDiagWarn# " .. counts.warn .. " " end if counts.info > 0 then - result = result .. "%#StatuslineDiagInfo# " .. counts.info .. " " + result = result .. "%#StatuslineDiagInfo# " .. counts.info .. " " end if counts.hint > 0 then - result = result .. "%#StatuslineDiagHint# " .. counts.hint .. " " + result = result .. "%#StatuslineDiagHint# " .. counts.hint .. " " end - + return result end @@ -206,8 +250,8 @@ end -- Get progress (line/total) local function get_progress() - local current = vim.fn.line(".") - local total = vim.fn.line("$") + local current = vim.fn.line "." + local total = vim.fn.line "$" local percentage = math.floor((current / total) * 100) return "%#StatuslineProgress#" .. percentage .. "%% " end @@ -219,39 +263,44 @@ end -- Build the statusline function M.build_statusline() - local left = get_mode() .. separator() .. - get_git_branch() .. separator() .. - get_git_diff() .. separator() .. - get_filename() - - local right = get_diagnostics() .. separator() .. - get_lsp_clients() .. separator() .. - get_filetype() .. separator() .. - get_progress() - + local left = get_mode() + .. separator() + .. get_git_branch() + .. separator() + .. get_git_diff() + .. separator() + .. get_filetype() + .. get_filename() + + local right = get_diagnostics() .. separator() .. get_lsp_clients() .. separator() .. get_progress() + return left .. "%=" .. right end -- Setup function function M.setup() setup_highlights() - + -- Set up autocommands to refresh statusline vim.api.nvim_create_augroup("NativeStatusline", { clear = true }) - + -- Update statusline on various events vim.api.nvim_create_autocmd({ - "VimEnter", "WinEnter", "BufEnter", "ModeChanged", "DiagnosticChanged" + "VimEnter", + "WinEnter", + "BufEnter", + "ModeChanged", + "DiagnosticChanged", }, { group = "NativeStatusline", callback = function() vim.opt.statusline = M.build_statusline() end, }) - + -- Set initial statusline vim.opt.statusline = M.build_statusline() - + -- Always show statusline vim.opt.laststatus = 2 end diff --git a/lua/pi/lsp/attach.lua b/lua/pi/lsp/attach.lua index 24842fe..c61f5a1 100644 --- a/lua/pi/lsp/attach.lua +++ b/lua/pi/lsp/attach.lua @@ -26,7 +26,7 @@ return function(client, bufnr) telescope_mapper("gr", "lsp_references", { buffer = true, desc = "LSP References of symbol on cursor" }) telescope_mapper("<leader>pv", "find_symbol", { buffer = true, desc = "LSP find symbol on the project" }) telescope_mapper("<leader>pd", "lsp_document_symbols", { buffer = true, desc = "LSP document symbols" }) - telescope_mapper("gd", "lsp_definitions", { buffer = true, desc = "LSP go to definition" }) + telescope_mapper("<C-S-[>", "lsp_definitions", { buffer = true, desc = "LSP go to definition" }) vim.bo.omnifunc = "v:lua.vim.lsp.omnifunc" diff --git a/lua/pi/lsp/null-ls.lua b/lua/pi/lsp/null-ls.lua index a9c4412..7e7888d 100644 --- a/lua/pi/lsp/null-ls.lua +++ b/lua/pi/lsp/null-ls.lua @@ -5,19 +5,19 @@ local null_ls = require "null-ls" null_ls.setup { sources = { -- null_ls.builtins.code_actions.gitsigns, - require("none-ls.formatting.jq"), - require("none-ls.diagnostics.cpplint"), - require("none-ls.code_actions.eslint"), + require "none-ls.formatting.jq", + -- require("none-ls.diagnostics.cpplint"), + require "none-ls.code_actions.eslint", null_ls.builtins.code_actions.refactoring, null_ls.builtins.formatting.alejandra, - require("none-ls-luacheck.diagnostics.luacheck"), + require "none-ls-luacheck.diagnostics.luacheck", null_ls.builtins.formatting.stylua, - require("none-ls.diagnostics.yamllint"), + require "none-ls.diagnostics.yamllint", -- require("none-ls.diagnostics.ruff"), -- require("none-ls.diagnostics.flake8"), - require("none-ls-shellcheck.diagnostics"), - require("none-ls-shellcheck.code_actions"), + require "none-ls-shellcheck.diagnostics", + require "none-ls-shellcheck.code_actions", -- null_ls.builtins.diagnostics.yamllint, -- php_actions.getter_setter, @@ -38,17 +38,17 @@ null_ls.setup { end, }, null_ls.builtins.formatting.pint, - -- null_ls.builtins.formatting.clang_format, - null_ls.builtins.formatting.clang_format.with { - extra_args = { "--style={IndentWidth: 4}" }, - }, + null_ls.builtins.formatting.clang_format, + -- null_ls.builtins.formatting.clang_format.with { + -- extra_args = { "--style={IndentWidth: 4}" }, + -- }, }, } -vim.keymap.set({ "n", "v" }, "<leader>vca", vim.lsp.buf.code_action, {desc = "LSP (null ls) Code actions"}) +vim.keymap.set({ "n", "v" }, "<leader>vca", vim.lsp.buf.code_action, { desc = "LSP (null ls) Code actions" }) vim.keymap.set("n", "<leader>vf", function() return vim.lsp.buf.format { async = true } -end, {desc = "LSP (null ls) Format file"}) +end, { desc = "LSP (null ls) Format file" }) -- function to toogle and possible restart it vim.api.nvim_create_user_command("NullLsToggle", function() diff --git a/lua/plugins/foatterm.lua b/lua/plugins/foatterm.lua index 708241a..a6c64b5 100644 --- a/lua/plugins/foatterm.lua +++ b/lua/plugins/foatterm.lua @@ -1,6 +1,22 @@ return { "nvzone/floaterm", dependencies = "nvzone/volt", - opts = {}, + opts = { + border = false, + size = { h = 40, w = 70 }, + -- to use, make this func(buf) + position = { row = 50, col = 35 }, + show_sidebar = false, -- oculta el sidebar + show_bar = false, -- oculta la barra + mappings = { sidebar = nil, term = nil }, + + -- Default sets of terminals you'd like to open + terminals = { + { name = "Terminal" }, + -- cmd can be function too + -- { name = "Terminal", cmd = "neofetch" }, + -- More terminals + }, + }, cmd = "FloatermToggle", } diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua index 314db31..033db3c 100644 --- a/lua/plugins/noice.lua +++ b/lua/plugins/noice.lua @@ -4,6 +4,7 @@ return { "MunifTanjim/nui.nvim", }, event = "VeryLazy", + enabled = not vim.g.started_by_firenvim, opts = { cmdline = { enabled = true, -- enables the Noice cmdline UI |