mirror of
https://github.com/nmasur/dotfiles
synced 2024-11-09 22:12:56 +00:00
add custom treesitter grammars
This commit is contained in:
parent
a463212023
commit
05adc8a221
@ -144,7 +144,7 @@
|
|||||||
(import ./overlays/neovim-plugins.nix inputs)
|
(import ./overlays/neovim-plugins.nix inputs)
|
||||||
(import ./overlays/calibre-web.nix)
|
(import ./overlays/calibre-web.nix)
|
||||||
(import ./overlays/disko.nix inputs)
|
(import ./overlays/disko.nix inputs)
|
||||||
(import ./overlays/tree-sitter-bash.nix)
|
(import ./overlays/tree-sitter.nix inputs)
|
||||||
];
|
];
|
||||||
|
|
||||||
# System types to support.
|
# System types to support.
|
||||||
|
@ -6,12 +6,15 @@
|
|||||||
tree-sitter-bash
|
tree-sitter-bash
|
||||||
tree-sitter-fish
|
tree-sitter-fish
|
||||||
tree-sitter-hcl
|
tree-sitter-hcl
|
||||||
|
tree-sitter-ini
|
||||||
tree-sitter-json
|
tree-sitter-json
|
||||||
tree-sitter-lua
|
tree-sitter-lua
|
||||||
tree-sitter-markdown
|
tree-sitter-markdown
|
||||||
tree-sitter-markdown-inline
|
tree-sitter-markdown-inline
|
||||||
tree-sitter-nix
|
tree-sitter-nix
|
||||||
|
tree-sitter-puppet
|
||||||
tree-sitter-python
|
tree-sitter-python
|
||||||
|
tree-sitter-rasi
|
||||||
tree-sitter-toml
|
tree-sitter-toml
|
||||||
tree-sitter-yaml
|
tree-sitter-yaml
|
||||||
]))
|
]))
|
||||||
@ -19,7 +22,6 @@
|
|||||||
pkgs.vimPlugins.playground # Tree-sitter experimenting
|
pkgs.vimPlugins.playground # Tree-sitter experimenting
|
||||||
pkgs.vimPlugins.nginx-vim
|
pkgs.vimPlugins.nginx-vim
|
||||||
pkgs.vimPlugins.vim-helm
|
pkgs.vimPlugins.vim-helm
|
||||||
pkgs.vimPlugins.vim-puppet
|
|
||||||
(pkgs.vimUtils.buildVimPluginFrom2Nix {
|
(pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "nmasur";
|
pname = "nmasur";
|
||||||
version = "0.1";
|
version = "0.1";
|
||||||
@ -30,6 +32,7 @@
|
|||||||
setup."nvim-treesitter.configs" = {
|
setup."nvim-treesitter.configs" = {
|
||||||
highlight = { enable = true; };
|
highlight = { enable = true; };
|
||||||
indent = { enable = true; };
|
indent = { enable = true; };
|
||||||
|
matchup = { enable = true; }; # Uses vim-matchup
|
||||||
|
|
||||||
textobjects = {
|
textobjects = {
|
||||||
select = {
|
select = {
|
||||||
|
@ -6,7 +6,7 @@ vim.filetype.add({
|
|||||||
pattern = {
|
pattern = {
|
||||||
[".*%.tfvars"] = "terraform",
|
[".*%.tfvars"] = "terraform",
|
||||||
[".*%.tf"] = "terraform",
|
[".*%.tf"] = "terraform",
|
||||||
[".*%.rasi"] = "css",
|
[".*%.rasi"] = "rasi",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
# Fix: bash highlighting doesn't work as of this commit:
|
|
||||||
# https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029
|
|
||||||
|
|
||||||
_final: prev: {
|
|
||||||
tree-sitter-grammars = prev.tree-sitter-grammars // {
|
|
||||||
tree-sitter-bash = prev.tree-sitter-grammars.tree-sitter-bash.overrideAttrs
|
|
||||||
(old: {
|
|
||||||
src = prev.fetchFromGitHub {
|
|
||||||
owner = "tree-sitter";
|
|
||||||
repo = "tree-sitter-bash";
|
|
||||||
rev = "493646764e7ad61ce63ce3b8c59ebeb37f71b841";
|
|
||||||
sha256 = "sha256-gl5F3IeZa2VqyH/qFj8ey2pRbGq4X8DL5wiyvRrH56U=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
}
|
|
47
overlays/tree-sitter.nix
Normal file
47
overlays/tree-sitter.nix
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
# Fix: bash highlighting doesn't work as of this commit:
|
||||||
|
# https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029
|
||||||
|
|
||||||
|
inputs: _final: prev: {
|
||||||
|
tree-sitter-grammars = prev.tree-sitter-grammars // {
|
||||||
|
tree-sitter-bash = prev.tree-sitter-grammars.tree-sitter-bash.overrideAttrs
|
||||||
|
(old: {
|
||||||
|
src = prev.fetchFromGitHub {
|
||||||
|
owner = "tree-sitter";
|
||||||
|
repo = "tree-sitter-bash";
|
||||||
|
rev = "493646764e7ad61ce63ce3b8c59ebeb37f71b841";
|
||||||
|
sha256 = "sha256-gl5F3IeZa2VqyH/qFj8ey2pRbGq4X8DL5wiyvRrH56U=";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
tree-sitter-ini = prev.tree-sitter.buildGrammar {
|
||||||
|
language = "ini";
|
||||||
|
version = "1.0.0";
|
||||||
|
src = prev.fetchFromGitHub {
|
||||||
|
owner = "justinmk";
|
||||||
|
repo = "tree-sitter-ini";
|
||||||
|
rev = "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44";
|
||||||
|
sha256 = "sha256-pPtKokpTgjoNzPW4dRkOnyzBBJFeJj3+CW3LbHSKsmU=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
tree-sitter-puppet = prev.tree-sitter.buildGrammar {
|
||||||
|
language = "puppet";
|
||||||
|
version = "1.0.0";
|
||||||
|
src = prev.fetchFromGitHub {
|
||||||
|
owner = "amaanq";
|
||||||
|
repo = "tree-sitter-puppet";
|
||||||
|
rev = "v1.0.0";
|
||||||
|
sha256 = "sha256-vk5VJZ9zW2bBuc+DM+fwFyhM1htZGeLlmkjMAH66jBA=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
tree-sitter-rasi = prev.tree-sitter.buildGrammar {
|
||||||
|
language = "rasi";
|
||||||
|
version = "0.1.1";
|
||||||
|
src = prev.fetchFromGitHub {
|
||||||
|
owner = "Fymyte";
|
||||||
|
repo = "tree-sitter-rasi";
|
||||||
|
rev = "371dac6bcce0df5566c1cfebde69d90ecbeefd2d";
|
||||||
|
sha256 = "sha256-2nYZoLcrxxxiOJEySwHUm93lzMg8mU+V7LIP63ntFdA=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user