diff --git a/init.lua b/init.lua index fbe2041..19ba944 100644 --- a/init.lua +++ b/init.lua @@ -181,7 +181,7 @@ require('lazy').setup({ }, init = function() local ensureInstalled = { - 'lua', 'python', 'typescript', + 'lua', 'python', 'typescript', 'http', 'properties', -- ... your parsers } local alreadyInstalled = require('nvim-treesitter.config').get_installed() @@ -208,7 +208,10 @@ require('lazy').setup({ -- -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins { import = 'custom.plugins' }, -}, {}) +}, { + -- rest.nvim installs its dependencies as luarocks rocks; use lazy's own luarocks for that + rocks = { hererocks = true }, +}) -- [[ Basic Keymaps ]] -- See lua/custom/options.lua for vim.opt settings @@ -273,7 +276,7 @@ require('custom.autopairs') require('custom.colorizer') require('custom.keymaps') require('custom.mason') -require('custom.kulala') +require('custom.rest') require('custom.rainbow') require('custom.none-ls') require('custom.gitsigns') diff --git a/lua/custom/kulala.lua b/lua/custom/kulala.lua deleted file mode 100644 index 49fc488..0000000 --- a/lua/custom/kulala.lua +++ /dev/null @@ -1,39 +0,0 @@ -require("kulala").setup({ - -- default_view, body or headers - default_view = "body", - -- dev, test, prod, can be anything - -- see: https://learn.microsoft.com/en-us/aspnet/core/test/http-files?view=aspnetcore-8.0#environment-files - default_env = "dev", - -- enable/disable debug mode - debug = false, - -- default formatters for different content types - formatters = { - json = { "jq", "." }, - xml = { "xmllint", "--format", "-" }, - html = { "xmllint", "--format", "--html", "-" }, - }, - -- default icons - icons = { - inlay = { - loading = "⏳", - done = "✅", - error = "❌", - }, - lualine = "🐼", - }, - -- additional cURL options - -- see: https://curl.se/docs/manpage.html - additional_curl_options = {}, -}) - -vim.filetype.add({ - extension = { - ['http'] = 'http', - }, -}) - - -vim.api.nvim_set_keymap("n", "rr", ":lua require('kulala').run()", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "rv", ":lua require('kulala').toggle_view()", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("n", "re", ":lua require('kulala').set_selected_env()", - { noremap = true, silent = true }) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 99681ca..260fa2e 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -93,7 +93,7 @@ return { { -- HTTP REST-Client Interface - 'mistweaverco/kulala.nvim', + 'rest-nvim/rest.nvim', }, --- diff view --- diff --git a/lua/custom/rest.lua b/lua/custom/rest.lua new file mode 100644 index 0000000..402f493 --- /dev/null +++ b/lua/custom/rest.lua @@ -0,0 +1,3 @@ +vim.keymap.set("n", "rr", "Rest run", { silent = true, desc = "[R]est [r]un request" }) +vim.keymap.set("n", "ro", "Rest open", { silent = true, desc = "[R]est [o]pen result pane" }) +vim.keymap.set("n", "re", "Rest env select", { silent = true, desc = "[R]est select [e]nv file" })