servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: Update neovim

Browse Source
This commit is contained in:
Uttarayan Mondal
2024-04-30 01:43:00 +05:30
parent 24a19e54de
commit 480d221ee4
7 changed files with 179 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
neovim/overlays.nix
View File

@@ -3,6 +3,11 @@
vimPlugins =
prev.vimPlugins
// {
d2 = final.pkgs.vimUtils.buildVimPlugin {
name = "d2";
version = "1";
src = inputs.d2;
};
gp-nvim = final.pkgs.vimUtils.buildVimPlugin {
name = "gp.nvim";
src = inputs.gp-nvim;
@@ -13,16 +18,7 @@
src = inputs.neogit;
dependencies = with final.vimPlugins; [plenary-nvim diffview-nvim fzf-lua];
};
# comfortable-motion = final.pkgs.vimUtils.buildVimPlugin {
# name = "comfortable-motion";
# # TODO: Move to subflake
# src = final.pkgs.fetchFromGitHub {
# owner = "yuttie";
# repo = "comfortable-motion.vim";
# rev = "master";
# sha256 = "sha256-S1LJXmShhpCJIg/FEPx3jFbmPpS/1U4MAQN2RY/nkI0";
# };
# };
nvim-dap-rr = final.pkgs.vimUtils.buildVimPlugin {
name = "nvim-dap-rr";
# TODO: Move to subflake
@@ -86,13 +82,12 @@
tree-sitter-just = final.pkgs.tree-sitter.buildGrammar {
language = "just";
version = "1";
# TODO: Move to subflake
src = final.pkgs.fetchFromGitHub {
owner = "IndianBoy42";
repo = "tree-sitter-just";
rev = "613b3fd39183bec94bc741addc5beb6e6f17969f";
sha256 = "sha256-OBlXwWriE6cdGn0dhpfSMnJ6Rx1Z7KcXehaamdi/TxQ";
};
src = inputs.tree-sitter-just;
};
tree-sitter-d2 = final.pkgs.tree-sitter.buildGrammar {
language = "d2";
version = "1";
src = inputs.tree-sitter-d2;
};
tree-sitter-nu = final.pkgs.tree-sitter.buildGrammar {
language = "nu";
@@ -107,51 +102,51 @@
};
};
};
rest-nvim-overlay = final: prev: let
rest-nvim-src = inputs.rest-nvim;
rest-nvim-luaPackage-override = luaself: luaprev: {
rest-nvim = luaself.callPackage (
{
luaOlder,
buildLuarocksPackage,
lua,
nvim-nio,
luarocks-nix,
lua-curl,
mimetypes,
xml2lua,
}:
buildLuarocksPackage {
pname = "rest.nvim";
version = "scm-1";
knownRockspec = "${rest-nvim-src}/rest.nvim-scm-1.rockspec";
src = rest-nvim-src;
propagatedBuildInputs = [lua luarocks-nix nvim-nio lua-curl mimetypes xml2lua];
disable = luaOlder "5.1";
}
) {};
};
lua5_1 = prev.lua5_1.override {
packageOverrides = rest-nvim-luaPackage-override;
};
lua51Packages = final.lua5_1.pkgs;
in {
inherit lua5_1 lua51Packages;
# vimPlugins =
# prev.vimPlugins
# // {
# rest-nvim = final.neovimUtils.buildNeovimPlugin {
# pname = "rest.nvim";
# version = "scm-1";
# src = rest-nvim-src;
# };
# };
# rest-nvim = final.vimPlugins.rest-nvim;
};
# rest-nvim-overlay = final: prev: let
# rest-nvim-src = inputs.rest-nvim;
# rest-nvim-luaPackage-override = luaself: luaprev: {
# rest-nvim = luaself.callPackage (
# {
# luaOlder,
# buildLuarocksPackage,
# lua,
# nvim-nio,
# luarocks-nix,
# lua-curl,
# mimetypes,
# xml2lua,
# }:
# buildLuarocksPackage {
# pname = "rest.nvim";
# version = "scm-1";
# knownRockspec = "${rest-nvim-src}/rest.nvim-scm-1.rockspec";
# src = rest-nvim-src;
# propagatedBuildInputs = [lua luarocks-nix nvim-nio lua-curl mimetypes xml2lua];
# disable = luaOlder "5.1";
# }
# ) {};
# };
# lua5_1 = prev.lua5_1.override {
# packageOverrides = rest-nvim-luaPackage-override;
# };
# lua51Packages = final.lua5_1.pkgs;
# in {
# inherit lua5_1 lua51Packages;
# # vimPlugins =
# # prev.vimPlugins
# # // {
# # rest-nvim = final.neovimUtils.buildNeovimPlugin {
# # pname = "rest.nvim";
# # version = "scm-1";
# # src = rest-nvim-src;
# # };
# # };
# # rest-nvim = final.vimPlugins.rest-nvim;
# };
in [
inputs.nnn.overlay
inputs.nixvim.overlays.default
vimPlugins
tree-sitter-grammars
rest-nvim-overlay
# rest-nvim-overlay
]