From 8b61c3654a0635f5675ebe719767d7b31cb53228 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sat, 13 Jul 2024 12:16:03 +0300 Subject: [PATCH] Update 2024-07-13 --- lazy-lock.json | 121 ++++++++++---------- lua/plugins/autopairs.lua | 22 ++++ lua/plugins/codeium.lua | 5 +- lua/plugins/colorscheme.lua | 21 +--- lua/plugins/conform.lua | 2 +- lua/plugins/crates.lua | 8 +- lua/plugins/curl.lua | 25 +++++ lua/plugins/dadbod.lua | 3 + lua/plugins/decisive.lua | 4 +- lua/plugins/inlay-hints.lua | 87 +++++++++++++-- lua/plugins/lsp/pylsp.lua | 29 +++++ lua/plugins/lualine.lua | 4 +- lua/plugins/markdown.lua | 1 + lua/plugins/neogit.lua | 1 - lua/plugins/rust-tools.lua | 36 ------ lua/plugins/tagbar.lua | 2 +- lua/plugins/telescope.lua | 22 ---- lua/plugins/treesitter.lua | 217 +++++++++++++++++------------------- lua/plugins/typecheck.lua | 1 + lua/plugins/typst.lua | 1 + lua/plugins/vimtex.lua | 14 +-- lua/plugins/which-key.lua | 5 +- lua/solo/autocmds.lua | 3 + lua/solo/keymaps.lua | 5 +- spell/en.utf-8.add | 1 + spell/en.utf-8.add.spl | Bin 159 -> 172 bytes 26 files changed, 357 insertions(+), 283 deletions(-) create mode 100644 lua/plugins/autopairs.lua create mode 100644 lua/plugins/curl.lua create mode 100644 lua/plugins/lsp/pylsp.lua delete mode 100644 lua/plugins/rust-tools.lua diff --git a/lazy-lock.json b/lazy-lock.json index a36cad5..e8bbe91 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,11 +3,12 @@ "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, + "catppuccin.nvim": { "branch": "main", "commit": "7946d1a195c66fed38b3e34f9fa8e0c5a2da0700" }, "ccc.nvim": { "branch": "main", "commit": "4fb5abaef2f2e0540fe22d4d74a9841205fff9e4" }, - "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, + "cellular-automaton.nvim": { "branch": "main", "commit": "11aea08aa084f9d523b0142c2cd9441b8ede09ed" }, "cheatsheet.nvim": { "branch": "master", "commit": "8ee4d76b6f902c4017dc28eddd79d925dfc55066" }, "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" }, - "cmake-tools.nvim": { "branch": "master", "commit": "09bd61415ecdba84f378fe734680f69375260985" }, + "cmake-tools.nvim": { "branch": "master", "commit": "4be3c229fe932043fd83ad52fdf0ba9af7297789" }, "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" }, @@ -20,87 +21,91 @@ "cmp-pypi": { "branch": "main", "commit": "a73411e5935caa23c6feab34980bb435deadd482" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "codeium.nvim": { "branch": "main", "commit": "d3b88eb3aa1de6da33d325c196b8a41da2bcc825" }, - "conform.nvim": { "branch": "master", "commit": "c26dadf8a47a547768d1048a0d698ecec33494ce" }, - "crates.nvim": { "branch": "main", "commit": "8437522d12a8c523da2aee9db2979d070b2ecc33" }, + "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, + "crates.nvim": { "branch": "main", "commit": "5d2751f3d31c952663ade44669b6b63efa06e295" }, + "curl.nvim": { "branch": "main", "commit": "1acfa8a3dec6b6a4d4df6239e0d5dba0e017a0dc" }, "darkplus.nvim": { "branch": "master", "commit": "c7fff5ce62406121fc6c9e4746f118b2b2499c4c" }, "decisive.nvim": { "branch": "main", "commit": "53a1e1a715fd93ccb5d705181413f726b4276431" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" }, - "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, + "dracula.nvim": { "branch": "main", "commit": "fdf503e52ec1c8aae07353604d891fe5a3ed5201" }, + "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" }, "garbage-day.nvim": { "branch": "main", "commit": "4a1160bfffb2f499fb55a54333f29d160ab3c8a1" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, "gitignore.nvim": { "branch": "master", "commit": "2455191ec94da8ed222806a4fe3aa358eac1e558" }, - "gitpad.nvim": { "branch": "main", "commit": "9685127c3795821bdbd3dab5a5fee4422255a102" }, - "gitsigns.nvim": { "branch": "main", "commit": "17e8fd66182c9ad79dc129451ad015af3d27529c" }, - "gruvbox.nvim": { "branch": "main", "commit": "d4cde3853a172485961b515c36d51d757728d6e6" }, + "gitpad.nvim": { "branch": "main", "commit": "1e0f6fa335c72c05d1d3635120c572e198e5ae0d" }, + "gitsigns.nvim": { "branch": "main", "commit": "7178d1a430dcfff8a4c92d78b9e39e0297a779c0" }, + "gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, "harpoon-lualine": { "branch": "master", "commit": "d1b873c19b701fd80d60a67d086dbb3bcc4eb00e" }, "http-codes.nvim": { "branch": "main", "commit": "a610788dff2fb5df05b230d73a926c8dc3173c16" }, "hypersonic.nvim": { "branch": "main", "commit": "aee42425b24a92febc46a42a9cabebe5f96f021b" }, - "in-and-out.nvim": { "branch": "master", "commit": "2f3bf83654790e458cf387fa6f37f9b9d9e4f7fa" }, + "in-and-out.nvim": { "branch": "master", "commit": "ab24cafadc3418dffb0c7e9b0621cff60b9ac551" }, "indent-blankline.nvim": { "branch": "master", "commit": "5da5546947f3125dfd6aa85ab21074dc83f776d5" }, - "inlay-hints.nvim": { "branch": "master", "commit": "5526103e4b80c66234e60c8d92dad967d0e1bcd7" }, - "kanagawa.nvim": { "branch": "master", "commit": "7735b2147ee6d223e43287044caa4fb070bdfa3d" }, - "lackluster.nvim": { "branch": "main", "commit": "bfd57e0cd281a088a2d61a73f4cfe389b6431a4f" }, - "lazy.nvim": { "branch": "main", "commit": "0a5839ceeaec6d550f0e8d425d4a478daac176ce" }, + "inlay-hint.nvim": { "branch": "main", "commit": "bc6a00b7129218dc1478624bc5cb1c31b191a46b" }, + "inlay-hints.nvim": { "branch": "master", "commit": "1d5bd49a43f8423bc56f5c95ebe8fe3f3b96ed58" }, + "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, + "lackluster.nvim": { "branch": "main", "commit": "362e40056bb582ced43447d63bc1055e99f14ba4" }, + "lazy.nvim": { "branch": "main", "commit": "1d451b4c2ce957da05e2123ce1a001804fc7ea96" }, + "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, "markdown-togglecheck": { "branch": "main", "commit": "5e9ee3184109a102952c01ef816babe8835b299a" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "f5425eb1d0d794f0305d5eeebddabb74614683ff" }, - "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "melange-nvim": { "branch": "master", "commit": "b76b906cd6ed3c3152a47924a8eb5dcb35b326d8" }, - "neoconf.nvim": { "branch": "main", "commit": "e9e5d7fd2f46bb5f4c8e5f23f48e85d231e05931" }, - "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, + "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, + "melange.nvim": { "branch": "master", "commit": "f626d41b9110e6ab853538d8b939979a0f1adfeb" }, + "neoconf.nvim": { "branch": "main", "commit": "519b6777ef2c1d9d0d944b090a51bd83022c0103" }, + "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" }, "neogit": { "branch": "master", "commit": "16ee9ae957db2142fb189f5f2556123e24c5b7fb" }, - "neorg": { "branch": "main", "commit": "c901b8efa529dc985361e863c08fd4a91f0c0f98" }, + "neorg": { "branch": "main", "commit": "ace80b05771b65d6633f3c64b8d930b5787f20d0" }, "neorg-telescope": { "branch": "main", "commit": "fe255a3432ce639de7a374ccfb8602f517244dcd" }, - "neotest": { "branch": "master", "commit": "26ed90509c377d10dbdebd25b7094a886323b32b" }, + "neotest": { "branch": "master", "commit": "0fe9186afac9b7874ba304fd28d6325d07e5e274" }, "neotest-gtest": { "branch": "main", "commit": "b44c8afc26cea75ffc80617ce07b4e745a56e589" }, "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, "neotest-vitest": { "branch": "main", "commit": "353364aa05b94b09409cbef21b79c97c5564e2ce" }, - "neovim": { "branch": "main", "commit": "8c4660cfe697621bcc61d37b3651ffed94fe7fed" }, - "nightfly": { "branch": "master", "commit": "0a157670e836ed82c28dc1afd0f6e998ec2614f8" }, + "nightfly.nvim": { "branch": "master", "commit": "17016f9e7d2cfb64e94e091d4748463b09936d7a" }, "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" }, - "nvim": { "branch": "main", "commit": "894efb557728e532aa98b98029d16907a214ec05" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, - "nvim-dap-python": { "branch": "master", "commit": "ae0225d0d4a46e18e6057ab3701ef87bbbd6aaad" }, - "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" }, - "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79" }, - "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, + "nvim-dap-python": { "branch": "master", "commit": "d777c2b32ed39f61209c09bede28d7491621a631" }, + "nvim-dap-ui": { "branch": "master", "commit": "754104da429457bff733444a3048bc8296daf775" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" }, + "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-silicon": { "branch": "main", "commit": "b305ad8a45210f0dc8bbba1494dea6af072c0ed2" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-treesitter": { "branch": "master", "commit": "d4a888ae3cff358cb239643c45b2b38bb60e29c6" }, - "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, + "nvim-treesitter": { "branch": "master", "commit": "465840f8c14126e5193d777bbff94036eb875bd5" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f56a1430f21334868a86eb980b12e0af55690e98" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, + "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "ohne-accidents": { "branch": "main", "commit": "832b942a928e74b537a2526eacc6285e26af9589" }, - "oil.nvim": { "branch": "master", "commit": "65c53dbe4f2140236590a7568a5f22a77d16be39" }, - "onedark.nvim": { "branch": "master", "commit": "8e4b79b0e6495ddf29552178eceba1e147e6cecf" }, + "oil.nvim": { "branch": "master", "commit": "10fbfdd37b6904c0776c5db1a27ab47eecba335e" }, + "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, + "pathlib.nvim": { "branch": "main", "commit": "7a5a6facd29e306bc73a37719fa67c0d2226f852" }, "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, - "persistence.nvim": { "branch": "main", "commit": "95d03ad5450389ad7dc2a0fab14ebb3d46bc2c96" }, + "persistence.nvim": { "branch": "main", "commit": "c45ff862b53ce07a853a753fb0b33e148dbb99d2" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "5c9660801ce345cd3835e1947c12b54290ab7e71" }, - "rainbow_csv.nvim": { "branch": "main", "commit": "5033e3abd4fb0a0ee07232530a032296535704b4" }, - "runner.nvim": { "branch": "main", "commit": "fb699ec0545ba3cd9ab5167fc3d07831a836574b" }, - "rustaceanvim": { "branch": "master", "commit": "d6d7620b66d74b3b16defcf85cbef7b3582795b3" }, - "spellwarn.nvim": { "branch": "main", "commit": "85022f4dfff6dee34e24edc5d745ea978ccd3a81" }, - "suedit.nvim": { "branch": "main", "commit": "871a27fb4bac957520af3f992e692ff214141041" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "b29da4a6061a88270e875b38367d82c04c856128" }, + "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, + "rose-pine.nvim": { "branch": "main", "commit": "dded5c15e9d27ac95ad1e803b35a752d80f3f42b" }, + "runner.nvim": { "branch": "main", "commit": "9ae6f56b73471174c6c4d47581007c6781fb6b6e" }, + "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, + "spellwarn.nvim": { "branch": "main", "commit": "2f4dbc58bb90bc63b295461216b91ccf4e7f782d" }, "tagbar": { "branch": "master", "commit": "0815b5455c792a610d28ff3e7981642c9cf05d62" }, - "tailwind-fold.nvim": { "branch": "main", "commit": "012558a8fcd2e459027640cd72471185e6a77e59" }, + "tailwind-fold.nvim": { "branch": "main", "commit": "0e4ef9dc65916ce368fb6a81843293995f477f9e" }, "telescope-bibtex.nvim": { "branch": "master", "commit": "289a6f86ebec06e8ae1590533b732b9981d84900" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-git-diffs.nvim": { "branch": "main", "commit": "366df26227e6d478d5c55e04771d61875c4f22ac" }, "telescope-heading.nvim": { "branch": "main", "commit": "e85c0f69cb64048f56e76548dcb2f10277576df9" }, "telescope-lazy.nvim": { "branch": "main", "commit": "08eb9d05455cabc126e9b850470205d4f3ac7caf" }, @@ -108,31 +113,29 @@ "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" }, "telescope-software-licenses.nvim": { "branch": "master", "commit": "fb5fc33b6afc994756e2f372423c365bf66f2256" }, "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" }, - "telescope-undo.nvim": { "branch": "main", "commit": "95b61c01ea3a4c9e8747731148e905bbcf0ccaee" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, - "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, - "tokyonight.nvim": { "branch": "main", "commit": "30d7be361a7fbf187a881f17e574e9213d5108ea" }, - "tree-sitter-hyprlang": { "branch": "master", "commit": "c9012d6dcaaa939f17c21e1fdb17b013d139e6b9" }, + "todo-comments.nvim": { "branch": "main", "commit": "313b04e5b02d29ab9275c9295ff5e2b73921b0eb" }, + "tokyonight.nvim": { "branch": "main", "commit": "66a272ba6cf93bf303c4b7a91b100ca0dd3ec7bd" }, + "tree-sitter-hyprlang": { "branch": "master", "commit": "6858695eba0e63b9e0fceef081d291eb352abce8" }, "treesitter-utils": { "branch": "main", "commit": "df621499e4227f0476f6f4bdb75a9d8dd18d16f2" }, - "trouble.nvim": { "branch": "main", "commit": "57761ba7148164f0315ed203e714ac242329abd4" }, - "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }, + "trouble.nvim": { "branch": "main", "commit": "026e420bf9878ee97133f8fbf906261f3249b17a" }, + "twilight.nvim": { "branch": "main", "commit": "da4fe0a9e1397ecd9b012c52fb34313fbd3b862f" }, "typecheck.nvim": { "branch": "main", "commit": "38f3c135572a287f468bae269f956f4ba53dbddf" }, - "typescript-tools.nvim": { "branch": "master", "commit": "d306de46053c9d751e0949b1b16d059aa12e1ef5" }, - "typst.vim": { "branch": "main", "commit": "d9a7650e76c85f8ba437e056d08dd43b01b8bfd6" }, + "typescript-tools.nvim": { "branch": "master", "commit": "5da4d695d66f676eb6ea766b946e86f93baaafe7" }, + "typst.vim": { "branch": "main", "commit": "4d18ced62599ffe5b3c0e5e49566d5456121bc02" }, "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" }, "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" }, "vim-dadbod-completion": { "branch": "master", "commit": "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d" }, - "vim-dadbod-ui": { "branch": "master", "commit": "2527310098e7458488e61a528614da142aa2dc42" }, + "vim-dadbod-ui": { "branch": "master", "commit": "d2ffc1bdae3041105f3b57423e0e81a5d9429267" }, "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" }, "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" }, - "vimtex": { "branch": "master", "commit": "2dc2a5435809c13f6f4aa07964be4ef19a7864f5" }, - "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }, + "vimtex": { "branch": "master", "commit": "fdb5618e05964e1cfcfd3bc1f2463ef3148ae8ff" }, + "which-key.nvim": { "branch": "main", "commit": "af4ded85542d40e190014c732fa051bdbf88be3d" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }, - "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" } + "zen-mode.nvim": { "branch": "main", "commit": "21976479c7a0146b05a42707cf91c86b1e510945" } } \ No newline at end of file diff --git a/lua/plugins/autopairs.lua b/lua/plugins/autopairs.lua new file mode 100644 index 0000000..91a0670 --- /dev/null +++ b/lua/plugins/autopairs.lua @@ -0,0 +1,22 @@ +return { + "windwp/nvim-autopairs", + event = "InsertEnter", + opts = { + disable_filetype = { "TelescopePrompt", "spectre_panel" }, + disable_in_macro = true, -- disable when recording or executing a macro + disable_in_visualblock = false, -- disable when insert after visual block mode + disable_in_replace_mode = true, + ignored_next_char = [=[[%w%%%'%[%"%.%`%$]]=], + enable_moveright = true, + enable_afterquote = true, -- add bracket pairs after quote + enable_check_bracket_line = true, --- check bracket in same line + enable_bracket_in_quote = true, + enable_abbr = false, -- trigger abbreviation + break_undo = true, -- switch for basic rule break undo sequence + check_ts = false, + map_cr = true, + map_bs = true, -- map the key + map_c_h = false, -- Map the key to delete a pair + map_c_w = true, -- map to delete a pair if possible + }, +} diff --git a/lua/plugins/codeium.lua b/lua/plugins/codeium.lua index d8385c1..1515d98 100644 --- a/lua/plugins/codeium.lua +++ b/lua/plugins/codeium.lua @@ -4,7 +4,6 @@ return { "nvim-lua/plenary.nvim", "hrsh7th/nvim-cmp", }, - config = function() - require("codeium").setup({}) - end, + commit = "d3b88eb", + config = true, } diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 466bdae..47d6eaa 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -13,29 +13,20 @@ return { }, lualine_bold = true, }, - config = function() - require("tokyonight").setup({ - style = "night", - transparent = true, - styles = { - keywords = { italic = false }, - sidebars = "transparent", - floats = "transparent", - }, - lualine_bold = true, - }) + config = function(_, opts) + require("tokyonight").setup(opts) vim.cmd.colorscheme("tokyonight") end, }, { "lunarvim/darkplus.nvim" }, - { "catppuccin/nvim" }, + { "catppuccin/nvim", name = "catppuccin.nvim" }, { "Mofiqul/dracula.nvim" }, { "rebelot/kanagawa.nvim" }, { "EdenEast/nightfox.nvim" }, { "navarasu/onedark.nvim" }, - { "savq/melange-nvim" }, + { "savq/melange-nvim", name = "melange.nvim" }, { "ellisonleao/gruvbox.nvim" }, - { "bluz71/vim-nightfly-colors", name = "nightfly" }, - { "rose-pine/neovim" }, + { "bluz71/vim-nightfly-colors", name = "nightfly.nvim" }, + { "rose-pine/neovim", name = "rose-pine.nvim" }, { "slugbyte/lackluster.nvim" }, } diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index dedbd2e..408bd72 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -15,7 +15,7 @@ return { opts = { formatters_by_ft = { lua = { "stylua" }, - python = { "auto_optional", "ruff", "ruff_fix", "ruff_organize_imports" }, + python = { "ruff", "ruff_fix", "ruff_organize_imports" }, go = { "goimports", "gofmt" }, javascript = js, javascriptreact = js, diff --git a/lua/plugins/crates.lua b/lua/plugins/crates.lua index 7fdc102..35aa84a 100644 --- a/lua/plugins/crates.lua +++ b/lua/plugins/crates.lua @@ -7,12 +7,12 @@ return { "ru", require("crates").upgrade_all_crates, desc = "[U]pgrade all crates", + ft = { "rust", "toml" }, }, }, opts = { smart_insert = true, insert_closing_quote = true, - avoid_prerelease = true, autoload = true, autoupdate = true, loading_indicator = true, @@ -132,16 +132,12 @@ return { jump_back = { "", "" }, }, }, - src = { + --[[ src = { insert_closing_quote = true, text = { prerelease = "  pre-release ", yanked = "  yanked ", }, - }, - --[[ null_ls = { - enabled = true, - name = "crates.nvim", }, ]] }, } diff --git a/lua/plugins/curl.lua b/lua/plugins/curl.lua new file mode 100644 index 0000000..0868e68 --- /dev/null +++ b/lua/plugins/curl.lua @@ -0,0 +1,25 @@ +return { + "oysandvik94/curl.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + }, + keys = { + { + "co", + vim.cmd.CurlOpen, + desc = "[C]url [O]pen", + }, + { + "cc", + vim.cmd.CurlClose, + desc = "[C]url [C]lose", + }, + }, + cmd = { "CurlOpen", "CurlClose" }, + opts = { + default_flags = {}, + mappings = { + execute_curl = "", + }, + }, +} diff --git a/lua/plugins/dadbod.lua b/lua/plugins/dadbod.lua index b348510..55ff500 100644 --- a/lua/plugins/dadbod.lua +++ b/lua/plugins/dadbod.lua @@ -5,6 +5,9 @@ return { { "tpope/vim-dadbod", lazy = true }, { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true }, }, + keys = { + { "od", vim.cmd.DBUIToggle, desc = "Toggle [D]adbod UI" }, + }, cmd = { "DBUI", "DBUIToggle", diff --git a/lua/plugins/decisive.lua b/lua/plugins/decisive.lua index 6558c10..be77e2d 100644 --- a/lua/plugins/decisive.lua +++ b/lua/plugins/decisive.lua @@ -2,14 +2,14 @@ return { "emmanueltouzery/decisive.nvim", keys = { { - "cca", + "cCa", function() require("decisive").align_csv({}) end, desc = "align CSV", }, { - "ccA", + "cCA", function() require("decisive").align_csv_clear({}) end, diff --git a/lua/plugins/inlay-hints.lua b/lua/plugins/inlay-hints.lua index 583857e..c38c99a 100644 --- a/lua/plugins/inlay-hints.lua +++ b/lua/plugins/inlay-hints.lua @@ -1,12 +1,83 @@ return { - "MysticalDevil/inlay-hints.nvim", - event = "LspAttach", - dependencies = { "neovim/nvim-lspconfig" }, - keys = { - { "oi", vim.cmd.InlayHintsToggle, desc = "Toggle InlayHints" }, + { + "MysticalDevil/inlay-hints.nvim", + event = "LspAttach", + dependencies = { "neovim/nvim-lspconfig" }, + keys = { + { "oi", vim.cmd.InlayHintsToggle, desc = "Toggle InlayHints" }, + }, + opts = { + commands = { enable = true }, -- Enable InlayHints commands, include `InlayHintsToggle`, `InlayHintsEnable` and `InlayHintsDisable` + autocmd = { enable = true }, -- Enable the inlay hints on `LspAttach` event + }, }, - opts = { - commands = { enable = true }, -- Enable InlayHints commands, include `InlayHintsToggle`, `InlayHintsEnable` and `InlayHintsDisable` - autocmd = { enable = true }, -- Enable the inlay hints on `LspAttach` event + { + "felpafel/inlay-hint.nvim", + event = "LspAttach", + opts = { + virt_text_pos = "eol", + highlight_group = "comment", + hl_mode = "combine", + display_callback = function(line_hints, options, bufnr) + if options.virt_text_pos == "inline" then + local lhint = {} + for _, hint in pairs(line_hints) do + local text = "" + local label = hint.label + if type(label) == "string" then + text = label + else + for _, part in ipairs(label) do + text = text .. part.value + end + end + if hint.paddingLeft then + text = " " .. text + end + if hint.paddingRight then + text = text .. " " + end + lhint[#lhint + 1] = { text = text, col = hint.position.character } + end + return lhint + elseif options.virt_text_pos == "eol" or options.virt_text_pos == "right_align" then + local k1 = {} + local k2 = {} + table.sort(line_hints, function(a, b) + return a.position.character < b.position.character + end) + for _, hint in pairs(line_hints) do + local label = hint.label + local kind = hint.kind + local text = "" + if type(label) == "string" then + text = label + else + for _, part in ipairs(label) do + text = text .. part.value + end + end + if kind == 1 then + k1[#k1 + 1] = text:gsub("^:%s*", "") + else + k2[#k2 + 1] = text:gsub(":$", "") + end + end + local text = "" + if #k2 > 0 then + text = " <- (" .. table.concat(k2, ",") .. ")" + end + if #text > 0 then + text = text .. " " + end + if #k1 > 0 then + text = text .. " => " .. table.concat(k1, ",") + end + + return text + end + return nil + end, + }, }, } diff --git a/lua/plugins/lsp/pylsp.lua b/lua/plugins/lsp/pylsp.lua new file mode 100644 index 0000000..cb0ef35 --- /dev/null +++ b/lua/plugins/lsp/pylsp.lua @@ -0,0 +1,29 @@ +local M = {} + +M.setup = function(lsp, capabilities) + lsp.pylsp.setup({ + capabilities = capabilities, + settings = { + pylsp = { + plugins = { + autopep8 = { enabled = false }, + flake8 = { enabled = false }, + pylint = { enabled = false }, + yapf = { enabled = false }, + pydocstyle = { enabled = false }, + mccabe = { enabled = false }, + rope_autoimport = { enabled = true }, + rope_completion = { + enabled = true, + eager = true, + }, + pycodestyle = { + maxLineLength = nil, + }, + }, + }, + }, + }) +end + +return M diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index de3e170..e3dd553 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -46,8 +46,8 @@ return { `windows` (shows currently available windows) ]] sections = { lualine_a = { "mode" }, - lualine_b = { "branch", "diff" }, - lualine_c = { "filename", "harpoon2", "lsp_progress" }, + lualine_b = { "branch" }, + lualine_c = { "filename", "diff", "harpoon2", "lsp_progress" }, lualine_x = { "diagnostics", "encoding", "filetype", "filesize" }, lualine_y = { "progress" }, lualine_z = { "location" }, diff --git a/lua/plugins/markdown.lua b/lua/plugins/markdown.lua index a207942..ef63bf4 100644 --- a/lua/plugins/markdown.lua +++ b/lua/plugins/markdown.lua @@ -10,6 +10,7 @@ return { require("markdown-togglecheck").toggle() end, desc = "Toggle Checkmark", + ft = "markdown", }, }, opts = { diff --git a/lua/plugins/neogit.lua b/lua/plugins/neogit.lua index 4470f61..6b8cd5d 100644 --- a/lua/plugins/neogit.lua +++ b/lua/plugins/neogit.lua @@ -7,7 +7,6 @@ return { "nvim-telescope/telescope.nvim", }, cmd = { "Neogit" }, - version = "*", keys = { { "gg", diff --git a/lua/plugins/rust-tools.lua b/lua/plugins/rust-tools.lua deleted file mode 100644 index 7ef2e0a..0000000 --- a/lua/plugins/rust-tools.lua +++ /dev/null @@ -1,36 +0,0 @@ -return { - "simrat39/rust-tools.nvim", - dependencies = { "neovim/nvim-lspconfig" }, - ft = "rust", - enabled = false, - opts = { - tools = { - -- on_initialized = nil, - on_initialized = function() - vim.api.nvim_create_autocmd( - { "BufEnter", "CursorHold", "InsertLeave", "BufWritePost", "InsertEnter" }, - { - group = vim.api.nvim_create_augroup("InitializeRustAnalyzer", { clear = true }), - pattern = { "*.rs" }, - callback = function() - vim.lsp.codelens.refresh() - end, - } - ) - end, - reload_workspace_from_cargo_toml = true, - inlay_hints = { - auto = true, - only_current_line = false, - show_parameter_hints = true, - parameter_hints_prefix = " <- ", - other_hints_prefix = " => ", - max_len_align = false, - max_len_align_padding = 1, - right_align = false, - right_align_padding = 7, - highlight = "Comment", - }, - }, - }, -} diff --git a/lua/plugins/tagbar.lua b/lua/plugins/tagbar.lua index 93359f5..24e3fa1 100644 --- a/lua/plugins/tagbar.lua +++ b/lua/plugins/tagbar.lua @@ -1,6 +1,6 @@ return { "preservim/tagbar", keys = { - { "b", vim.cmd.TagbarToggle, desc = "Toggle [T]agbar" }, + { "b", vim.cmd.TagbarToggle, desc = "Toggle Tag[b]ar" }, }, } diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 8e92221..99f7754 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -13,7 +13,6 @@ return { { "crispgm/telescope-heading.nvim" }, { "benfowler/telescope-luasnip.nvim" }, { "paopaol/telescope-git-diffs.nvim" }, - { "debugloop/telescope-undo.nvim" }, { "ThePrimeagen/harpoon", branch = "harpoon2" }, { "ThePrimeagen/git-worktree.nvim" }, }, @@ -263,26 +262,6 @@ return { -- Wrapping in the preview window is disabled by default wrap = false, }, - undo = { - use_delta = true, - use_custom_command = nil, -- setting this implies `use_delta = false`. Accepted format is: { "bash", "-c", "echo '$DIFF' | delta" } - side_by_side = false, - diff_context_lines = vim.o.scrolloff, - entry_format = "state #$ID, $STAT, $TIME", - time_format = "", - mappings = { - i = { - -- IMPORTANT: Note that telescope-undo must be available when telescope is configured if - -- you want to replicate these defaults and use the following actions. This means - -- installing as a dependency of telescope in it's `requirements` and loading this - -- extension from there instead of having the separate plugin definition as outlined - -- above. - [""] = require("telescope-undo.actions").yank_additions, - [""] = require("telescope-undo.actions").yank_deletions, - [""] = require("telescope-undo.actions").restore, - }, - }, - }, }, }) @@ -295,7 +274,6 @@ return { pcall(telescope.load_extension, "luasnip") -- Telescope luasnip pcall(telescope.load_extension, "git_diffs") -- Telescope git_diffs diff_commits pcall(telescope.load_extension, "bibtex") -- Telescope bibtex - pcall(telescope.load_extension, "undo") -- Telescope undo pcall(telescope.load_extension, "harpoon") end, } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index c4dcaaa..d1f595f 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -7,134 +7,119 @@ return { "nvim-treesitter/nvim-treesitter-textobjects", "luckasRanarison/tree-sitter-hyprlang", }, - config = function() - local ts_repeat_move = require("nvim-treesitter.textobjects.repeatable_move") + opts = { + -- A list of parser names, or "all" (the five listed parsers should always be installed) + ensure_installed = { "cpp", "lua", "rust", "python", "markdown", "json", "http", "markdown_inline" }, -- one of "all" or a list of languages + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = true, + -- List of parsers to ignore installing (for "all") + ignore_install = { "latex" }, + modules = {}, - -- Repeat movement with ; and , - -- ensure ; goes forward and , goes backward regardless of the last direction - vim.keymap.set( - { "n", "x", "o" }, - ";", - ts_repeat_move.repeat_last_move_next, - { desc = "Repeat last action and move forward" } - ) - vim.keymap.set( - { "n", "x", "o" }, - ",", - ts_repeat_move.repeat_last_move_previous, - { desc = "Repeat last action and move backward" } - ) - require("nvim-treesitter.configs").setup({ - -- A list of parser names, or "all" (the five listed parsers should always be installed) - ensure_installed = { "cpp", "lua", "rust", "python", "markdown", "json", "http", "markdown_inline" }, -- one of "all" or a list of languages - -- Install parsers synchronously (only applied to `ensure_installed`) - sync_install = false, - -- Automatically install missing parsers when entering buffer - -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally - auto_install = true, - -- List of parsers to ignore installing (for "all") - ignore_install = { "latex" }, - modules = {}, - - highlight = { - enable = true, - -- Setting this to true will run `:h syntax` and tree-sitter at the same time. - -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). - -- Using this option may slow down your editor, and you may see some duplicate highlights. - -- Instead of true it can also be a list of languages - additional_vim_regex_highlighting = true, + highlight = { + enable = true, + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = true, + }, + indent = { + enable = true, + }, + incremenral_selection = { + enable = false, + keymaps = { + init_selection = "", + node_selection = "", + scope_selection = "", + node_deselection = "", }, - indent = { - enable = true, - }, - incremenral_selection = { + }, + textobjects = { + select = { enable = true, + lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim keymaps = { - init_selection = "", - node_selection = "", - scope_selection = "", - node_deselection = "", + -- You can use the capture groups defined in textobjects.scm + ["aa"] = { query = "@parameter.outer", desc = "Select outer part of a parameter" }, + ["ia"] = { query = "@parameter.inner", desc = "Select inner part of a parameter" }, + ["af"] = { query = "@function.outer", desc = "Select outer part of a function" }, + ["if"] = { query = "@function.inner", desc = "Select inner part of a function" }, + ["ac"] = { query = "@class.outer", desc = "Select outer part of a class region" }, + ["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" }, + ["ii"] = { query = "@conditional.inner", desc = "Select inner part of a conditional" }, + ["ai"] = { query = "@conditional.outer", desc = "Select outer part of a conditional" }, + ["il"] = { query = "@loop.inner", desc = "Select inner part of a loop" }, + ["al"] = { query = "@loop.outer", desc = "Select outer part of a loop" }, + ["at"] = { query = "@comment.outer", desc = "Select outer part of a comment" }, + ["as"] = { query = "@scope", query_group = "locals", desc = "Select language scope" }, }, - }, - textobjects = { - select = { + -- You can choose the select mode (default is charwise 'v') + -- + -- Can also be a function which gets passed a table with the keys + -- * query_string: eg '@function.inner' + -- * method: eg 'v' or 'o' + -- and should return the mode ('v', 'V', or '') or a table + -- mapping query_strings to modes. + selection_modes = { + ["@parameter.outer"] = "v", -- charwise + ["@function.outer"] = "V", -- linewise + ["@class.outer"] = "", -- blockwise + }, + -- If you set this to `true` (default is `false`) then any textobject is + -- extended to include preceding or succeeding whitespace. Succeeding + -- whitespace has priority in order to act similarly to eg the built-in + -- `ap`. + -- + -- Can also be a function which gets passed a table with the keys + -- * query_string: eg '@function.inner' + -- * selection_mode: eg 'v' + -- and should return true of false + include_surrounding_whitespace = true, + move = { enable = true, - lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim - keymaps = { - -- You can use the capture groups defined in textobjects.scm - ["aa"] = { query = "@parameter.outer", desc = "Select outer part of a parameter" }, - ["ia"] = { query = "@parameter.inner", desc = "Select inner part of a parameter" }, - ["af"] = { query = "@function.outer", desc = "Select outer part of a function" }, - ["if"] = { query = "@function.inner", desc = "Select inner part of a function" }, - ["ac"] = { query = "@class.outer", desc = "Select outer part of a class region" }, - ["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" }, - ["ii"] = { query = "@conditional.inner", desc = "Select inner part of a conditional" }, - ["ai"] = { query = "@conditional.outer", desc = "Select outer part of a conditional" }, - ["il"] = { query = "@loop.inner", desc = "Select inner part of a loop" }, - ["al"] = { query = "@loop.outer", desc = "Select outer part of a loop" }, - ["at"] = { query = "@comment.outer", desc = "Select outer part of a comment" }, - ["as"] = { query = "@scope", query_group = "locals", desc = "Select language scope" }, + set_jumps = true, -- whether to set jumps in the jumplist + goto_next_start = { + ["]m"] = "@function.outer", + ["]]"] = "@class.outer", }, - -- You can choose the select mode (default is charwise 'v') - -- - -- Can also be a function which gets passed a table with the keys - -- * query_string: eg '@function.inner' - -- * method: eg 'v' or 'o' - -- and should return the mode ('v', 'V', or '') or a table - -- mapping query_strings to modes. - selection_modes = { - ["@parameter.outer"] = "v", -- charwise - ["@function.outer"] = "V", -- linewise - ["@class.outer"] = "", -- blockwise + goto_next_end = { + ["]M"] = "@function.outer", + ["]["] = "@class.outer", }, - -- If you set this to `true` (default is `false`) then any textobject is - -- extended to include preceding or succeeding whitespace. Succeeding - -- whitespace has priority in order to act similarly to eg the built-in - -- `ap`. - -- - -- Can also be a function which gets passed a table with the keys - -- * query_string: eg '@function.inner' - -- * selection_mode: eg 'v' - -- and should return true of false - include_surrounding_whitespace = true, - move = { - enable = true, - set_jumps = true, -- whether to set jumps in the jumplist - goto_next_start = { - ["]m"] = "@function.outer", - ["]]"] = "@class.outer", - }, - goto_next_end = { - ["]M"] = "@function.outer", - ["]["] = "@class.outer", - }, - goto_previous_start = { - ["[m"] = "@function.outer", - ["[["] = "@class.outer", - }, - goto_previous_end = { - ["[M"] = "@function.outer", - ["[]"] = "@class.outer", - }, - -- goto_next = { - -- [']i'] = "@conditional.inner", - -- }, - -- goto_previous = { - -- ['[i'] = "@conditional.inner", - -- } + goto_previous_start = { + ["[m"] = "@function.outer", + ["[["] = "@class.outer", }, - swap = { - enable = true, - swap_next = { - ["]a"] = "@parameter.inner", - }, - swap_previous = { - ["[a"] = "@parameter.inner", - }, + goto_previous_end = { + ["[M"] = "@function.outer", + ["[]"] = "@class.outer", + }, + -- goto_next = { + -- [']i'] = "@conditional.inner", + -- }, + -- goto_previous = { + -- ['[i'] = "@conditional.inner", + -- } + }, + swap = { + enable = true, + swap_next = { + ["]a"] = "@parameter.inner", + }, + swap_previous = { + ["[a"] = "@parameter.inner", }, }, }, - }) + }, + }, + config = function(_, opts) + require("nvim-treesitter.configs").setup(opts) vim.cmd.highlight("TreesitterContext guibg=None") vim.cmd.highlight("TreesitterContextLineNumberBottom gui=underline guisp=Grey") end, diff --git a/lua/plugins/typecheck.lua b/lua/plugins/typecheck.lua index 0675019..649167d 100644 --- a/lua/plugins/typecheck.lua +++ b/lua/plugins/typecheck.lua @@ -11,6 +11,7 @@ return { "lt", vim.cmd.Typecheck, desc = "Run Type Check", + ft = { "javascript", "javascriptreact", "json", "jsonc", "typescript", "typescriptreact" }, }, }, } diff --git a/lua/plugins/typst.lua b/lua/plugins/typst.lua index cae123a..9186c22 100644 --- a/lua/plugins/typst.lua +++ b/lua/plugins/typst.lua @@ -6,6 +6,7 @@ return { "ow", vim.cmd.TypstWatch, desc = "Typst watch", + ft = "typst", }, }, config = function() diff --git a/lua/plugins/vimtex.lua b/lua/plugins/vimtex.lua index 7b58e32..3426580 100644 --- a/lua/plugins/vimtex.lua +++ b/lua/plugins/vimtex.lua @@ -2,12 +2,12 @@ return { "lervag/vimtex", ft = "tex", keys = { - { "Tb", vim.cmd.VimtexCompile, desc = "[B]uild" }, - { "Tv", vim.cmd.VimtexView, desc = "[V]iew" }, - { "Tw", vim.cmd.VimtexCountWords, desc = "[W]ord Count" }, - { "Tt", vim.cmd.VimtexTocToggle, desc = "[T]able of Contents" }, - { "Tc", vim.cmd.VimtexClean, desc = "[C]lean aux" }, - { "Te", vim.cmd.VimtexErrors, desc = "Report [E]rrors" }, - { "Ti", vim.cmd.VimtexInfo, desc = "[I]nfo" }, + { "Tb", vim.cmd.VimtexCompile, desc = "[B]uild", ft = "tex" }, + { "Tv", vim.cmd.VimtexView, desc = "[V]iew", ft = "tex" }, + { "Tw", vim.cmd.VimtexCountWords, desc = "[W]ord Count", ft = "tex" }, + { "Tt", vim.cmd.VimtexTocToggle, desc = "[T]able of Contents", ft = "tex" }, + { "Tc", vim.cmd.VimtexClean, desc = "[C]lean aux", ft = "tex" }, + { "Te", vim.cmd.VimtexErrors, desc = "Report [E]rrors", ft = "tex" }, + { "Ti", vim.cmd.VimtexInfo, desc = "[I]nfo", ft = "tex" }, }, } diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua index 21d812f..08c61fa 100644 --- a/lua/plugins/which-key.lua +++ b/lua/plugins/which-key.lua @@ -36,17 +36,18 @@ return { } local mappings = { - c = { vim.cmd.bdelete, "[C]lose Buffer" }, + C = { vim.cmd.bdelete, "[C]lose Buffer" }, + c = { name = "[C]url" }, t = { name = "[T]rouble" }, g = { name = "[G]it" }, l = { name = "[L]SP" }, + w = { name = "LSP [W]orkspace" }, p = { name = "Telescope", d = { name = "[D]evelopment" }, }, z = { name = "[Z]en" }, r = { name = "[R]ust" }, - w = { name = "Vim[W]iki" }, n = { name = "Gitpad" }, m = { name = "Misc" }, L = { diff --git a/lua/solo/autocmds.lua b/lua/solo/autocmds.lua index e2ecc02..84917e4 100644 --- a/lua/solo/autocmds.lua +++ b/lua/solo/autocmds.lua @@ -71,4 +71,7 @@ vim.filetype.add({ pattern = { [".*/hypr/.*%.conf"] = "hyprlang", }, + extension = { + ["http"] = "http", + }, }) diff --git a/lua/solo/keymaps.lua b/lua/solo/keymaps.lua index 20d2c91..4a5bb8d 100644 --- a/lua/solo/keymaps.lua +++ b/lua/solo/keymaps.lua @@ -24,7 +24,7 @@ nmap("*", "*zz") nmap("#", "#zz") nmap("g*", "g*zz") nmap("g#", "g#zz") --- nmap("'", ":normal! zz") +vim.keymap.set("n", ";", ";", { silent = false }) vim.keymap.set({ "n" }, "j", "gj", { desc = "Allows to navigate though wrapped lines", noremap = true }) vim.keymap.set({ "n" }, "k", "gk", { desc = "Allows to navigate though wrapped lines", noremap = true }) @@ -39,7 +39,8 @@ nmap("", "!tmux neww tmux-sessionizer", "Open tmux sessionizer") nmap("", "m .-2==", "Move line up") nmap("", "m .+1==", "Move line down") -nmap("", ":%s///gI", "[S]ubstitute word") +-- nmap("", ":%s///gI", "[S]ubstitute word") +nmap("", [[:%s/\<\>//gI]], "[S]ubstitute word") nmap("Q", "@qj", "Run macro") diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 7f21edd..e860d60 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -6,3 +6,4 @@ Factorio Leclerc's because duplicants +Linters diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 7ae7893e39cf193a893314a9d69bab2d7406139b..3e27f055dfb6946f925c5fc36710ac29df98112f 100644 GIT binary patch delta 57 zcmbQwxQ3B0%+t5HAT=k)=syDkL&ZeCIC-YjOvYr!9L7|}A|TDkz~HaWn8#QGR(%+t5HAT=k)=syDkL;gg*I3dPV#$?7EAXx;Y85tP-)hBi<0st6I3qSw>