diff --git a/lazy-lock.json b/lazy-lock.json index 1abcffc..7900c5c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,52 +2,54 @@ "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "aerial.nvim": { "branch": "master", "commit": "f93dceed41e2f926074944fdf94c93c747bb7d19" }, - "atone.nvim": { "branch": "main", "commit": "e749ff3bc881f628ea8471bdb27bceb7f632af90" }, + "aerial.nvim": { "branch": "master", "commit": "645d108a5242ec7b378cbe643eb6d04d4223f034" }, + "atone.nvim": { "branch": "main", "commit": "08720f4b262350c1467a92c9731b817b8d2eea0f" }, "blink-cmp-git": { "branch": "master", "commit": "10783593af764424018a95e75df6ad5a8b66fe07" }, "blink-emoji.nvim": { "branch": "master", "commit": "066013e4c98a9318408ee3f1ca2dbcb6fa3e4c06" }, - "blink-ripgrep.nvim": { "branch": "main", "commit": "841e530f202c1dd96acc7034478517be3929fc27" }, + "blink-ripgrep.nvim": { "branch": "main", "commit": "419f5eed45c1b433108ee0f6708402ebaa7b4fd1" }, "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, - "catppuccin.nvim": { "branch": "main", "commit": "0a5de4da015a175f416d6ef1eda84661623e0500" }, + "catppuccin.nvim": { "branch": "main", "commit": "12c004cde3f36cb1d57242f1e6aac46b09a0e5b4" }, "ccc.nvim": { "branch": "main", "commit": "9d1a256e006decc574789dfc7d628ca11644d4c2" }, "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" }, "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" }, - "cmake-tools.nvim": { "branch": "master", "commit": "24502aec9166fd6b851762c5930ff316083acd85" }, + "cmake-tools.nvim": { "branch": "master", "commit": "de80d3836ba87a791d3667ccc2aa743a69adffe6" }, "colorful-menu.nvim": { "branch": "master", "commit": "b51a659459df8d078201aefc995db8175ed55e84" }, "colorful-winsep.nvim": { "branch": "main", "commit": "84432d9966fafaa08dd9040c98b0011045d8e964" }, - "conform.nvim": { "branch": "master", "commit": "e969e302bced7ffb9a0a0323629f31feb0ca35a6" }, + "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "crates.nvim": { "branch": "main", "commit": "afcd1cc3eeceb5783676fc8464389b9216a29d05" }, "css-vars.nvim": { "branch": "main", "commit": "0615782c320f729b04d9c51a8a61fb498ee4234a" }, "csvview.nvim": { "branch": "main", "commit": "7022e18a0fbae9aecf99a3ba02b2a541edc2b8a1" }, "darkplus.nvim": { "branch": "master", "commit": "c7fff5ce62406121fc6c9e4746f118b2b2499c4c" }, "darkvoid.nvim": { "branch": "master", "commit": "45be993a5617e05811b6b293c05e6aded7003cc9" }, - "dbab.nvim": { "branch": "main", "commit": "ccbe632fd626eafc82b79bc54438e0c6dfbebf28" }, + "dbab.nvim": { "branch": "main", "commit": "bd1f69a9c4c32be5dcf12ff3be5bd7b18f4670b3" }, "demicolon.nvim": { "branch": "main", "commit": "a9ca137474b3a02e1d6ac48bfdb1985172e2ec9a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dracula.nvim": { "branch": "main", "commit": "ae752c13e95fb7c5f58da4b5123cb804ea7568ee" }, - "flow.nvim": { "branch": "main", "commit": "c1a2f46196a3944a287e7e9b1823e04087bd73b6" }, + "flow.nvim": { "branch": "main", "commit": "1fe4ff584b53298e41a9f8cf108f23967cc9280c" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, "gitignore.nvim": { "branch": "master", "commit": "0344f643768c4d64af4add8c1bdddf6f7d4c9010" }, - "gruvbox.nvim": { "branch": "main", "commit": "561126520034a1dac2f78ab063db025d12555998" }, + "gruvbox.nvim": { "branch": "main", "commit": "334d5fd49fc8033f26408425366c66c6390c57bb" }, "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" }, "http-codes.nvim": { "branch": "main", "commit": "2475bcd6b17eef5ca556e6d7c41ba9c9b2726431" }, "image.nvim": { "branch": "master", "commit": "da2be65c153ba15a14a342b05591652a6df70d58" }, "img-clip.nvim": { "branch": "main", "commit": "b6ddfb97b5600d99afe3452d707444afda658aca" }, "inlay-hint.nvim": { "branch": "main", "commit": "ed1cb46cb960e51300ece1fb7d93c611f8f31615" }, "inlay-hints.nvim": { "branch": "master", "commit": "11be32be3761c6263df2311afb6baa0de0863967" }, + "jsonl.nvim": { "branch": "main", "commit": "b79d8091b6fb72813378d9b0d63079de89d6ccaf" }, "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, "kulala.nvim": { "branch": "main", "commit": "6656c9d332735ca6a27725e0fb45a1715c4372d9" }, "lackluster.nvim": { "branch": "main", "commit": "70dd682e564784893b984deb51dd5ddd263c8cc7" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, + "log-highlight.nvim": { "branch": "main", "commit": "ca88628f6dd3b9bb46f9a7401669e24cf7de47a4" }, "lsp-progress.nvim": { "branch": "main", "commit": "f6d5af10563b895ff846346f57cbd4451439f4c1" }, "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, "lualine-harpoon.nvim": { "branch": "main", "commit": "9ee90e6309c4219d6a06b771b53db6a59c8d32fa" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "markdown.nvim": { "branch": "master", "commit": "093be911d90de03877f3009de36081c1a6242d51" }, - "markview.nvim": { "branch": "main", "commit": "633e627f82011dc888ea4444a98c98bd783951b0" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "6c4830e37743b060d13c9269394176aea6a0fbc8" }, + "markview.nvim": { "branch": "main", "commit": "918f3f92e87d28a487af89912d774521a52f9888" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a324581a3c83fdacdb9804b79de1cbe00ce18550" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "melange.nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" }, @@ -56,8 +58,7 @@ "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" }, "mini.splitjoin": { "branch": "main", "commit": "9fcd8856efb95a505090c3225726466494076127" }, "mini.surround": { "branch": "main", "commit": "88c52297ed3e69ecf9f8652837888ecc727a28ee" }, - "neoconf.nvim": { "branch": "main", "commit": "d50143df970a9bf05088165989a961c6b3e85538" }, - "neocord": { "branch": "main", "commit": "2ebf3792a8100376bb65fd66d5dbf60f50af7529" }, + "neoconf.nvim": { "branch": "main", "commit": "311326c7527781d8f1b7c1ef48a97e61aa355972" }, "neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" }, "neogit": { "branch": "master", "commit": "e106a39a8a37a9420f374545c876f8b52baf1c80" }, "neorg": { "branch": "main", "commit": "408fc04013a95da8f217cb0958a06b6a77c01743" }, @@ -69,41 +70,40 @@ "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "fe9eed4d48f530fc9ffe4d785a936a49fa344e1a" }, - "nvim-dap": { "branch": "master", "commit": "7b11f48753ea6a82f09485dadd08016e2a318cf6" }, - "nvim-dap-python": { "branch": "master", "commit": "bfe572e4458e0ac876b9539a1e9f301c72db8ea0" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "ef211089af881bea206c7aa3f2693a81feee7e90" }, + "nvim-dap": { "branch": "master", "commit": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" }, - "nvim-lspconfig": { "branch": "master", "commit": "ab5139c99df944479e5a26495a37840fcbb1d512" }, + "nvim-lspconfig": { "branch": "master", "commit": "0203a9608d63eda57679b01e69f33a7b4c34b0d1" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-origami": { "branch": "main", "commit": "4a76d70a23b59ec082eb370821cd33d988d99568" }, + "nvim-origami": { "branch": "main", "commit": "e5b527f41d18c2ee5af868e1a3939b60f15fdb90" }, "nvim-silicon": { "branch": "main", "commit": "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" }, + "nvim-treesitter-context": { "branch": "master", "commit": "529ee357b8c03d76ff71233afed68fd0f5fe10b1" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" }, + "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, - "octo.nvim": { "branch": "master", "commit": "5ae580df72589f25b775ff2bdacfd7f7be8d63bd" }, - "oil-git.nvim": { "branch": "main", "commit": "d1f27a5982df35b70fb842aa6bbfac10735c7265" }, + "octo.nvim": { "branch": "master", "commit": "42e547c08433c22c8311d7848998d2d08bfaf77e" }, + "oil-git.nvim": { "branch": "main", "commit": "6c92acdbae04dce8a4a2302c3a5dd264bd337456" }, "oil-lsp-diagnostics.nvim": { "branch": "master", "commit": "282308383d8d8485937aaf3c28b44fa1cb26007a" }, "oil.nvim": { "branch": "master", "commit": "975a77cce3c8cb742bc1b3629f4328f5ca977dad" }, "onedark.nvim": { "branch": "master", "commit": "213c23ae45a04797572242568d5d51937181792d" }, "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "e2858c43caafec291f915ef25fbed27bbe78abbd" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "01993eb20c6cdc1d33e7e98252368840309f99b9" }, "rainbow_csv.nvim": { "branch": "main", "commit": "26de78d8324f7ac6a3e478319d1eb1f17123eb5b" }, "rose-pine.nvim": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" }, "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, - "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, + "snacks.nvim": { "branch": "main", "commit": "9912042fc8bca2209105526ac7534e9a0c2071b2" }, "tailwind-fold.nvim": { "branch": "main", "commit": "e2ba5ee1ca9b74208709fe9d7314b8aa753b26a7" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, "tree-sitter-bruno": { "branch": "main", "commit": "347e99f256930213cd7fcd0efe3f9af83035c4b1" }, - "triforce.nvim": { "branch": "main", "commit": "384e1cf24354137433bd8ada5c9797b568a047be" }, + "triforce.nvim": { "branch": "main", "commit": "a7bc4d677e676f09c95ef7d5cebf5444f6f630b8" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" }, "ts-error-translator.nvim": { "branch": "main", "commit": "558abff11b9e8f4cefc0de09df780c56841c7a4b" }, @@ -113,10 +113,8 @@ "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" }, "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }, "vim-just": { "branch": "main", "commit": "11b0f3177e2854cafa0c4baef5329e7d0f0dccbd" }, - "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-tmux-navigator": { "branch": "master", "commit": "e41c431a0c7b7388ae7ba341f01a0d217eb3a432" }, "vim-wakatime": { "branch": "master", "commit": "d7973b157a632d1edeff01818f18d67e584eeaff" }, - "vimtex": { "branch": "master", "commit": "bcb14eb6e3739f0c1902115a710292bc37c62d2e" }, "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" }, "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" } diff --git a/lua/plugins/colorizer.lua b/lua/plugins/colorizer.lua index 599d4a5..10171ea 100644 --- a/lua/plugins/colorizer.lua +++ b/lua/plugins/colorizer.lua @@ -2,15 +2,14 @@ return { "catgoose/nvim-colorizer.lua", event = "BufReadPre", opts = { - user_default_options = { - names = false, - css = true, - css_fn = true, - tailwind = true, - tailwind_opts = { - update_names = true, + options = { + parsers = { + css = true, + names = false, + css_fn = true, + tailwind = { enable = true, lsp = true, update_name = true }, + sass = { enable = true, parsers = { css = true } }, }, - sass = { enable = true, parsers = { "css" } }, }, }, } diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 66edc97..09cf4e2 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -34,10 +34,13 @@ return { javascript = js, javascriptreact = js, json = { "jq" }, + kdl = { "kdlfmt" }, lua = function() local config_file = vim.fn.getcwd() .. "/*stylua.toml" if vim.fn.exists(config_file) then - return { "stylua" } + return { + "stylua", + } end return {} end, @@ -65,6 +68,13 @@ return { } end, }, + injected = { + condition = function(_, ctx) + return not ctx.filename:match("%.jsonl$") + and not ctx.filename:match("%.ndjson$") + and not ctx.filename:match("%.jsonlines$") + end, + }, }, format_on_save = { timeout_ms = 500, diff --git a/lua/plugins/jsonl.lua b/lua/plugins/jsonl.lua new file mode 100644 index 0000000..9b5612e --- /dev/null +++ b/lua/plugins/jsonl.lua @@ -0,0 +1,6 @@ +return { + "https://codeberg.org/kristoferssolo/jsonl.nvim", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + ft = { "ndjson", "jsonl", "jsonlines" }, + opts = {}, +} diff --git a/lua/plugins/lazydev.lua b/lua/plugins/lazydev.lua index 2995a70..23fe165 100644 --- a/lua/plugins/lazydev.lua +++ b/lua/plugins/lazydev.lua @@ -3,6 +3,8 @@ return { ft = "lua", opts = { library = { + "~/repos/lualine-harpoon.nvim", + "~/Nextcloud/repos/jsonl.nvim", { path = "${3rd}/luv/library", words = { "vim%.uv" } }, }, }, diff --git a/lua/plugins/log-highlighting.lua b/lua/plugins/log-highlighting.lua index d92222d..a56737d 100644 --- a/lua/plugins/log-highlighting.lua +++ b/lua/plugins/log-highlighting.lua @@ -1 +1,5 @@ -return { "mtdl9/vim-log-highlighting", ft = "log" } +return { + "fei6409/log-highlight.nvim", + ft = "log", + opts = {}, +} diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua index 991565f..58a5e2f 100644 --- a/lua/plugins/oil.lua +++ b/lua/plugins/oil.lua @@ -43,8 +43,13 @@ return { }, }, { - "benomahony/oil-git.nvim", + "malewicz1337/oil-git.nvim", dependencies = { "stevearc/oil.nvim" }, + opts = { + show_file_highlights = true, + show_directory_highlights = false, + show_ignored_files = true, + }, }, { "JezerM/oil-lsp-diagnostics.nvim", diff --git a/lua/plugins/triforce.lua b/lua/plugins/triforce.lua index 510a93f..8e27bf5 100644 --- a/lua/plugins/triforce.lua +++ b/lua/plugins/triforce.lua @@ -1,6 +1,7 @@ return { "gisketch/triforce.nvim", dependencies = { "nvzone/volt" }, - cmd = { "Triforce" }, - opts = {}, + config = function() + require("triforce").setup() + end, } diff --git a/snippets/rust.lua b/snippets/rust.lua index 9b0970f..47e7910 100644 --- a/snippets/rust.lua +++ b/snippets/rust.lua @@ -31,6 +31,21 @@ local snippets = { } ) ), + s( + "ttest", + fmta( + [[ + #[tokio::test] + async fn () { + + } + ]], + { + name = i(1), + body = i(0), + } + ) + ), s( "rstest", fmta(