diff options
| author | 2026-02-25 15:23:18 +0000 | |
|---|---|---|
| committer | 2026-02-25 16:35:14 +0000 | |
| commit | 518fd1b15173d224f20ac74ea2d0f139723ca1b2 (patch) | |
| tree | 4b188ed1a507c451417e17f1e650e72f8e35929e | |
| parent | 61651e4db4c3d4b1da14f0734d917022ff77e991 (diff) | |
nvim completo!
| -rw-r--r-- | nvim/init.lua | 36 | ||||
| -rw-r--r-- | nvim/lazy-lock.json | 18 | ||||
| -rw-r--r-- | nvim/lua/config/keymap.lua | 1 | ||||
| -rw-r--r-- | nvim/lua/plugins/blink-cmp.lua | 2 | ||||
| -rw-r--r-- | nvim/lua/plugins/comment.lua | 6 | ||||
| -rw-r--r-- | nvim/lua/plugins/flash.lua | 16 | ||||
| -rw-r--r-- | nvim/lua/plugins/gitsigns.lua | 3 | ||||
| -rw-r--r-- | nvim/lua/plugins/lsp-format.lua | 16 | ||||
| -rw-r--r-- | nvim/lua/plugins/lsp.lua | 35 | ||||
| -rw-r--r-- | nvim/lua/plugins/mini-nvim.lua | 31 | ||||
| -rw-r--r-- | nvim/lua/plugins/mini-pairs.lua | 1 | ||||
| -rw-r--r-- | nvim/lua/plugins/mini-statusline.lua | 1 | ||||
| -rw-r--r-- | nvim/lua/plugins/none-ls.lua | 14 | ||||
| -rw-r--r-- | nvim/lua/plugins/nvim-lspconfig.lua | 3 | ||||
| -rw-r--r-- | nvim/lua/plugins/nvim-treesitter.lua | 20 | ||||
| -rw-r--r-- | nvim/lua/plugins/oil-nvim.lua | 31 | ||||
| -rw-r--r-- | nvim/lua/plugins/quicker.lua | 13 | ||||
| -rw-r--r-- | nvim/lua/plugins/render-markdown.lua | 13 | ||||
| -rw-r--r-- | nvim/lua/plugins/todo-comments.lua | 9 |
19 files changed, 185 insertions, 84 deletions
diff --git a/nvim/init.lua b/nvim/init.lua index 931af56..05dd72a 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -3,37 +3,17 @@ require("config.keymap") require("config.lsp") require("mini.pairs").setup() require("mini.statusline").setup() +require("mini.tabline").setup() +require("mini.surround").setup() +require("mini.bracketed").setup() +require("mini.ai").setup() +require("mini.align").setup() require("lsp-format").setup() require("neoclip").setup() require("which-key").setup() require("nvim-web-devicons").setup() +require("gitsigns").setup() +require("Comment").setup() +require("null-ls").setup() vim.cmd("colorscheme modus_vivendi") - --- plugins = { --- gitsigns.enable = true; --- none-ls = { --- enable = true; --- sources.formatting.prettier = { --- enable = true; --- disableTsServerFormatter = true; --- }; --- }; --- render-markdown.enable = true; --- nui.enable = true; --- dap.enable = true; --- comment.enable = true; --- overseer.enable = true; --- oil.enable = true; --- oil-git-status.enable = true; --- flash.enable = true; --- quicker.enable = true; --- mini-ai.enable = true; --- mini-pairs.enable = true; --- mini-surround.enable = true; --- mini-bracketed.enable = true; --- mini-tabline.enable = true; --- mini-align.enable = true; --- mini-statusline.enable = true; --- todo-comments.enable = true; --- }; diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index eb78156..87e3deb 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,19 +1,31 @@ { + "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, + "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, + "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lsp-format.nvim": { "branch": "master", "commit": "42d1d3e407c846d95f84ea3767e72ed6e08f7495" }, - "mini.icons": { "branch": "main", "commit": "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e" }, + "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" }, + "mini.align": { "branch": "main", "commit": "60c61c8c63dca41b5ac6bfc36b52df69b1a03e6b" }, + "mini.bracketed": { "branch": "main", "commit": "e50e3abcf6a3a5d234f58e4a247dfb3035f30a65" }, "mini.pairs": { "branch": "main", "commit": "d5a29b6254dad07757832db505ea5aeab9aad43a" }, "mini.statusline": { "branch": "main", "commit": "14919901649d20d020e659c63c03baa75cd94f33" }, + "mini.surround": { "branch": "main", "commit": "88c52297ed3e69ecf9f8652837888ecc727a28ee" }, + "mini.tabline": { "branch": "main", "commit": "caf23615b9b99bacc79ecd60f61c4e6a8ec18c84" }, "modus-themes.nvim": { "branch": "master", "commit": "c57c2c56c9f0af04f3b609d11caa840880074784" }, "nix-develop.nvim": { "branch": "main", "commit": "bfba63d6c129d8b5073fe9eb965c9acee04becb0" }, + "none-ls.nvim": { "branch": "main", "commit": "f61f46ded0ca9edce7a09b674f8e162d10921426" }, "nvim-lspconfig": { "branch": "master", "commit": "ab5139c99df944479e5a26495a37840fcbb1d512" }, "nvim-neoclip.lua": { "branch": "main", "commit": "831a97c7697736411a05ff8b91e8798ea4c2d6fb" }, - "nvim-treesitter": { "branch": "main", "commit": "d660b7c002f3922b6bb3da47206645488a698426" }, - "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" }, + "nvim-treesitter": { "branch": "main", "commit": "67d0fd3e0a2a985a4c66461dfd7ab94e499dee38" }, + "nvim-web-devicons": { "branch": "master", "commit": "16d919d768b5bc2921bd7d5a4ee76f158f7ea1c0" }, + "oil-git-status.nvim": { "branch": "main", "commit": "a3e2ccb00cb8822115e28a9a1791eda051d940c9" }, "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "quicker.nvim": { "branch": "master", "commit": "2d3f3276eab9352c7b212821c218aca986929f62" }, + "render-markdown.nvim": { "branch": "main", "commit": "1c958131c083c8557ea499fdb08c88b8afb05c4e" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" }, + "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/nvim/lua/config/keymap.lua b/nvim/lua/config/keymap.lua index c6f4762..7d2fad0 100644 --- a/nvim/lua/config/keymap.lua +++ b/nvim/lua/config/keymap.lua @@ -2,6 +2,5 @@ vim.keymap.set("n", " ", "<Nop>", { silent = true, remap = false }) vim.keymap.set("n", "<Esc>", "<Cmd>noh<CR>", { silent = true, remap = true }) vim.keymap.set("n", "<Leader>x", "<Cmd>x<CR>", { silent = true, remap = true }) -vim.keymap.set("n", "<Leader>q", "<Cmd>q<CR>", { silent = true, remap = true }) vim.keymap.set("n", "<Leader>w", "<Cmd>update<CR>", { silent = true, remap = true }) vim.keymap.set("n", "<Leader>L", "<Cmd>Lazy<CR>", { silent = true, remap = true }) diff --git a/nvim/lua/plugins/blink-cmp.lua b/nvim/lua/plugins/blink-cmp.lua index c4caf79..43d11fe 100644 --- a/nvim/lua/plugins/blink-cmp.lua +++ b/nvim/lua/plugins/blink-cmp.lua @@ -40,7 +40,7 @@ return { -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"` -- -- See the fuzzy documentation for more information - fuzzy = { implementation = "prefer_rust_with_warning" } + fuzzy = { implementation = "lua" } }, opts_extend = { "sources.default" } } diff --git a/nvim/lua/plugins/comment.lua b/nvim/lua/plugins/comment.lua new file mode 100644 index 0000000..1871cef --- /dev/null +++ b/nvim/lua/plugins/comment.lua @@ -0,0 +1,6 @@ +return { + 'numToStr/Comment.nvim', + opts = { + -- add any options here + } +} diff --git a/nvim/lua/plugins/flash.lua b/nvim/lua/plugins/flash.lua new file mode 100644 index 0000000..ff8f515 --- /dev/null +++ b/nvim/lua/plugins/flash.lua @@ -0,0 +1,16 @@ +return { + "folke/flash.nvim", + event = "VeryLazy", + ---@type Flash.Config + opts = { + modes = { + search = { + enabled = true, + }, + }, + }, + keys = { + { ";", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, + { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, + }, +} diff --git a/nvim/lua/plugins/gitsigns.lua b/nvim/lua/plugins/gitsigns.lua new file mode 100644 index 0000000..92361c2 --- /dev/null +++ b/nvim/lua/plugins/gitsigns.lua @@ -0,0 +1,3 @@ +return { + "lewis6991/gitsigns.nvim", +} diff --git a/nvim/lua/plugins/lsp-format.lua b/nvim/lua/plugins/lsp-format.lua deleted file mode 100644 index 22565dc..0000000 --- a/nvim/lua/plugins/lsp-format.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "lukas-reineke/lsp-format.nvim", - opts = { - yaml = { - exclude = { "none-ls" }, - }, - }, -} --- lsp-format = { --- enable = true; --- settings = { --- yaml = { --- exclude = [ "none-ls" ]; --- }; --- }; --- }; diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua new file mode 100644 index 0000000..a903819 --- /dev/null +++ b/nvim/lua/plugins/lsp.lua @@ -0,0 +1,35 @@ +return { + { + "neovim/nvim-lspconfig", + }, + { + "lukas-reineke/lsp-format.nvim", + opts = { + yaml = { + exclude = { + "none-ls", + }, + }, + }, + }, + { + 'nvim-treesitter/nvim-treesitter', + lazy = false, + build = ':TSUpdate', + opts = { + ensure_installed = { + "zig", + "rust", + "java", + "nix", + "yaml", + "typescript", + "javascript", + "lua", + }, + incremental_selection = { + enable = true, + }, + }, + }, +} diff --git a/nvim/lua/plugins/mini-nvim.lua b/nvim/lua/plugins/mini-nvim.lua new file mode 100644 index 0000000..56c961a --- /dev/null +++ b/nvim/lua/plugins/mini-nvim.lua @@ -0,0 +1,31 @@ +return { + { + 'nvim-mini/mini.pairs', + version = '*', + lazy = false + }, + { + 'nvim-mini/mini.statusline', + version = '*' + }, + { + 'nvim-mini/mini.surround', + version = '*' + }, + { + 'nvim-mini/mini.bracketed', + version = '*' + }, + { + 'nvim-mini/mini.ai', + version = '*' + }, + { + 'nvim-mini/mini.tabline', + version = '*' + }, + { + 'nvim-mini/mini.align', + version = '*' + }, +} diff --git a/nvim/lua/plugins/mini-pairs.lua b/nvim/lua/plugins/mini-pairs.lua deleted file mode 100644 index f20cec9..0000000 --- a/nvim/lua/plugins/mini-pairs.lua +++ /dev/null @@ -1 +0,0 @@ -return { 'nvim-mini/mini.pairs', version = '*', lazy = false} diff --git a/nvim/lua/plugins/mini-statusline.lua b/nvim/lua/plugins/mini-statusline.lua deleted file mode 100644 index 4f16584..0000000 --- a/nvim/lua/plugins/mini-statusline.lua +++ /dev/null @@ -1 +0,0 @@ -return { 'nvim-mini/mini.statusline', version = '*' } diff --git a/nvim/lua/plugins/none-ls.lua b/nvim/lua/plugins/none-ls.lua new file mode 100644 index 0000000..fd28379 --- /dev/null +++ b/nvim/lua/plugins/none-ls.lua @@ -0,0 +1,14 @@ +-- ripped from https://www.lazyvim.org/extras/lsp/none-ls +return { + "nvimtools/none-ls.nvim", + opts = function(_, opts) + local nls = require("null-ls") + opts.root_dir = opts.root_dir + or require("null-ls.utils").root_pattern(".null-ls-root", ".neoconf.json", "Makefile", ".git") + opts.sources = vim.list_extend(opts.sources or {}, { + nls.builtins.formatting.stylua, + nls.builtins.formatting.alejandra, + nls.builtins.formatting.prettier, + }) + end, +} diff --git a/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/lua/plugins/nvim-lspconfig.lua deleted file mode 100644 index 7687988..0000000 --- a/nvim/lua/plugins/nvim-lspconfig.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "neovim/nvim-lspconfig", -} diff --git a/nvim/lua/plugins/nvim-treesitter.lua b/nvim/lua/plugins/nvim-treesitter.lua deleted file mode 100644 index eb0d2fe..0000000 --- a/nvim/lua/plugins/nvim-treesitter.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - 'nvim-treesitter/nvim-treesitter', - lazy = false, - build = ':TSUpdate', - opts = { - ensure_installed = { - "zig", - "rust", - "java", - "nix", - "yaml", - "typescript", - "javascript", - "lua", - }, - incremental_selection = { - enable = true, - }, - }, -} diff --git a/nvim/lua/plugins/oil-nvim.lua b/nvim/lua/plugins/oil-nvim.lua index af948a3..285b104 100644 --- a/nvim/lua/plugins/oil-nvim.lua +++ b/nvim/lua/plugins/oil-nvim.lua @@ -1,13 +1,24 @@ return { - 'stevearc/oil.nvim', - ---@module 'oil' - ---@type oil.SetupOpts - opts = { - vim.keymap.set("n", "<F2>", "<Cmd>Oil<CR>", { desc = "Open parent directory" }), + { + 'stevearc/oil.nvim', + ---@module 'oil' + ---@type oil.SetupOpts + opts = { + vim.keymap.set("n", "<F2>", "<Cmd>Oil<CR>", { desc = "Open parent directory" }), + }, + -- Optional dependencies + -- dependencies = { { "nvim-mini/mini.icons", opts = {} } }, + dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons + -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. + lazy = false, + }, + { + "refractalize/oil-git-status.nvim", + + dependencies = { + "stevearc/oil.nvim", + }, + + config = true, }, - -- Optional dependencies - dependencies = { { "nvim-mini/mini.icons", opts = {} } }, - -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons - -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. - lazy = false, } diff --git a/nvim/lua/plugins/quicker.lua b/nvim/lua/plugins/quicker.lua new file mode 100644 index 0000000..2fd6aad --- /dev/null +++ b/nvim/lua/plugins/quicker.lua @@ -0,0 +1,13 @@ +return { + 'stevearc/quicker.nvim', + ft = "qf", + ---@module "quicker" + ---@type quicker.SetupOptions + opts = { + vim.keymap.set("n", "<leader>q", function() + require("quicker").toggle() + end, { + desc = "Toggle quickfix", + }) + }, +} diff --git a/nvim/lua/plugins/render-markdown.lua b/nvim/lua/plugins/render-markdown.lua new file mode 100644 index 0000000..7ac5915 --- /dev/null +++ b/nvim/lua/plugins/render-markdown.lua @@ -0,0 +1,13 @@ +return { + 'MeanderingProgrammer/render-markdown.nvim', + dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons + ---@module 'render-markdown' + ---@type render.md.UserConfig + opts = { + completions = { + lsp = { + enabled = true, + }, + }, + }, +} diff --git a/nvim/lua/plugins/todo-comments.lua b/nvim/lua/plugins/todo-comments.lua new file mode 100644 index 0000000..52fc471 --- /dev/null +++ b/nvim/lua/plugins/todo-comments.lua @@ -0,0 +1,9 @@ +return { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + }, +} |
