diff --git a/after/ftplugin/norg.lua b/after/ftplugin/norg.lua index a71d9c0..a227a13 100644 --- a/after/ftplugin/norg.lua +++ b/after/ftplugin/norg.lua @@ -3,3 +3,5 @@ vim.opt_local.shiftwidth = 2 vim.opt_local.softtabstop = 2 vim.opt_local.wrap = true vim.opt_local.spell = true +vim.wo.foldlevel = 99 +vim.wo.conceallevel = 2 diff --git a/after/plugin/sql_rust_automagic.lua b/after/plugin/sql_rust_automagic.lua index 0e69494..5209e77 100644 --- a/after/plugin/sql_rust_automagic.lua +++ b/after/plugin/sql_rust_automagic.lua @@ -16,13 +16,12 @@ end local embedded_sql = vim.treesitter.query.parse( "rust", [[ -(macro_invocation - (scoped_identifier - path: (identifier) @path (#eq? @path "sqlx")) - - (token_tree - (raw_string_literal) @sql) - (#offset! @sql 1 0 -1 0)) + ([ + (string_literal) + (raw_string_literal) + ] @sql + (#match? @sql "(SELECT|select|INSERT|insert|UPDATE|update|DELETE|delete).+(FROM|from|INTO|into|VALUES|values|SET|set).*(WHERE|where|GROUP BY|group by)?") + (#offset! @sql 0 1 0 -1)) ]] ) diff --git a/lazy-lock.json b/lazy-lock.json index ac5bb39..174eb0f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,7 +3,7 @@ "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, - "catppuccin.nvim": { "branch": "main", "commit": "4374588df4e99d403a359cda2ddececcf645d8a9" }, + "catppuccin.nvim": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" }, "ccc.nvim": { "branch": "main", "commit": "4fb5abaef2f2e0540fe22d4d74a9841205fff9e4" }, "cellular-automaton.nvim": { "branch": "main", "commit": "11aea08aa084f9d523b0142c2cd9441b8ede09ed" }, "cheatsheet.nvim": { "branch": "master", "commit": "8ee4d76b6f902c4017dc28eddd79d925dfc55066" }, @@ -14,107 +14,112 @@ "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, + "cmp-dbee": { "branch": "main", "commit": "1650f67b9bf43c029fc37570665ca895a33cdf5a" }, "cmp-dotenv": { "branch": "main", "commit": "4dd53aab60982f1f75848aec5e6214986263325e" }, - "cmp-git": { "branch": "main", "commit": "3d83031c4b63f9b10703e32e070cda0700a81992" }, + "cmp-git": { "branch": "main", "commit": "50d526dff0f6bc441b51fc269d9fdc99a50c76af" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-pypi": { "branch": "main", "commit": "a73411e5935caa23c6feab34980bb435deadd482" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codeium.nvim": { "branch": "main", "commit": "f6a2ef32a9e923cb0104a19d3e426b0e40e49505" }, - "conform.nvim": { "branch": "master", "commit": "25d48271e3d4404ba017cb92a37d3a681c1ad149" }, - "crates.nvim": { "branch": "main", "commit": "5d2751f3d31c952663ade44669b6b63efa06e295" }, - "curl.nvim": { "branch": "main", "commit": "d575106121df0b6812c859ec00e7a6054b9578e2" }, + "codeium.nvim": { "branch": "main", "commit": "d3b88eb3aa1de6da33d325c196b8a41da2bcc825" }, + "conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" }, + "crates.nvim": { "branch": "main", "commit": "1c924d5a9ea3496c4e1a02d0d51388ba809f8468" }, + "curl.nvim": { "branch": "main", "commit": "4576324dc6d1b86744459031d2dc44fa3e40c7d3" }, "darkplus.nvim": { "branch": "master", "commit": "c7fff5ce62406121fc6c9e4746f118b2b2499c4c" }, - "decisive.nvim": { "branch": "main", "commit": "53a1e1a715fd93ccb5d705181413f726b4276431" }, + "darkvoid.nvim": { "branch": "master", "commit": "8c637ccf504f6ea8efd181bdb278f36b77086f94" }, + "decisive.nvim": { "branch": "main", "commit": "74f74436d9db014e63d3cb60629bce7aeb6a38ee" }, + "demicolon.nvim": { "branch": "main", "commit": "d3237e1691276fa6f538b18f7a85d49b6362ccdf" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dracula.nvim": { "branch": "main", "commit": "fdf503e52ec1c8aae07353604d891fe5a3ed5201" }, + "flow.nvim": { "branch": "main", "commit": "3af4d4d1b8a99c34e060de6fdaa5babc596a50c1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "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": "1e0f6fa335c72c05d1d3635120c572e198e5ae0d" }, - "gitsigns.nvim": { "branch": "main", "commit": "6f8dbdbd41725fa11178e78d6e4c987038a8ece9" }, + "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, "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" }, + "hypersonic.nvim": { "branch": "main", "commit": "734dfbfbe51952f102a9b439d53d4267bb0024cd" }, "in-and-out.nvim": { "branch": "master", "commit": "ab24cafadc3418dffb0c7e9b0621cff60b9ac551" }, - "indent-blankline.nvim": { "branch": "master", "commit": "5da5546947f3125dfd6aa85ab21074dc83f776d5" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, "inlay-hint.nvim": { "branch": "main", "commit": "c31047c9b3943b29bd4839c7fe5b08dc12730469" }, - "inlay-hints.nvim": { "branch": "master", "commit": "1d5bd49a43f8423bc56f5c95ebe8fe3f3b96ed58" }, + "inlay-hints.nvim": { "branch": "master", "commit": "e81444416eea7fe5f19a6bc8336a7aed628f3663" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, - "lackluster.nvim": { "branch": "main", "commit": "362e40056bb582ced43447d63bc1055e99f14ba4" }, - "lazy.nvim": { "branch": "main", "commit": "7108809ab18dc1b1e6f402b29e2e1d35a5d311d5" }, + "lackluster.nvim": { "branch": "main", "commit": "2fcf09e7492ff50067ac9c0ca4bd81563499c410" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, - "markdown-table-mode.nvim": { "branch": "main", "commit": "a5f2b7936b4c09f5684d404dceb38eed3016c51b" }, + "markdown-table-mode.nvim": { "branch": "main", "commit": "f830cd15a97deb3acc53d9f6607bc609f7f32e49" }, "markdown-togglecheck": { "branch": "main", "commit": "5e9ee3184109a102952c01ef816babe8835b299a" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "melange.nvim": { "branch": "master", "commit": "f626d41b9110e6ab853538d8b939979a0f1adfeb" }, - "neoconf.nvim": { "branch": "main", "commit": "7ce69e831556861f3bd32a5678f0176618df8621" }, + "melange.nvim": { "branch": "master", "commit": "e84f8bc2abc5d6edaa7bd48a16c3078504ecb713" }, + "neoconf.nvim": { "branch": "main", "commit": "59b5aa97496b074ebee43b97cfd9beb57ea1a312" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "neogen": { "branch": "main", "commit": "fef1ab3932f724ec558d2498e92a0ce6933c2c79" }, + "neogen": { "branch": "main", "commit": "dc50715c009f89b8111197fd2f282f6042daa7ea" }, "neogit": { "branch": "master", "commit": "16ee9ae957db2142fb189f5f2556123e24c5b7fb" }, "neorg": { "branch": "main", "commit": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be" }, - "neorg-telescope": { "branch": "main", "commit": "2fe2780d539b961ef240f7907802754556ba7bb8" }, + "neorg-telescope": { "branch": "main", "commit": "ddb2556644cae922699a239bbb0fe16e25b084b7" }, "neotest": { "branch": "master", "commit": "32ff2ac21135a372a42b38ae131e531e64833bd3" }, "neotest-gtest": { "branch": "main", "commit": "b44c8afc26cea75ffc80617ce07b4e745a56e589" }, - "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, + "neotest-python": { "branch": "master", "commit": "72603dfdbaad5695160268cb10531a14cc37236e" }, "neotest-vim-test": { "branch": "master", "commit": "75c4228882ae4883b11bfce9b8383e637eb44192" }, - "neotest-vitest": { "branch": "main", "commit": "353364aa05b94b09409cbef21b79c97c5564e2ce" }, "nightfly.nvim": { "branch": "master", "commit": "19efaf31cbe15a429cb3ca6ac9c9fce13275045b" }, "nightfox.nvim": { "branch": "main", "commit": "d3e8b1acc095baf57af81bb5e89fe7c4359eb619" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, + "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-cmp-lsp-rs": { "branch": "main", "commit": "d9ebeca9ea07ba2fd57f997b2d6a8bc7da51abed" }, "nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" }, - "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, - "nvim-dap-python": { "branch": "master", "commit": "d777c2b32ed39f61209c09bede28d7491621a631" }, + "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, + "nvim-dap-python": { "branch": "master", "commit": "7c427e2bbc72d46ea3c9602bede6465ef61b8c19" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" }, - "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" }, + "nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" }, + "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" }, + "nvim-lspconfig": { "branch": "master", "commit": "b21c166bbf337734f2a39734a905c1c3e298205c" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-silicon": { "branch": "main", "commit": "b305ad8a45210f0dc8bbba1494dea6af072c0ed2" }, + "nvim-silicon": { "branch": "main", "commit": "feb882f04c992b797daa118101a239fb3bedfc04" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" }, - "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, - "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, - "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, + "nvim-treesitter": { "branch": "master", "commit": "0b8b78f9d08dc338a146eb4cd4bcbed8dd36a783" }, + "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b" }, + "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" }, + "nvim-ufo": { "branch": "main", "commit": "7dcb8fea3e7b3ccdb50f2c3ae7c248cdf6fe1ae1" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "ohne-accidents": { "branch": "main", "commit": "832b942a928e74b537a2526eacc6285e26af9589" }, - "oil.nvim": { "branch": "master", "commit": "71c972fbd218723a3c15afcb70421f67340f5a6d" }, + "oil.nvim": { "branch": "master", "commit": "a632c898fbe0e363ef89b9577f1a7714ab67d682" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, - "otter.nvim": { "branch": "main", "commit": "837f258040d0174ff8495584088046f98499b1ac" }, + "otter.nvim": { "branch": "main", "commit": "3b4fa74f0a385207fa9c29b61b07178345a3dab2" }, "pathlib.nvim": { "branch": "main", "commit": "7a5a6facd29e306bc73a37719fa67c0d2226f852" }, "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, - "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "960cce4eba798748baff3892a62f2c2b210fb76b" }, + "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "9f3d10e66a79e8975926f8cb930856e4930d9da4" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, - "rose-pine.nvim": { "branch": "main", "commit": "e72f6ea4a994ee5f9f3f444cc33c5702920e3d0f" }, + "rose-pine.nvim": { "branch": "main", "commit": "256d086c218a282ae5de79d2c091b1e592a65367" }, "runner.nvim": { "branch": "main", "commit": "9ae6f56b73471174c6c4d47581007c6781fb6b6e" }, "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, "spellwarn.nvim": { "branch": "main", "commit": "2f4dbc58bb90bc63b295461216b91ccf4e7f782d" }, - "tagbar": { "branch": "master", "commit": "1690b19ea62a8c9fef68a2c35896910338a1dfe5" }, - "tailwind-fold.nvim": { "branch": "main", "commit": "0e4ef9dc65916ce368fb6a81843293995f477f9e" }, + "tagbar": { "branch": "master", "commit": "d55d454bd3d5b027ebf0e8c75b8f88e4eddad8d8" }, + "tailwind-fold.nvim": { "branch": "main", "commit": "28a4190a97af3c5cc4885c228ec61e331d1296ea" }, "telescope-bibtex.nvim": { "branch": "master", "commit": "289a6f86ebec06e8ae1590533b732b9981d84900" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-git-diffs.nvim": { "branch": "main", "commit": "366df26227e6d478d5c55e04771d61875c4f22ac" }, "telescope-heading.nvim": { "branch": "main", "commit": "e85c0f69cb64048f56e76548dcb2f10277576df9" }, - "telescope-import.nvim": { "branch": "main", "commit": "baa2d50be46c769a1cc942a9d5be049f314f4206" }, - "telescope-lazy.nvim": { "branch": "main", "commit": "08eb9d05455cabc126e9b850470205d4f3ac7caf" }, + "telescope-import.nvim": { "branch": "main", "commit": "e60ca0fea71432ed578e17d8f1b153da3fa4555d" }, + "telescope-lazy.nvim": { "branch": "main", "commit": "7b87a3bc80443849e29bd871f00d41dfd8d90e41" }, "telescope-luasnip.nvim": { "branch": "master", "commit": "11668478677de360dea45cf2b090d34f21b8ae07" }, "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" }, "telescope-software-licenses.nvim": { "branch": "master", "commit": "fb5fc33b6afc994756e2f372423c365bf66f2256" }, @@ -132,15 +137,11 @@ "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": "c3a56c652af9367c5a7b658ed7ed4dc494f430b0" }, - "vim-dadbod-ui": { "branch": "master", "commit": "0f51d8de368c8c6220973e8acd156d17da746f4c" }, - "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": "5ac62e0315c6f54f53a7d6da7c485cf8e9cf7240" }, + "vimtex": { "branch": "master", "commit": "76ef99f73a5ff10be59836a4af4f928eaa8ad284" }, "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index 3117caa..bcf197e 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -13,7 +13,6 @@ return { dependencies = { "nvim-lua/plenary.nvim" }, event = { "BufRead pyproject.toml" }, }, - { "kristijanhusak/vim-dadbod-completion", dependencies = { "tpope/vim-dadbod" } }, "SergioRibera/cmp-dotenv", "L3MON4D3/LuaSnip", "saadparwaiz1/cmp_luasnip", @@ -21,10 +20,22 @@ return { "Exafunction/codeium.nvim", "petertriho/cmp-git", "davidsierradz/cmp-conventionalcommits", + "zjp-CN/nvim-cmp-lsp-rs", + { + "MattiasMTS/cmp-dbee", + dependencies = { + { "kndndrj/nvim-dbee" }, + }, + ft = { "sql", "mysql", "plsql" }, + opts = {}, + }, }, - config = function() + opts = function(_, opts) local cmp = require("cmp") local luasnip = require("luasnip") + local cmp_lsp_rs = require("cmp_lsp_rs") + local comparators = cmp_lsp_rs.comparators + local compare = require("cmp").config.compare local kind_icons = { Text = "󰉿", Method = "󰆧", @@ -54,8 +65,7 @@ return { Copilot = "", Codeium = "", } - - cmp.setup({ + opts = { mapping = { [""] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }), [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }), @@ -75,11 +85,11 @@ return { { name = "nvim_lsp" }, { name = "crates" }, { name = "async_path" }, + { name = "cmp-dbee" }, { name = "luasnip" }, { name = "buffer", keyword_length = 4 }, { name = "neorg" }, { name = "pypi" }, - { name = "vim-dadbod-completion" }, { name = "env" }, { name = "calc" }, { name = "codeium" }, @@ -107,15 +117,14 @@ return { neorg = "[neorg]", crates = "[crates]", pypi = "[pypi]", - vim_dadbod_completion = "[DB]", env = "[env]", buffer = "[buf]", + ["cmp-dbee"] = "[DB]", })[entry.source.name] return vim_item end, expandable_indicator = true, }, - experimental = { ghost_text = true, }, @@ -127,6 +136,22 @@ return { behavior = cmp.ConfirmBehavior.Replace, select = false, }, - }) + sorting = { + comparators = { + compare.exact, + compare.score, + -- comparators.inherent_import_inscope, + comparators.inscope_inherent_import, + comparators.sort_by_label_but_underscore_last, + }, + }, + } + for _, source in ipairs(opts.sources) do + cmp_lsp_rs.filter_out.entry_filter(source) + end + return opts + end, + config = function(_, opts) + require("cmp").setup(opts) end, } diff --git a/lua/plugins/codeium.lua b/lua/plugins/codeium.lua index 6cd7901..4db5ed4 100644 --- a/lua/plugins/codeium.lua +++ b/lua/plugins/codeium.lua @@ -4,6 +4,7 @@ return { "nvim-lua/plenary.nvim", "hrsh7th/nvim-cmp", }, + commit = "d3b88eb3aa1de6da33d325c196b8a41da2bcc825", cmd = { "Codeium" }, opts = { enable_chat = true, diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 3145eec..b4d4aae 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -27,6 +27,8 @@ return { { "savq/melange-nvim", name = "melange.nvim" }, { "ellisonleao/gruvbox.nvim" }, { "bluz71/vim-nightfly-colors", name = "nightfly.nvim" }, + { "0xstepit/flow.nvim" }, + { "Aliqyan-21/darkvoid.nvim" }, { "rose-pine/neovim", name = "rose-pine.nvim", diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 9525a01..37c2ccc 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -25,7 +25,7 @@ return { vimwiki = { "cbfmt", "markdownlint", "markdown-toc" }, json = { "jq" }, c = { "clang-format" }, - toml = { "taplo" }, + -- toml = { "taplo" }, cpp = { "clang-format" }, cmake = { "cmake_format" }, htmldjango = { "djlint", "rustywind" }, diff --git a/lua/plugins/dadbod.lua b/lua/plugins/dadbod.lua deleted file mode 100644 index 55ff500..0000000 --- a/lua/plugins/dadbod.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - "kristijanhusak/vim-dadbod-ui", - dependencies = { - { "tpope/vim-dotenv" }, - { "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", - "DBUIAddConnection", - "DBUIFindBuffer", - }, -} diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua index bf59926..d8cec93 100644 --- a/lua/plugins/dap.lua +++ b/lua/plugins/dap.lua @@ -194,7 +194,7 @@ return { dapui.setup() require("mason-nvim-dap").setup({ ensure_installed = { - "python", + "firefox-debug-adapter", }, automatic_install = true, }) @@ -202,17 +202,37 @@ return { require("nvim-dap-virtual-text").setup({}) -- Python - local debugpy = mason_registry.get_package("debugpy") - local debugpy_path = debugpy:get_install_path() .. "/venv/bin/python" - require("dap-python").setup(debugpy_path) + require("dap-python").setup("python") + + -- JS/TS + local firefox_debug_adapter = mason_registry.get_package("firefox-debug-adapter"):get_install_path() + .. "/dist/adapter.bundle.js" + dap.adapters.firefox = { + type = "executable", + command = "bun", + args = { firefox_debug_adapter }, + } + dap.configurations.javascript = { + { + name = "Debug with Firefox", + type = "firefox", + request = "launch", + reAttach = true, + url = "http://localhost:3000", + webRoot = "${workspaceFolder}", + firefoxExecutable = "/usr/bin/floorp", + }, + } + dap.configurations.typescript = dap.configurations.javascript + dap.configurations.typescriptreact = dap.configurations.javascript -- C/C++ dap.adapters.gdb = { type = "executable", command = "gdb", - args = { "-i", "dap" }, + args = { "--interpreter=dap", "--eval-command", "set print pretty on" }, } - dap.configurations.cpp = { + dap.configurations.c = { { name = "Launch", type = "gdb", @@ -223,7 +243,30 @@ return { cwd = "${workspaceFolder}", stopAtBeginningOfMainSubprogram = false, }, + { + name = "Select and attach to process", + type = "gdb", + request = "attach", + program = function() + return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file") + end, + pid = function() + local name = vim.fn.input("Executable name (filter): ") + return require("dap.utils").pick_process({ filter = name }) + end, + cwd = "${workspaceFolder}", + }, + { + name = "Attach to gdbserver :1234", + type = "gdb", + request = "attach", + target = "localhost:1234", + program = function() + return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file") + end, + cwd = "${workspaceFolder}", + }, } - dap.configurations.c = dap.configurations.cpp + dap.configurations.cpp = dap.configurations.c end, } diff --git a/lua/plugins/dbee.lua b/lua/plugins/dbee.lua new file mode 100644 index 0000000..c973b15 --- /dev/null +++ b/lua/plugins/dbee.lua @@ -0,0 +1,19 @@ +return { + "kndndrj/nvim-dbee", + dependencies = { + "MunifTanjim/nui.nvim", + }, + cmd = "Dbee", + build = function() + -- Install tries to automatically detect the install method. + -- if it fails, try calling it with one of these parameters: + -- "curl", "wget", "bitsadmin", "go" + require("dbee").install("curl") + end, + opts = { + --- https://github.com/kndndrj/nvim-dbee/blob/master/lua/dbee/config.lua + }, + config = function(_, opts) + require("dbee").setup(opts) + end, +} diff --git a/lua/plugins/demicolon.lua b/lua/plugins/demicolon.lua new file mode 100644 index 0000000..d0bbe60 --- /dev/null +++ b/lua/plugins/demicolon.lua @@ -0,0 +1,8 @@ +return { + "mawkler/demicolon.nvim", + dependencies = { + "nvim-treesitter/nvim-treesitter", + "nvim-treesitter/nvim-treesitter-textobjects", + }, + opts = {}, +} diff --git a/lua/plugins/garbage_day.lua b/lua/plugins/garbage_day.lua index 4103530..ebdb1f1 100644 --- a/lua/plugins/garbage_day.lua +++ b/lua/plugins/garbage_day.lua @@ -4,7 +4,7 @@ return { event = "VeryLazy", opts = { aggressive_mode = false, - excluded_lsp_clients = {}, + excluded_lsp_clients = { "rust_analyzer" }, grace_period = 60 * 15, wakeup_delay = 0, }, diff --git a/lua/plugins/ibl.lua b/lua/plugins/ibl.lua index b395d35..c8cfa5b 100644 --- a/lua/plugins/ibl.lua +++ b/lua/plugins/ibl.lua @@ -1,9 +1,8 @@ return { "lukas-reineke/indent-blankline.nvim", main = "ibl", - version = "3.5.0", + version = "*", opts = { - enabled = true, indent = { smart_indent_cap = true, }, @@ -27,6 +26,7 @@ return { "packer", "startify", "lspinfo", + "dbee", }, buftypes = { "terminal", diff --git a/lua/plugins/illuminate.lua b/lua/plugins/illuminate.lua index b4d39a0..bbd7bc8 100644 --- a/lua/plugins/illuminate.lua +++ b/lua/plugins/illuminate.lua @@ -1,5 +1,22 @@ return { "RRethy/vim-illuminate", + event = "BufReadPost", + keys = { + { + + "", + function() + require("illuminate").goto_next_reference() + end, + }, + { + + "", + function() + require("illuminate").goto_prev_reference() + end, + }, + }, config = function() require("illuminate").configure({ providers = { @@ -19,6 +36,7 @@ return { "NvimTree", "dirvish", "fugitive", + "dbee", }, -- filetypes_allowlist: filetypes to illuminate, this is overridden by filetypes_denylist filetypes_allowlist = {}, @@ -48,11 +66,5 @@ return { -- min_count_to_highlight: minimum number of matches required to perform highlighting min_count_to_highlight = 1, }) - vim.keymap.set("n", "", function() - require("illuminate").goto_next_reference() - end, { noremap = true }) - vim.keymap.set("n", "", function() - require("illuminate").goto_prev_reference() - end, { noremap = true }) end, } diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua index db40c14..3a2a6f5 100644 --- a/lua/plugins/neorg.lua +++ b/lua/plugins/neorg.lua @@ -6,6 +6,59 @@ return { { "nvim-neorg/neorg-telescope" }, }, cmd = { "Neorg" }, + keys = { + { "", "(neorg.qol.todo-items.todo.task-cycle)", desc = "Cycle Todo Item", ft = { "norg" } }, + { + "cm", + "(neorg.looking-glass.magnify-code-block)", + desc = "Mignify Code Block", + ft = { "norg" }, + }, + { "id", "(neorg.tempus.insert-date)", desc = "Insert Date", ft = { "norg" } }, + { "li", "(neorg.pivot.list.invert)", desc = "List invert", ft = { "norg" } }, + { "lt", "(neorg.pivot.list.toggle)", desc = "List Toggle", ft = { "norg" } }, + { "nn", "(neorg.dirman.new-note)", desc = "New Note", ft = { "norg" } }, + { + "ta", + "(neorg.qol.todo-items.todo.task-ambiguous)", + desc = "Task Ambiguous", + ft = { "norg" }, + }, + { + "tc", + "(neorg.qol.todo-items.todo.task-cancelled)", + desc = "Task Cancelled", + ft = { "norg" }, + }, + { "td", "(neorg.qol.todo-items.todo.task-done)", desc = "Task Done", ft = { "norg" } }, + { + "th", + "(neorg.qol.todo-items.todo.task-on-hold)", + desc = "Task on Hold", + ft = { "norg" }, + }, + { + "ti", + "(neorg.qol.todo-items.todo.task-important)", + desc = "Task Important", + ft = { "norg" }, + }, + { + "tp", + "(neorg.qol.todo-items.todo.task-pending)", + desc = "Task Pending", + ft = { "norg" }, + }, + { + "tr", + "(neorg.qol.todo-items.todo.task-recurring)", + desc = "Task Recurring", + ft = { "norg" }, + }, + { "tu", "(neorg.qol.todo-items.todo.task-undone)", desc = "Task Undone", ft = { "norg" } }, + { ">", "(neorg.promo.promote.range)", desc = "Promote Range", ft = { "norg" } }, + { "<", "(neorg.promo.demote.range)", desc = "Demote Range", ft = { "norg" } }, + }, lazy = true, version = "*", ft = "norg", diff --git a/lua/plugins/neotes.lua b/lua/plugins/neotest.lua similarity index 100% rename from lua/plugins/neotes.lua rename to lua/plugins/neotest.lua diff --git a/lua/plugins/noetest.lua b/lua/plugins/noetest.lua deleted file mode 100644 index 8317561..0000000 --- a/lua/plugins/noetest.lua +++ /dev/null @@ -1,21 +0,0 @@ -return { - "nvim-neotest/neotest", - dependencies = { - "nvim-neotest/nvim-nio", - "nvim-lua/plenary.nvim", - "antoinemadec/FixCursorHold.nvim", - "nvim-treesitter/nvim-treesitter", - "nvim-neotest/neotest-python", - "marilari88/neotest-vitest", - "mrcjkb/rustaceanvim", - "alfaix/neotest-gtest", - }, - opts = { - adapters = { - ["neotest-python"] = {}, - ["neotest-vitest"] = {}, - ["rustaceanvim.neotest"] = {}, - ["neotest-gtest"] = {}, - }, - }, -} diff --git a/lua/plugins/nvim-lint.lua b/lua/plugins/nvim-lint.lua index dad5a8f..ad33dc3 100644 --- a/lua/plugins/nvim-lint.lua +++ b/lua/plugins/nvim-lint.lua @@ -27,12 +27,3 @@ return { }) end, } - --- ◍ biome --- ◍ cmakelang --- ◍ cmakelint --- ◍ cpplint --- ◍ djlint --- ◍ jinja-lsp jinja_lsp --- ◍ markdownlint --- ◍ mypy diff --git a/lua/plugins/telescope-import.lua b/lua/plugins/telescope-import.lua index f3092fb..d8aaebd 100644 --- a/lua/plugins/telescope-import.lua +++ b/lua/plugins/telescope-import.lua @@ -2,6 +2,7 @@ local ft = { "typescript", "typescriptreact", "javascript", "react", "python", " return { "piersolenski/telescope-import.nvim", dependencies = "nvim-telescope/telescope.nvim", + commit = "e60ca0fea71432ed578e17d8f1b153da3fa4555d", ft = ft, keys = { { diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 7efcf77..6eee32a 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -9,7 +9,7 @@ return { }, 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 + ensure_installed = { "cpp", "lua", "rust", "python", "markdown", "json", "http", "markdown_inline", "sql" }, -- 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 diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua index 498d893..c59327b 100644 --- a/lua/plugins/trouble.lua +++ b/lua/plugins/trouble.lua @@ -5,12 +5,12 @@ return { cmd = "Trouble", keys = { { - "tt", + "xx", "Trouble diagnostics toggle", desc = "Toggle trouble", }, { - "td", + "xd", "Trouble diagnostics toggle filter.buf=0", desc = "[D]ocument Diagnostics", }, diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua index 5ad2b3c..f9ecf44 100644 --- a/lua/plugins/which-key.lua +++ b/lua/plugins/which-key.lua @@ -25,7 +25,7 @@ return { { { "C", vim.cmd.bdelete, desc = "[C]lose Buffer" }, { "c", group = "[C]url", { "cC", group = "[C]SV" } }, - { "t", group = "[T]rouble" }, + { "x", group = "Trouble" }, { "g", group = "[G]it" }, { "q", group = "Persistence" }, { "l", group = "[L]SP" }, diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm index 9e40d6d..0f26c2a 100644 --- a/queries/rust/injections.scm +++ b/queries/rust/injections.scm @@ -1,8 +1,7 @@ ; Inject into sqlx::query!(r#"..."#, ...) as sql -(macro_invocation - (scoped_identifier - path: (identifier) @_path (#eq? @_path "sqlx")) - - (token_tree - (raw_string_literal) @sql) - (#offset! @sql 1 0 0 0)) +([ + (string_literal) + (raw_string_literal) + ] @sql + (#match? @sql "(SELECT|select|INSERT|insert|UPDATE|update|DELETE|delete).+(FROM|from|INTO|into|VALUES|values|SET|set).*(WHERE|where|GROUP BY|group by)?") + (#offset! @sql 1 0 0 0)) diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index b572c45..386c4bf 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -9,3 +9,14 @@ duplicants Linters Emisela Kristofers +Figma +TODO +favorited +emisela +JSON +backend +municipality +province +province +province +province diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 50f3e83..71d0c42 100644 Binary files a/spell/en.utf-8.add.spl and b/spell/en.utf-8.add.spl differ