diff --git a/after/plugin/sql_automagic.lua b/after/plugin/sql_automagic.lua index 2951431..dc96c61 100644 --- a/after/plugin/sql_automagic.lua +++ b/after/plugin/sql_automagic.lua @@ -3,7 +3,8 @@ local run_formatter = function(text) local result = table.concat(vim.list_slice(split, 2, #split - 1), "\n") local j = require("plenary.job"):new({ - command = "pg_format", + command = "sqruff", + args = { "format", "-" }, writer = { result }, }) return j:sync() diff --git a/lazy-lock.json b/lazy-lock.json index 56aa73d..fd9bdd8 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,12 +2,12 @@ "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "blink-cmp-git": { "branch": "master", "commit": "31dad5db284641c94537de29865bb46495c53071" }, + "blink-cmp-git": { "branch": "master", "commit": "a820245eb0e5cb44ed0c27c63a41d90635b39e0e" }, "blink-emoji.nvim": { "branch": "master", "commit": "f22ce8cac02a6ece05368220f1e38bd34fe376f9" }, - "blink-ripgrep.nvim": { "branch": "main", "commit": "0a55b323c1011a26ca216a823fe24075068b0bee" }, - "blink.cmp": { "branch": "main", "commit": "586ee87534f5bf65f1c8dea2d1da2a57e8cddd36" }, + "blink-ripgrep.nvim": { "branch": "main", "commit": "a6096efa377dab8767d6b67b9822c222e39e5d49" }, + "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, - "catppuccin.nvim": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, + "catppuccin.nvim": { "branch": "main", "commit": "94f6e8a06b6bb7b8e5529cf9f93adb4654534241" }, "ccc.nvim": { "branch": "main", "commit": "9d1a256e006decc574789dfc7d628ca11644d4c2" }, "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" }, "cheatsheet.nvim": { "branch": "master", "commit": "8ee4d76b6f902c4017dc28eddd79d925dfc55066" }, @@ -19,7 +19,7 @@ "crates.nvim": { "branch": "main", "commit": "afcd1cc3eeceb5783676fc8464389b9216a29d05" }, "cratesearch.nvim": { "branch": "master", "commit": "9d09625d017f6b2e116503f935bc6862961313fa" }, "css-vars.nvim": { "branch": "main", "commit": "0615782c320f729b04d9c51a8a61fb498ee4234a" }, - "csvview.nvim": { "branch": "main", "commit": "2a2631ed90a9e6b038a6e3047b6cf332d5b45ff3" }, + "csvview.nvim": { "branch": "main", "commit": "22c9450d19749aa80cc42f0c968cb9dd57726ece" }, "darkplus.nvim": { "branch": "master", "commit": "c7fff5ce62406121fc6c9e4746f118b2b2499c4c" }, "darkvoid.nvim": { "branch": "master", "commit": "45be993a5617e05811b6b293c05e6aded7003cc9" }, "demicolon.nvim": { "branch": "main", "commit": "8d79e527dbbef9de06405a30258b8d752c0638c4" }, @@ -30,7 +30,7 @@ "gh.nvim": { "branch": "main", "commit": "6f367b2ab8f9d4a0a23df2b703a3f91137618387" }, "gitignore.nvim": { "branch": "master", "commit": "0344f643768c4d64af4add8c1bdddf6f7d4c9010" }, "gitpad.nvim": { "branch": "main", "commit": "1e0f6fa335c72c05d1d3635120c572e198e5ae0d" }, - "gitsigns.nvim": { "branch": "main", "commit": "0cb5a7753d3c4b8e9cfdc9d88d9110cb8d4b1544" }, + "gitsigns.nvim": { "branch": "main", "commit": "b01433169be710d6c69f7b4ee264d9670698b831" }, "gruvbox.nvim": { "branch": "main", "commit": "58a2cda2e953a99e2f87c12b7fb4602da4e0709c" }, "hardtime.nvim": { "branch": "main", "commit": "1a3648a53002c2911ccb88e9c9f876cdc6c43ad6" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, @@ -41,6 +41,7 @@ "jupynium.nvim": { "branch": "master", "commit": "4086e40f5ab3b8b74330c5a69a26791953da5cd2" }, "jupytext.nvim": { "branch": "master", "commit": "2e86acfa4345f611c86f57116db0c06ffecb721d" }, "kanagawa.nvim": { "branch": "master", "commit": "debe91547d7fb1eef34ce26a5106f277fbfdd109" }, + "kulala.nvim": { "branch": "main", "commit": "6b6e1c8b538cce6654cfc5fb3e4a3acfa316ce57" }, "lackluster.nvim": { "branch": "main", "commit": "b247a6f51cb43e49f3f753f4a59553b698bf5438" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, @@ -53,13 +54,13 @@ "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, "markview.nvim": { "branch": "main", "commit": "ec33f2aa333ca1d76f51847922578434d7aeadf7" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a9c876d72d82b6640266f8b248ac05a63630b1d9" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "5fcd0dfdcf55d8a1c1a02cccc14ee5d79728a496" }, - "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f2fa60409630ec2d24acf84494fb55e1d28d593c" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "86389a3dd687cfaa647b6f44731e492970034baa" }, + "mason.nvim": { "branch": "main", "commit": "3671ab0d40aa5bd24b1686562bd0a23391ecf76a" }, "melange.nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" }, - "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" }, + "mini.icons": { "branch": "main", "commit": "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c" }, "mini.nvim": { "branch": "main", "commit": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152" }, - "neoconf.nvim": { "branch": "main", "commit": "d0a2652eb8e9fc4e6f531a622c8f32eb78b44a98" }, + "neoconf.nvim": { "branch": "main", "commit": "9772a2526adb47067d6fabe23535270cefce67e5" }, "neocord": { "branch": "main", "commit": "2ebf3792a8100376bb65fd66d5dbf60f50af7529" }, "neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" }, "neogit": { "branch": "master", "commit": "43fa47fb61773b0d90a78ebc2521ea8faaeebd86" }, @@ -73,40 +74,40 @@ "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "8a9b722257b5e6733c340c36f4bd8693e5f47de3" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "16597180b4dd81fa3d23d88c4d2f1b49154f9479" }, "nvim-dap": { "branch": "master", "commit": "5dd4d50f2e6a2eaf9e57fad023d294ef371bda35" }, "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, - "nvim-dbee": { "branch": "master", "commit": "044e016127e63428b8d54116943cad29457db665" }, + "nvim-dbee": { "branch": "master", "commit": "dda517694889a5d238d7aa407403984da9f80cc0" }, "nvim-java": { "branch": "main", "commit": "7c2e81caa301b0d1bc7992b88981af883b3b5d6b" }, "nvim-java-core": { "branch": "main", "commit": "401bf7683012a25929a359deec418f36beb876e2" }, "nvim-java-dap": { "branch": "main", "commit": "55f239532f7a3789d21ea68d1e795abc77484974" }, "nvim-java-refactor": { "branch": "main", "commit": "b51a57d862338999059e1d1717df3bc80a3a15c0" }, "nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" }, - "nvim-lint": { "branch": "master", "commit": "3c5e34c24834a67b1cb37600ab7663eefd2b0390" }, - "nvim-lspconfig": { "branch": "master", "commit": "d3934000788ab0a8f98ed58bc69e4b73ad26b110" }, + "nvim-lint": { "branch": "master", "commit": "9c6207559297b24f0b7c32829f8e45f7d65b991f" }, + "nvim-lspconfig": { "branch": "master", "commit": "3db16ceeea947517f0dc1404c24dcb5ab0c91d26" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-silicon": { "branch": "main", "commit": "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-context": { "branch": "master", "commit": "59f318a65d42a5c4037796886a8874fd57f774fc" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" }, + "nvim-treesitter-context": { "branch": "master", "commit": "02fd97c803962108d129cf42e05adc5eff7f89c1" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, "nvim-ufo": { "branch": "main", "commit": "80fe8215ba566df2fbf3bf4d25f59ff8f41bc0e1" }, - "nvim-web-devicons": { "branch": "master", "commit": "0422a19d9aa3aad2c7e5cca167e5407b13407a9d" }, + "nvim-web-devicons": { "branch": "master", "commit": "4a8369f4c78ef6f6f895f0cec349e48f74330574" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, "oil.nvim": { "branch": "master", "commit": "975a77cce3c8cb742bc1b3629f4328f5ca977dad" }, - "onedark.nvim": { "branch": "master", "commit": "11de4da47f3e69cb70c3ae9816bd8af166cbe121" }, + "onedark.nvim": { "branch": "master", "commit": "de495fabe171d48aed5525f002d14414efcecbb2" }, "otter.nvim": { "branch": "main", "commit": "fcc8cf1eeb39f16c309bb27a7ff140ddf87c9fcb" }, "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "5ebe9f26e0263ac724211e8637874df8ab9e7cc4" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "97bf4b8ef9298644a29fcd9dd41a0210cf08cac7" }, "rainbow_csv.nvim": { "branch": "main", "commit": "26de78d8324f7ac6a3e478319d1eb1f17123eb5b" }, - "rose-pine.nvim": { "branch": "main", "commit": "f93360149e9ed4df8677fbb07c7231ea0fd03b97" }, + "rose-pine.nvim": { "branch": "main", "commit": "72befaffeac38db7bdd49e0549eaa2c4806dd878" }, "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "spellwarn.nvim": { "branch": "main", "commit": "12734b47b008d912b4925c0bc2c1248eb534409d" }, @@ -115,7 +116,7 @@ "tagbar": { "branch": "master", "commit": "2ef4ecba94440fcf8a8c692a0f2b36b332f1f0f2" }, "tailwind-fold.nvim": { "branch": "main", "commit": "d9e7ca11691d252b35795726dff087bf013b2ebf" }, "telescope-bibtex.nvim": { "branch": "master", "commit": "289a6f86ebec06e8ae1590533b732b9981d84900" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "03a0efd1a8668b902bddef4b82cb7d46cd5ab22c" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "21c08f073cfae477e6304b85cae78fbf46a793a4" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-git-diffs.nvim": { "branch": "main", "commit": "b8e5c9e13b9e27f8ccfd14430d04739b9996ae76" }, "telescope-heading.nvim": { "branch": "main", "commit": "e85c0f69cb64048f56e76548dcb2f10277576df9" }, @@ -144,7 +145,7 @@ "vim-just": { "branch": "main", "commit": "e0c04b6433b9c636274f074356744fdfae039b7e" }, "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }, - "vim-wakatime": { "branch": "master", "commit": "f39c4a201ae350aaba713b59d4a4fdd88e0811aa" }, + "vim-wakatime": { "branch": "master", "commit": "3403495670f0ee08887401a28f8430dc4ac67429" }, "vimtex": { "branch": "master", "commit": "bcb14eb6e3739f0c1902115a710292bc37c62d2e" }, "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" } diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua index df9190b..10e05ca 100644 --- a/lua/plugins/blink.lua +++ b/lua/plugins/blink.lua @@ -123,12 +123,16 @@ return { score_offset = -100, opts = { prefix_min_len = 5, - context_size = 5, - max_filesize = "1M", project_root_marker = { ".git", "package.json", ".root" }, - search_casing = "--smart-case", - additional_rg_options = {}, fallback_to_regex_highlighting = true, + backend = { + ripgrep = { + context_size = 5, + max_filesize = "1M", + search_casing = "--smart-case", + additional_rg_options = {}, + }, + }, }, }, emoji = { diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 82eefc3..a5f790d 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -15,6 +15,7 @@ return { }, opts = { formatters_by_ft = { + ["_"] = { "trim_whitespace" }, bash = { "shfmt" }, c = { "clang-format" }, cmake = { "cmake_format" }, @@ -23,12 +24,14 @@ return { go = { "goimports", "gofmt" }, html = { "djlint", "rustywind" }, htmldjango = { "djlint", "rustywind" }, + http = { "kulala-fmt" }, javascript = js, javascriptreact = js, json = { "jq" }, lua = { "stylua" }, markdown = { "cbfmt", "markdownlint", "markdown-toc" }, python = { "ruff_format", "ruff_fix", "ruff_organize_imports", "docformatter" }, + rest = { "kulala" }, rust = { "rustfmt", "leptosfmt", "yew-fmt" }, scss = { "prettier" }, sql = { "sqruff" }, @@ -38,7 +41,6 @@ return { typst = { "typstyle" }, vimwiki = { "cbfmt", "markdownlint", "markdown-toc" }, yaml = { "yamlfmt" }, - ["_"] = { "trim_whitespace" }, }, format_on_save = { timeout_ms = 500, diff --git a/lua/plugins/kulala.lua b/lua/plugins/kulala.lua new file mode 100644 index 0000000..c9be579 --- /dev/null +++ b/lua/plugins/kulala.lua @@ -0,0 +1,164 @@ +return { + "mistweaverco/kulala.nvim", + keys = { + { + "kb", + function() + require("kulala").scratchpad() + end, + desc = "Open scratchpad", + }, + { + "ko", + function() + require("kulala").open() + end, + desc = "Open kulala", + }, + { + "kt", + function() + require("kulala").toggle_view() + end, + desc = "Toggle headers/body", + ft = { "http", "rest" }, + }, + { + "kS", + function() + require("kulala").show_stats() + end, + desc = "Show stats", + ft = { "http", "rest" }, + }, + { + "kq", + function() + require("kulala").close() + end, + desc = "Close window", + ft = { "http", "rest" }, + }, + { + "kc", + function() + require("kulala").copy() + end, + desc = "Copy as cURL", + ft = { "http", "rest" }, + }, + { + "kp", + function() + require("kulala").from_curl() + end, + desc = "Paste from cURL", + ft = { "http", "rest" }, + }, + { + "ks", + function() + require("kulala").run() + end, + desc = "Send request", + }, + { + "", + function() + require("kulala").run() + end, + desc = "Send request", + ft = { "http", "rest" }, + }, + { + "ka", + function() + require("kulala").run_all() + end, + desc = "Send all requests", + }, + { + "ki", + function() + require("kulala").inspect() + end, + desc = "Inspect current request", + ft = { "http", "rest" }, + }, + { + "kr", + function() + require("kulala").replay() + end, + desc = "Replay the last request", + }, + { + "kf", + function() + require("kulala").search() + end, + desc = "Find request", + ft = { "http", "rest" }, + }, + { + "kn", + function() + require("kulala").jump_next() + end, + desc = "Jump to next request", + ft = { "http", "rest" }, + }, + { + "kp", + function() + require("kulala").jump_prev() + end, + desc = "Jump to previous request", + ft = { "http", "rest" }, + }, + { + "ke", + function() + require("kulala").set_selected_env() + end, + desc = "Jump to previous request", + ft = { "http", "rest" }, + }, + { + "ku", + function() + require("lua.kulala.ui.auth_manager").open_auth_config() + end, + desc = "Manage Auth Config", + ft = { "http", "rest" }, + }, + { + "kg", + function() + require("kulala").download_graphql_schema() + end, + desc = "Download GraphQL schema", + ft = { "http", "rest" }, + }, + { + "kx", + function() + require("kulala").scripts_clear_global() + end, + desc = "Clear globals", + ft = { "http", "rest" }, + }, + { + "kX", + function() + require("kulala").clear_cached_files() + end, + desc = "Clear cached files", + ft = { "http", "rest" }, + }, + }, + ft = { "http", "rest" }, + opts = { + global_keymaps = false, + }, +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 3187c6a..b393f20 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -134,11 +134,20 @@ return { "basedpyright", "bashls", "clangd", - "cmake", "cssls", + "css_variables", "emmet_language_server", + "gopls", "html", + "hyprls", + "jdtls", + "jinja_lsp", + "jsonls", "lua_ls", + "markdown_oxide", + "neocmake", + "ruff", + "somesass_ls", "tailwindcss", "texlab", "tinymist", @@ -355,6 +364,7 @@ return { "json5", }, }, + kulala_ls = {}, }, }, } diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua index 8b8003c..f23d3b5 100644 --- a/lua/plugins/which-key.lua +++ b/lua/plugins/which-key.lua @@ -55,6 +55,7 @@ return { { "O", group = "Obsidian" }, { "s", group = "Neogen" }, { "t", group = "Neotest" }, + { "k", group = "Kulala" }, { "d", group = "DAP",