feat: Update some stuff

This commit is contained in:
uttarayan21
2025-04-28 13:58:54 +05:30
parent 1370419708
commit 258d61d89a
5 changed files with 60 additions and 46 deletions

6
flake.lock generated
View File

@@ -2718,11 +2718,11 @@
"tree-sitter-d2": { "tree-sitter-d2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742503579, "lastModified": 1744179289,
"narHash": "sha256-h/h2f6YC6tYqE3Ql3HCaeBP+gJ/PhgIAiZjMCvPFO/Y=", "narHash": "sha256-vKe01QAWFh+HAWJx2Vg3IYFJAr5PfJ6qxu9h09EIuRA=",
"owner": "ravsii", "owner": "ravsii",
"repo": "tree-sitter-d2", "repo": "tree-sitter-d2",
"rev": "d3c424de131315077716b87cfae05178d6f7a207", "rev": "2ad34f2733b0df2d4b361733de814842b760dcc1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -108,6 +108,10 @@
url = "github:NeogitOrg/neogit/nightly"; url = "github:NeogitOrg/neogit/nightly";
flake = false; flake = false;
}; };
d2 = {
url = "github:terrastruct/d2-vim";
flake = false;
};
tree-sitter-d2 = { tree-sitter-d2 = {
url = "github:ravsii/tree-sitter-d2"; url = "github:ravsii/tree-sitter-d2";
flake = false; flake = false;
@@ -124,10 +128,6 @@
url = "github:nushell/tree-sitter-nu"; url = "github:nushell/tree-sitter-nu";
flake = false; flake = false;
}; };
d2 = {
url = "github:terrastruct/d2-vim";
flake = false;
};
navigator = { navigator = {
url = "github:ray-x/navigator.lua"; url = "github:ray-x/navigator.lua";
flake = false; flake = false;
@@ -270,7 +270,7 @@
devices = darwin_devices; devices = darwin_devices;
in in
import ./darwin { import ./darwin {
inherit devices inputs nixpkgs home-manager overlays nix-darwin; inherit devices inputs nixpkgs home-manager overlays nur nix-darwin;
}; };
homeConfigurations = let homeConfigurations = let

View File

@@ -318,7 +318,7 @@ in {
tree-sitter-norg-meta tree-sitter-norg-meta
tree-sitter-just tree-sitter-just
tree-sitter-nu tree-sitter-nu
# tree-sitter-d2 pkgs.tree-sitter-grammars.tree-sitter-d2
]) ])
++ pkgs.vimPlugins.nvim-treesitter.allGrammars; ++ pkgs.vimPlugins.nvim-treesitter.allGrammars;
}; };
@@ -731,6 +731,7 @@ in {
pkgs.tree-sitter-grammars.tree-sitter-norg pkgs.tree-sitter-grammars.tree-sitter-norg
pkgs.tree-sitter-grammars.tree-sitter-norg-meta pkgs.tree-sitter-grammars.tree-sitter-norg-meta
pkgs.tree-sitter-grammars.tree-sitter-nu pkgs.tree-sitter-grammars.tree-sitter-nu
# pkgs.tree-sitter-grammars.tree-sitter-d2
]; ];
extraLuaPackages = luaPkgs: with luaPkgs; [lua-utils-nvim nvim-nio pathlib-nvim]; extraLuaPackages = luaPkgs: with luaPkgs; [lua-utils-nvim nvim-nio pathlib-nvim];
extraPackages = [pkgs.lldb pkgs.taplo pkgs.d2 pkgs.sleek pkgs.graphqurl]; extraPackages = [pkgs.lldb pkgs.taplo pkgs.d2 pkgs.sleek pkgs.graphqurl];

View File

@@ -8,28 +8,7 @@
version = "1"; version = "1";
src = inputs.d2; src = inputs.d2;
}; };
# typr = final.pkgs.vimUtils.buildVimPlugin {
# name = "typr";
# version = "1";
# src = inputs.typr;
# buildInputs = [final.pkgs.lua52Packages.volt];
# };
}; };
# volt = final.pkgs.neovimUtils.buildNeovimPlugin {
# name = "volt";
# pname = "volt";
# version = "1";
# src = inputs.volt;
# };
# lua = prev.lua.override {
# packageOverrides = luaself: luaprev: {
# volt = final.stdenv.buildLuaPackage {
# pname = "volt";
# version = "1.0.0";
# src = inputs.volt;
# };
# };
# };
}; };
tree-sitter-grammars = final: prev: { tree-sitter-grammars = final: prev: {
tree-sitter-grammars = tree-sitter-grammars =

View File

@@ -218,19 +218,53 @@
''; '';
}); });
}; };
in vimPlugins = final: prev: {
[ vimPlugins =
libfprint prev.vimPlugins
zellij // {
catppuccinThemes d2 = final.pkgs.vimUtils.buildVimPlugin {
tmuxPlugins name = "d2";
version = "1";
src = inputs.d2;
};
};
};
tree-sitter-grammars = final: prev: {
tree-sitter-grammars =
prev.tree-sitter-grammars
// {
# tree-sitter-just = final.pkgs.tree-sitter.buildGrammar {
# language = "just";
# version = "1";
# src = inputs.tree-sitter-just;
# };
# tree-sitter-nu = final.pkgs.tree-sitter.buildGrammar {
# language = "nu";
# version = "1";
# src = inputs.tree-sitter-nu;
# };
tree-sitter-d2 = final.pkgs.tree-sitter.buildGrammar {
language = "d2";
version = "1";
src = inputs.tree-sitter-d2;
};
};
};
in [
anyrun-overlay anyrun-overlay
nix-index-db catppuccinThemes
shell-scipts csshacks
misc-applications inputs.nixvim.overlays.default
inputs.nno.overlays.default
inputs.nur.overlays.default inputs.nur.overlays.default
inputs.rust-overlay.overlays.default inputs.rust-overlay.overlays.default
csshacks
jellyfin jellyfin
] libfprint
++ (import ./neovim/overlays.nix self) misc-applications
nix-index-db
shell-scipts
tmuxPlugins
# tree-sitter-grammars
# vimPlugins
zellij
]