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

Pin treesitter-context to a version that will build with nix infra.

Browse Source
This commit is contained in:
Jeremy Wall 2024-01-05 16:07:20 -05:00
parent 179b01999b
commit 2664a47219
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nix/base-system/flake.nix
View File

@ -18,6 +18,11 @@
url = "github:ThePrimeagen/harpoon/harpoon2"; url = "github:ThePrimeagen/harpoon/harpoon2";
flake = false; flake = false;
}; };
# We need to pin to this version of treesitter because it breaks after this revision
treesitter-context = {
url = "github:nvim-treesitter/nvim-treesitter-context/e6b743ccd4e780bc9cd85b707de67df72eea1a23";
flake = false;
};
}; };
outputs = { outputs = {
sile-flake, sile-flake,
@ -29,6 +34,7 @@
nil-flake, nil-flake,
nurl-flake, nurl-flake,
harpoon-src, harpoon-src,
treesitter-context,
nixpkgs, nixpkgs,
... # We don't use the self or nixpkgs args here so we just glob it. ... # We don't use the self or nixpkgs args here so we just glob it.
}: { }: {
@ -50,6 +56,10 @@
inherit (pkgs.vimUtils) buildVimPluginFrom2Nix; inherit (pkgs.vimUtils) buildVimPluginFrom2Nix;
harpoonSrc = harpoon-src; harpoonSrc = harpoon-src;
}; };
nvim-treesitter-context = pkgs.vimUtils.buildVimPluginFrom2Nix {
name = "nvim-treesitter-context";
src = treesitter-context;
};
# TODO(jwall): When this actually builds we should use it. # TODO(jwall): When this actually builds we should use it.
#nvim-treesitter-powershell = pkgs.callPackage ./nvim-powershell.nix { #nvim-treesitter-powershell = pkgs.callPackage ./nvim-powershell.nix {
# inherit (pkgs.tree-sitter) buildGrammar; # inherit (pkgs.tree-sitter) buildGrammar;

2
nix/base-system/init.lua
View File

@ -111,7 +111,7 @@ cmp.setup({
--vim.lsp.set_log_level('trace') --vim.lsp.set_log_level('trace')
--vim.lsp.log.set_format_func(vim.inspect) --vim.lsp.log.set_format_func(vim.inspect)
local roslyn_lsp_dll = vim.fs.normlize("~/bin/Microsoft.CodeAnalysis.LanguageServer.dll") local roslyn_lsp_dll = vim.fs.normalize("~/bin/Microsoft.CodeAnalysis.LanguageServer.dll")
local caps = vim.tbl_deep_extend( local caps = vim.tbl_deep_extend(
'force', 'force',

26
nix/darwin/flake.lock generated
View File

@ -31,16 +31,17 @@
"nurl-flake": "nurl-flake", "nurl-flake": "nurl-flake",
"runwhen-flake": "runwhen-flake", "runwhen-flake": "runwhen-flake",
"rust-overlay-flake": "rust-overlay-flake", "rust-overlay-flake": "rust-overlay-flake",
"sile-flake": "sile-flake" "sile-flake": "sile-flake",
"treesitter-context": "treesitter-context"
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-ddk9o6CPZv/kDzOjgtQHaOi2sDuCv6LXUGblWMRK5DY=", "narHash": "sha256-h8APs3KV8oU8sWYFEpSpqFjqJ/QY2a2L90BDfad5VUo=",
"path": "/nix/store/hfmdmfna3pcvhjdk2kw2xiz1ppmm8a3l-source/nix/base-system", "path": "/nix/store/0jd7ginq0vz1gglni90j5bzj4bk4ly7q-source/nix/base-system",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/hfmdmfna3pcvhjdk2kw2xiz1ppmm8a3l-source/nix/base-system", "path": "/nix/store/0jd7ginq0vz1gglni90j5bzj4bk4ly7q-source/nix/base-system",
"type": "path" "type": "path"
} }
}, },
@ -744,6 +745,23 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"treesitter-context": {
"flake": false,
"locked": {
"lastModified": 1693236978,
"narHash": "sha256-B6BXeFEWxTFf46JrlatsxEQcC6+/hPIDBb5cIcJpLZg=",
"owner": "nvim-treesitter",
"repo": "nvim-treesitter-context",
"rev": "e6b743ccd4e780bc9cd85b707de67df72eea1a23",
"type": "github"
},
"original": {
"owner": "nvim-treesitter",
"repo": "nvim-treesitter-context",
"rev": "e6b743ccd4e780bc9cd85b707de67df72eea1a23",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",