diff --git a/config/nvim/.github/README.md b/config/nvim/.github/README.md index 55d07ec2..8a99d454 100644 --- a/config/nvim/.github/README.md +++ b/config/nvim/.github/README.md @@ -488,6 +488,7 @@ 🔧 Utility - [zbirenbaum/neodim](https://dotfyle.com/plugins/zbirenbaum/neodim) +- [malbertzard/inline-fold.nvim](https://dotfyle.com/plugins/malbertzard/inline-fold.nvim) - [dmmulroy/ts-error-translator.nvim](https://dotfyle.com/plugins/dmmulroy/ts-error-translator.nvim) - [creativenull/dotfyle-metadata.nvim](https://dotfyle.com/plugins/creativenull/dotfyle-metadata.nvim) - [rasulomaroff/reactive.nvim](https://dotfyle.com/plugins/rasulomaroff/reactive.nvim) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 980b8069..4e485116 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "LazyVim": { "branch": "main", "commit": "e3bfcb9bf74292dc846f5d1710fbb2e8f36a687a" }, "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, - "SchemaStore.nvim": { "branch": "main", "commit": "b788bde023f9fbc2eb86e89d32c0bf98a60ae406" }, + "SchemaStore.nvim": { "branch": "main", "commit": "9fa646ab0b8d411b5f2e415728a99792c62109ac" }, "actions-preview.nvim": { "branch": "master", "commit": "5072b1b1065a6b22bdd46b5c21780a91d6a08071" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, @@ -15,7 +15,7 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "codeium.vim": { "branch": "main", "commit": "5b8f68d5c0e32ae97d073a56ff14dba5646ec223" }, "compiler.nvim": { "branch": "main", "commit": "cb684ac7cfb3872bbdcd64cfc4d3e0c2affaab62" }, - "conform.nvim": { "branch": "master", "commit": "5a15cc46e75cad804fd51ec5af9227aeb1d1bdaa" }, + "conform.nvim": { "branch": "master", "commit": "db2c697fe8302f0328b50b480204be1b577a1e2f" }, "crates.nvim": { "branch": "main", "commit": "535773ed3b321d68ddd6ef8cd5a1e07b345026a6" }, "dashboard-nvim": { "branch": "master", "commit": "413442b12d85315fc626c44a0ce4929b213ef604" }, "dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" }, @@ -26,9 +26,9 @@ "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "garbage-day.nvim": { "branch": "main", "commit": "029214aff15487822fbbbce6c622d1c380a20fed" }, - "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, + "gitsigns.nvim": { "branch": "main", "commit": "41dc075ef67b556b0752ad3967649371bd95cb95" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, - "grapple.nvim": { "branch": "main", "commit": "59d458e378c4884f22b7a68e61c07ed3e41aabf0" }, + "grapple.nvim": { "branch": "main", "commit": "2c54086e6623ed79dec417447d4673bf9dbb97d7" }, "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, "hydra.nvim": { "branch": "master", "commit": "55de54543d673824435930ecf533256eea2e565b" }, "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" }, @@ -37,7 +37,7 @@ "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" }, "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" }, - "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, + "lualine.nvim": { "branch": "master", "commit": "3c55675a7bc170d21d7ea70874ae66fbf5cfb0dc" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "55716a879568a498fa236593c8119789054a3b8e" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, @@ -50,11 +50,11 @@ "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, "multicursors.nvim": { "branch": "main", "commit": "8b3e14682eed06a532b155c7eae33e174846b3fd" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "7f2ebdef3b55374390714ac7c0a7fe6b0dae498a" }, - "neoconf.nvim": { "branch": "main", "commit": "d21739358bca9811f783c9a3d5e91c7b3abc3005" }, + "neoconf.nvim": { "branch": "main", "commit": "cc846d17b034957b7cf49df98632ffa8b9e6a889" }, "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "neogen": { "branch": "main", "commit": "b95347a588401a755eadd17482edc1662876bd58" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" }, + "nui.nvim": { "branch": "main", "commit": "3dc46d725f7b94bee5117c0a699b57b1902b5d65" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, @@ -62,21 +62,21 @@ "nvim-devdocs": { "branch": "master", "commit": "521d24661ffe6d1ba025debea2675c765a9c1ee1" }, "nvim-lint": { "branch": "master", "commit": "e824adb9bc01647f71e55457353a68f0f37f9931" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "99330586c6e1912c890fc39d19d97571fde660cd" }, + "nvim-lspconfig": { "branch": "master", "commit": "4bdd3800b4148f670c6cf55ef65f490148eeb550" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-puppeteer": { "branch": "main", "commit": "d72c7045683c0960e9ae6ae9628d0907b2cab9f3" }, + "nvim-puppeteer": { "branch": "main", "commit": "a5be4f12f0e5df4797f6fb603297a710617e38f6" }, "nvim-recorder": { "branch": "main", "commit": "f37f8e80b32c2a5dca2bd8f6d9dce278b3f5e434" }, "nvim-spectre": { "branch": "master", "commit": "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf" }, - "nvim-treesitter": { "branch": "master", "commit": "488bec03254207b1dd071be8cb1fb78434b6e777" }, + "nvim-treesitter": { "branch": "master", "commit": "8d3176cfbc0e3c5b8eadf4dfc20681878529c3af" }, "nvim-treesitter-context": { "branch": "master", "commit": "b8b7e52c1517d401d7c519787d5dc4528c41291a" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "60e8c288e011403f248b5f6478dde12bed8a6c55" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "f0375e1bdc1b245ae5a7f71272bec17053b1163f" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, - "nvim-various-textobjs": { "branch": "main", "commit": "3782eb41a964f45788843e34f325a470f0dc6757" }, + "nvim-various-textobjs": { "branch": "main", "commit": "6cefba253d69306004a641a11c395381ae428903" }, "nvim-web-devicons": { "branch": "master", "commit": "75df79feb02d5e0ec114e447453775d4d291ea03" }, "nvim_context_vt": { "branch": "master", "commit": "8f7b6b46292e0819290b0d368abc3366b8a163fc" }, - "obsidian.nvim": { "branch": "main", "commit": "979f154090099fc6e31f8bb639a30e2e3e5841d3" }, + "obsidian.nvim": { "branch": "main", "commit": "f68f5c89bec3a175a08123c59db2a89409bd1841" }, "outline.nvim": { "branch": "main", "commit": "a8d40aecb799196303ff3521c0e31c87bba57198" }, "overseer.nvim": { "branch": "master", "commit": "b72f6d23ce47ccd427be2341f389c63448278f17" }, "package-info.nvim": { "branch": "master", "commit": "45acce5b12ce824332d8000cc2c91805b6710446" }, @@ -85,12 +85,11 @@ "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "cfc3f53cfa0fbabd95bd33747288aea24fe45211" }, "refactoring.nvim": { "branch": "master", "commit": "93d69cce9f0cbee8afae5b2380b296323792645f" }, - "rustaceanvim": { "branch": "master", "commit": "c787f5b0fafc29f9487b1314b19515451fd990e7" }, + "rustaceanvim": { "branch": "master", "commit": "5dc35a075ad7c9d2f6493065e1e5970e4ad61504" }, "search-replace.nvim": { "branch": "main", "commit": "d92290a02d97f4e9b8cd60d28b56b403432158d5" }, - "semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" }, - "smart-splits.nvim": { "branch": "master", "commit": "039fb0a5172cc35ffee7cc9d40d9496541609799" }, + "smart-splits.nvim": { "branch": "master", "commit": "b41a4753120b78babb711f2ff9e5fe6b19fc13a7" }, "sqlite.lua": { "branch": "master", "commit": "40701b6151f8883980c1548647116de39b763540" }, - "suda.vim": { "branch": "master", "commit": "257767d7977414210b6db9df0be39b9789d83978" }, + "suda.vim": { "branch": "master", "commit": "66727b416837836712975e748bc8a19fb6cf4ec3" }, "telescope-floaterm.nvim": { "branch": "main", "commit": "ccd3f40ae30dce5de0e5d0f5069e08e7d9ad6d23" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-lazy.nvim": { "branch": "main", "commit": "3487d6212fe1b5750ae239e2207f4cb603004d36" }, diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json index 85c7f89e..0907d30f 100644 --- a/config/nvim/lazyvim.json +++ b/config/nvim/lazyvim.json @@ -1,6 +1,5 @@ { "extras": [ - "lazyvim.plugins.extras.lang.python-semshi", "lazyvim.plugins.extras.lang.yaml", "lazyvim.plugins.extras.ui.edgy", "lazyvim.plugins.extras.util.dot", diff --git a/config/nvim/lua/config/options.lua b/config/nvim/lua/config/options.lua index 1b89d5bb..ce37bfd5 100644 --- a/config/nvim/lua/config/options.lua +++ b/config/nvim/lua/config/options.lua @@ -47,3 +47,5 @@ o.breakindent = true if vim.fn.has("nvim-0.10") == 1 then o.smoothscroll = true end + +o.conceallevel = 2 diff --git a/config/nvim/lua/plugins/extras/formatting/ruff.lua b/config/nvim/lua/plugins/extras/formatting/ruff.lua new file mode 100644 index 00000000..781d00d0 --- /dev/null +++ b/config/nvim/lua/plugins/extras/formatting/ruff.lua @@ -0,0 +1,18 @@ +return { + { + "stevearc/conform.nvim", + opts = function(_, opts) + opts.formatters_by_ft.python = opts.formatters_by_ft.python or {} + table.insert(opts.formatters_by_ft.python, "ruff_format") + table.insert(opts.formatters_by_ft.python, "ruff_fix") + return opts + end, + }, + { + "williamboman/mason.nvim", + opts = function(_, opts) + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "ruff" }) + end, + }, +} diff --git a/config/nvim/lua/plugins/extras/lang/python-extended.lua b/config/nvim/lua/plugins/extras/lang/python-extended.lua index 73e25e3f..b4ab26b7 100644 --- a/config/nvim/lua/plugins/extras/lang/python-extended.lua +++ b/config/nvim/lua/plugins/extras/lang/python-extended.lua @@ -1,13 +1,6 @@ return { { import = "lazyvim.plugins.extras.lang.python" }, - { - "stevearc/conform.nvim", - opts = function(_, opts) - opts.formatters_by_ft.python = opts.formatters_by_ft.python or {} - table.insert(opts.formatters_by_ft.python, "ruff_format") - return opts - end, - }, + { import = "lazyvim.plugins.extras.lang.python-semshi" }, { "neovim/nvim-lspconfig", opts = { diff --git a/config/nvim/lua/plugins/extras/lang/web/tailwind-extended.lua b/config/nvim/lua/plugins/extras/lang/web/tailwind-extended.lua index 3895c820..9d134a24 100644 --- a/config/nvim/lua/plugins/extras/lang/web/tailwind-extended.lua +++ b/config/nvim/lua/plugins/extras/lang/web/tailwind-extended.lua @@ -1,5 +1,6 @@ return { { import = "lazyvim.plugins.extras.lang.tailwind" }, + { import = "plugins.extras.ui.inline-fold" }, { "williamboman/mason.nvim", opts = function(_, opts) diff --git a/config/nvim/lua/plugins/extras/lazyvim/lspconfig.lua b/config/nvim/lua/plugins/extras/lazyvim/lspconfig.lua index db57649d..0e5cf3a2 100644 --- a/config/nvim/lua/plugins/extras/lazyvim/lspconfig.lua +++ b/config/nvim/lua/plugins/extras/lazyvim/lspconfig.lua @@ -38,7 +38,7 @@ return { enabled = nvim_0_10, }, codelens = { - enabled = nvim_0_10, + enabled = false, }, servers = { lua_ls = { diff --git a/config/nvim/lua/plugins/extras/ui/inline-fold.lua b/config/nvim/lua/plugins/extras/ui/inline-fold.lua new file mode 100644 index 00000000..46e47a3e --- /dev/null +++ b/config/nvim/lua/plugins/extras/ui/inline-fold.lua @@ -0,0 +1,28 @@ +return { + "malbertzard/inline-fold.nvim", + init = function() + vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, { + pattern = { "*.html", "*.tsx", "*.jsx" }, + callback = function(_) + if not require("inline-fold.module").isHidden then + vim.cmd("InlineFoldToggle") + end + end, + }) + end, + ft = "html", + cmd = "InlineFoldToggle", + opts = { + defaultPlaceholder = "…", + queries = { + html = { + { pattern = 'class="([^"]*)"' }, + { pattern = 'href="(.-)"' }, + { pattern = 'src="(.-)"' }, + }, + }, + }, + keys = { + { "uI", "InlineFoldToggle", desc = "Toggle Inline Fold" }, + }, +} diff --git a/config/nvim/lua/plugins/extras/util/vscode.lua b/config/nvim/lua/plugins/extras/util/vscode.lua index 124f02cc..2d43eec6 100644 --- a/config/nvim/lua/plugins/extras/util/vscode.lua +++ b/config/nvim/lua/plugins/extras/util/vscode.lua @@ -2,8 +2,7 @@ if not vim.g.vscode then return {} end -local Config = require("lazy.core.config") -local Plugin = require("lazy.core.plugin") +local config = require("lazy.core.config") local vscode = require("vscode-neovim") local map = vim.keymap.set @@ -33,12 +32,13 @@ local enabled = { "LazyVim", } -Config.options.checker.enabled = false -Config.options.change_detection.enabled = false -Config.options.defaults.cond = function(plugin) +config.options.checker.enabled = false +config.options.change_detection.enabled = false +config.options.defaults.cond = function(plugin) return vim.tbl_contains(enabled, plugin.name) or plugin.vscode end +-- Options vim.o.spell = false vim.opt.timeoutlen = 150 -- To show whichkey without delay vim.notify = vscode.notify