nvim: add hurl

Author: smoothprogrammer

modules/nvim/default.nix

@@ -8,32 +8,20 @@
 let
   cfg = config.conf.nvim;
 
-  rest-nvim = pkgs.vimUtils.buildVimPlugin {
-    name = "rest-nvim";
+  hurl-nvim = pkgs.vimUtils.buildVimPlugin {
+    name = "hurl-nvim";
     src = pkgs.fetchFromGitHub {
-      owner = "rest-nvim";
-      repo = "rest.nvim";
-      rev = "v1.2.1";
-      sha256 = "sha256-fX4KIazW7iKO157cQdfBoz7g+eyOSQIFje8ZB7SeAx8=";
+      owner = "smoothprogrammer";
+      repo = "hurl.nvim";
+      rev = "refactor-output";
+      sha256 = "sha256-tSELEjyzbRQoQCn8euVBe9W8UW9ZmLy4JVbcgrNyEtU=";
     };
     nvimSkipModule = [
-      "rest-nvim.curl.init"
-      "rest-nvim.request.init"
-      "rest-nvim"
+      "hurl.split"
+      "hurl.popup"
     ];
   };
 
-  # TODO: update config and keymap
-  # hurl-nvim = pkgs.vimUtils.buildVimPlugin {
-  #   name = "hurl-nvim";
-  #   src = pkgs.fetchFromGitHub {
-  #     owner = "jellydn";
-  #     repo = "hurl.nvim";
-  #     rev = "v2.0.0";
-  #     sha256 = "sha256-rnNkWe4zRTIozBJ8iweQWYX4DH84fsjAch+/kGgAj/g=";
-  #   };
-  # };
-
   colorscheme = with pkgs.vimPlugins; [
     solarized-nvim
   ];
@@ -61,14 +49,15 @@ let
         tree-sitter-css
         tree-sitter-javascript
         tree-sitter-scheme
+        tree-sitter-swift
         tree-sitter-http
         tree-sitter-json
         tree-sitter-toml
         tree-sitter-yaml
         tree-sitter-xml
         tree-sitter-markdown
         tree-sitter-regex
-        # hurl
+        hurl
       ]
     ))
     nvim-treesitter-context
@@ -96,8 +85,7 @@ let
     neotest
     neotest-go
     nvim-coverage
-    rest-nvim
-    # hurl-nvim
+    hurl-nvim
   ];
 
   telescope = with pkgs.vimPlugins; [
@@ -158,7 +146,7 @@ in
       rustfmt
       rust-analyzer
       flutter
-      # hurl
+      hurl
       http-server
     ];
 

modules/nvim/lua/minizilla/lsp.lua

@@ -157,3 +157,7 @@ lspconfig.guile_ls.setup {
   filetypes = { 'scheme' },
   capabilities = capabilities,
 }
+
+lspconfig.sourcekit.setup {
+  capabilities = capabilities,
+}

modules/nvim/lua/minizilla/telescope.lua

@@ -41,6 +41,7 @@ telescope.setup {
         '--smart-case', '--follow', '--hidden', '--no-ignore',
         '-g', '!**/.git/*',
         '-g', '!**/.direnv/*',
+        '-g', '!**/.devbox/*',
         '-g', '!**/.worktree/*',
         '-g', '!**/node_modules/*',
         '-g', '!**/target/*',
@@ -86,7 +87,6 @@ telescope.load_extension('fzf')
 telescope.load_extension('manix')
 telescope.load_extension('dap')
 telescope.load_extension('git_worktree')
-telescope.load_extension('rest')
 
 local nmap = Lib.keymapper('n', { silent = true })
 nmap('<C-p>', builtin.find_files)
@@ -97,4 +97,3 @@ nmap('<Leader>fo', builtin.vim_options)
 nmap('<Leader>fk', builtin.keymaps)
 nmap('<Leader>fg', extensions.live_grep_args.live_grep_args)
 nmap('<Leader>fn', extensions.manix.manix)
-nmap('<Leader>en', extensions.rest.select_env)

modules/nvim/lua/minizilla/test.lua

@@ -1,7 +1,6 @@
 local neotest = require('neotest')
 local coverage = require('coverage')
-local rest_nvim = require('rest-nvim')
--- local hurl = require('hurl')
+local hurl = require('hurl')
 
 coverage.setup {
   commands = false,
@@ -27,7 +26,7 @@ vim.api.nvim_create_autocmd('ColorScheme', {
 neotest.setup {
   adapters = {
     require('neotest-go') {
-      args = { "-coverprofile=" .. vim.fn.getcwd() .. "/coverage.out" },
+      args = { '-coverprofile=' .. vim.fn.getcwd() .. '/coverage.out' },
     },
   },
   consumers = {
@@ -40,20 +39,15 @@ neotest.setup {
   },
 }
 
-rest_nvim.setup {
-  result = {
-    show_curl_command = true,
-  }
+hurl.setup {
+  env_file = { '.env' },
 }
 
--- hurl.setup {
---   env_file = { '.env' },
--- }
-
 local nmap = Lib.keymapper('n', { silent = true })
 nmap('<Leader>tt', function() neotest.run.run(vim.fn.expand('%:h')) end, '[t]es[t]')
 nmap('<Leader>tS', neotest.run.stop, '[t]est [S]top')
 nmap('<Leader>to', neotest.output.open, '[t]est [o]pen')
 nmap('<Leader>ts', neotest.summary.toggle, '[t]est [s]ummary')
 nmap('<Leader>tc', coverage.summary, '[t]est [c]overage')
-nmap('<Leader>re', '<Plug>RestNvim', 'run http [re]quest')
+nmap('<Leader>re', '<Cmd>HurlRunnerAt<CR>', 'run http [re]quest')
+nmap('<Leader>rl', '<Cmd>HurlShowLastResponse<CR>', 'show http [r]equest [l]ast response')