fix(nvim): Pin rest.nvim to v1.0.0
Use pinentry-curses for macos
This commit is contained in:
@@ -253,7 +253,7 @@
|
|||||||
base_url = "https://pass.uttarayan.me";
|
base_url = "https://pass.uttarayan.me";
|
||||||
pinentry =
|
pinentry =
|
||||||
if device.isMac
|
if device.isMac
|
||||||
then pkgs.pinentry_mac
|
then pkgs.pinentry-curses
|
||||||
else pkgs.pinentry-gnome3;
|
else pkgs.pinentry-gnome3;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -300,7 +300,8 @@ in {
|
|||||||
"<leader>\"" = ''[["+]]'';
|
"<leader>\"" = ''[["+]]'';
|
||||||
"<leader>c" = "[[<cmd>ChatGPT<cr>]]";
|
"<leader>c" = "[[<cmd>ChatGPT<cr>]]";
|
||||||
"<leader>dr" = "[[<cmd>RustLsp debuggables<cr>]]";
|
"<leader>dr" = "[[<cmd>RustLsp debuggables<cr>]]";
|
||||||
"<leader>ee" = "[[<cmd>Rest run<cr>]]";
|
# "<leader>ee" = "[[<cmd>Rest run<cr>]]";
|
||||||
|
"<leader>ee" = "[[<Plug>RestNvim]]";
|
||||||
"<leader>el" = "[[<cmd>Rest run last<cr>]]";
|
"<leader>el" = "[[<cmd>Rest run last<cr>]]";
|
||||||
"<leader>hh" = "[[<cmd>DevdocsOpenFloat<cr>]]";
|
"<leader>hh" = "[[<cmd>DevdocsOpenFloat<cr>]]";
|
||||||
"<leader>hl" = "[[<cmd>DevdocsToggle<cr>]]";
|
"<leader>hl" = "[[<cmd>DevdocsToggle<cr>]]";
|
||||||
@@ -392,15 +393,7 @@ in {
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
do
|
catcher(require('rest-nvim').setup)
|
||||||
function setup()
|
|
||||||
require('rest-nvim').setup()
|
|
||||||
end
|
|
||||||
success, output = pcall(setup)
|
|
||||||
if not success then
|
|
||||||
print("Failed to setup rest-nvim: " .. output)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
-- require('telescope').load_extension("dap")
|
-- require('telescope').load_extension("dap")
|
||||||
|
|||||||
4
flake.lock
generated
4
flake.lock
generated
@@ -1461,11 +1461,11 @@
|
|||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1,
|
"lastModified": 1,
|
||||||
"narHash": "sha256-PaTXAe/aVsZln/cKtHPXfiWIL+VwFxRiSQU0CRmglLI=",
|
"narHash": "sha256-PaTXAe/aVsZln/cKtHPXfiWIL+VwFxRiSQU0CRmglLI=",
|
||||||
"path": "/nix/store/5v4fml58z01s1lf98qhi4zp8plqqjv41-source/flakes",
|
"path": "./flakes",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"path": "/nix/store/5v4fml58z01s1lf98qhi4zp8plqqjv41-source/flakes",
|
"path": "./flakes",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -62,7 +62,7 @@
|
|||||||
subflakes = {
|
subflakes = {
|
||||||
# TODO: Will eventualy move all the non-flake fetchFromGitHub urls to this flake
|
# TODO: Will eventualy move all the non-flake fetchFromGitHub urls to this flake
|
||||||
# As inputs for the flake that way I don't have to update the hashes manually
|
# As inputs for the flake that way I don't have to update the hashes manually
|
||||||
url = "./flakes";
|
url = "path:./flakes";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
rust-overlay = {
|
rust-overlay = {
|
||||||
|
|||||||
16
overlays.nix
16
overlays.nix
@@ -235,21 +235,24 @@
|
|||||||
rest-nvim-src = final.pkgs.fetchFromGitHub {
|
rest-nvim-src = final.pkgs.fetchFromGitHub {
|
||||||
owner = "rest-nvim";
|
owner = "rest-nvim";
|
||||||
repo = "rest.nvim";
|
repo = "rest.nvim";
|
||||||
rev = "64175b161b61b6807b4c6f3f18dd884325cf04e0";
|
# rev = "64175b161b61b6807b4c6f3f18dd884325cf04e0";
|
||||||
|
# Before v2 release
|
||||||
|
rev = "v1.0.0";
|
||||||
# sha256 = "sha256-3EC0j/hEbdQ8nJU0I+LGmE/zNnglO/FrP/6POer0338";
|
# sha256 = "sha256-3EC0j/hEbdQ8nJU0I+LGmE/zNnglO/FrP/6POer0338";
|
||||||
# sha256 = "sha256-3EC0j/hEbdQ8nJU0I+LGmE/zNnglO/FrP/6POer0339";
|
# sha256 = "sha256-3EC0j/hEbdQ8nJU0I+LGmE/zNnglO/FrP/6POer0339";
|
||||||
sha256 = "sha256-w/Z9lHu99gpbmrDCw/MEUDy6jyABsC7K5dbbl3K+HWk=";
|
sha256 = "sha256-jSY5WXx5tQAD0ZefPbg2luHywGAMcB9wdUTy6Av3xnY";
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
vimPlugins =
|
vimPlugins =
|
||||||
prev.vimPlugins
|
prev.vimPlugins
|
||||||
// {
|
// {
|
||||||
rest-nvim = final.neovimUtils.buildNeovimPlugin {
|
rest-nvim = final.vimUtils.buildVimPlugin {
|
||||||
pname = "rest.nvim";
|
pname = "rest.nvim";
|
||||||
version = "scm-1";
|
version = "1.0.0";
|
||||||
src = rest-nvim-src;
|
src = rest-nvim-src;
|
||||||
rockspecVersion = "0.2-1";
|
# version = "scm-1";
|
||||||
buildInputs = with final.pkgs.lua51Packages; [lua lua-curl mimetypes nvim-nio xml2lua];
|
# rockspecVersion = "0.2-1";
|
||||||
|
# buildInputs = with final.pkgs.lua51Packages; [lua lua-curl mimetypes nvim-nio xml2lua];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# lua51Packages =
|
# lua51Packages =
|
||||||
@@ -297,6 +300,7 @@ in [
|
|||||||
zellij
|
zellij
|
||||||
catppuccinThemes
|
catppuccinThemes
|
||||||
vimPlugins
|
vimPlugins
|
||||||
|
rest-nvim-overlay
|
||||||
tree-sitter-grammars
|
tree-sitter-grammars
|
||||||
tmuxPlugins
|
tmuxPlugins
|
||||||
anyrun-overlay
|
anyrun-overlay
|
||||||
|
|||||||
Reference in New Issue
Block a user