From 29872222708575d070a94ea654d25ad189fe2230 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 5 Sep 2021 11:36:43 +0700 Subject: [PATCH] neovim: add tree-sitter-glimmer --- flake.lock | 17 +++++++++++++++++ flake.nix | 2 ++ modules/user/neovim.nix | 3 ++- packages/tree-sitter-glimmer/default.nix | 9 +++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 packages/tree-sitter-glimmer/default.nix diff --git a/flake.lock b/flake.lock index 765820f..6f9b21c 100644 --- a/flake.lock +++ b/flake.lock @@ -446,6 +446,7 @@ "secrets": "secrets", "theme-toggler": "theme-toggler", "tokyonight": "tokyonight", + "tree-sitter-glimmer": "tree-sitter-glimmer", "twemoji-but-good": "twemoji-but-good", "view-raw": "view-raw", "who-reacted": "who-reacted", @@ -518,6 +519,22 @@ "type": "github" } }, + "tree-sitter-glimmer": { + "flake": false, + "locked": { + "lastModified": 1629886333, + "narHash": "sha256-oATwywaI3PNTcvyhMKCPKfqI6MCo65pXA8onTnXwTZA=", + "owner": "alexlafroscia", + "repo": "tree-sitter-glimmer", + "rev": "3241521b21a824d164e2915eede08abc7a67f9ef", + "type": "github" + }, + "original": { + "owner": "alexlafroscia", + "repo": "tree-sitter-glimmer", + "type": "github" + } + }, "twemoji-but-good": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index ec5090f..60191f4 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,7 @@ # overlays discord-tokyonight = { url = "github:DanisDGK/zelk-customizations"; flake = false; }; discover = { url = "github:trigg/Discover"; flake = false; }; + tree-sitter-glimmer = { url = "github:alexlafroscia/tree-sitter-glimmer"; flake = false; }; # powercord plugins/themes better-status-indicators = { url = "github:griefmodz/better-status-indicators"; flake = false; }; @@ -75,6 +76,7 @@ discord-tokyonight = callPackage ./packages/discord-tokyonight {}; discover-overlay = callPackage ./packages/discover {}; linux-lava = callPackage ./packages/linux-lava {}; + tree-sitter-glimmer = callPackage ./packages/tree-sitter-glimmer {}; wine-osu = callPackage ./packages/wine-osu { inherit getPaths; }; }; diff --git a/modules/user/neovim.nix b/modules/user/neovim.nix index e9afeb9..022615a 100644 --- a/modules/user/neovim.nix +++ b/modules/user/neovim.nix @@ -29,6 +29,7 @@ (nvim-treesitter.withPlugins (p: with p; [ tree-sitter-comment tree-sitter-c-sharp + pkgs.tree-sitter-glimmer tree-sitter-html tree-sitter-javascript tree-sitter-jsdoc @@ -108,7 +109,7 @@ au BufEnter * set noro " set filetype=html for handlebar templates - au BufRead,BufNewFile *.hbs set filetype=html + " au BufRead,BufNewFile *.hbs set filetype=html " disable empty line tildes set fcs=eob:\ diff --git a/packages/tree-sitter-glimmer/default.nix b/packages/tree-sitter-glimmer/default.nix new file mode 100644 index 0000000..0a816d8 --- /dev/null +++ b/packages/tree-sitter-glimmer/default.nix @@ -0,0 +1,9 @@ +{ + callPackage, + inputs +}: +callPackage (inputs.nixpkgs + "/pkgs/development/tools/parsing/tree-sitter/grammar.nix") {} { + language = "glimmer"; + version = "1.0.0"; + source = inputs.tree-sitter-glimmer; +}