diff --git a/config/nix/common/nvim/default.nix b/config/nix/common/nvim/default.nix index 22bdae49..2c1c3593 100644 --- a/config/nix/common/nvim/default.nix +++ b/config/nix/common/nvim/default.nix @@ -123,15 +123,17 @@ "gg" = "require'telescope.builtin'.live_grep"; ";" = "require'telescope.builtin'.buffers"; "o" = "[[TroubleToggle]]"; - "ee" = "[[RestNvim]]"; - "ec" = "[[RestNvimPreview]]"; + "ee" = "require'rest-nvim'.run"; + "ec" = "function() require'rest-nvim'.run(true) end"; + # "ee" = "[[RestNvim]]"; + # "ec" = "[[RestNvimPreview]]"; + # "el" = "require('telescope').extensions.rest.select_env"; "\\\"" = ''[["+]]''; "vff" = "[[vertical Gdiffsplit]]"; "" = "vim.lsp.buf.definition"; "gi" = "vim.lsp.buf.implementation"; "a" = "vim.lsp.buf.code_action"; "F" = "function() vim.lsp.buf.format({ async = true }) end"; - "" = "''"; "q" = "[[bw]]"; "n" = "[[bnext]]"; @@ -185,6 +187,7 @@ # Utils FTerm-nvim + plenary-nvim ]; extraConfigLua = builtins.readFile ./extraConfig.lua; diff --git a/config/nix/common/nvim/extraConfig.lua b/config/nix/common/nvim/extraConfig.lua index d781cc12..8cd67af3 100644 --- a/config/nix/common/nvim/extraConfig.lua +++ b/config/nix/common/nvim/extraConfig.lua @@ -1,3 +1,4 @@ +require('rest-nvim').setup() require('telescope').setup { defaults = { initial_mode = 'insert', @@ -12,10 +13,11 @@ require('telescope').setup { } } -require("telescope").load_extension("ui-select") -require("telescope").load_extension("dap") +require('telescope').load_extension("ui-select") +require('telescope').load_extension("dap") require('telescope').load_extension("fzf") require('telescope').load_extension("file_browser") +require('telescope').load_extension("rest") vim.g.rustaceanvim = { tools = { diff --git a/config/nix/flake.nix b/config/nix/flake.nix index 66f7ac75..9c6f3b07 100644 --- a/config/nix/flake.nix +++ b/config/nix/flake.nix @@ -173,6 +173,15 @@ sha256 = "sha256-HaxfnvgFy7fpa2CS7/dQhf6dK9+Js7wP5qGdIeXLGPY"; }; }; + rest-nvim = final.pkgs.vimUtils.buildVimPlugin { + name = "rest-nvim"; + src = final.pkgs.fetchFromGitHub { + owner = "rest-nvim"; + repo = "rest.nvim"; + rev = "main"; + sha256 = "sha256-EclCwr0Oi6+5zF47niO0nt8wjNmb6cAADxd7S71DAiI"; + }; + }; }; };