use tree-sitter-just from upstream nixpkgs

3 files changed, 5 insertions, 43 deletions

diff --git a/flake.lock b/flake.lock
index c2354cd..6bafb4e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,25 +16,7 @@
     },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
-        "tree-sitter-just": "tree-sitter-just"
-      }
-    },
-    "tree-sitter-just": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1704453670,
-        "narHash": "sha256-mQbq0fQIyj8XhYvsLUfGlhRIuMUfpb/KuSd6MRmZS8c=",
-        "owner": "IndianBoy42",
-        "repo": "tree-sitter-just",
-        "rev": "27b2d8a07e409025cd4160e56c1c1af939a2c556",
-        "type": "github"
-      },
-      "original": {
-        "owner": "IndianBoy42",
-        "repo": "tree-sitter-just",
-        "rev": "27b2d8a07e409025cd4160e56c1c1af939a2c556",
-        "type": "github"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 843d8d2..263a1a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,20 +1,12 @@
 {
   description = "getchoo's neovim config";
 
-  inputs = {
-    nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz";
-
-    tree-sitter-just = {
-      url = "github:IndianBoy42/tree-sitter-just/27b2d8a07e409025cd4160e56c1c1af939a2c556";
-      flake = false;
-    };
-  };
+  inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz";
 
   outputs = {
     self,
     nixpkgs,
-    ...
-  } @ inputs: let
+  }: let
     systems = [
       "x86_64-linux"
       "aarch64-linux"
@@ -49,14 +41,6 @@
 
     packages = forAllSystems (pkgs: rec {
       getchvim = import ./neovim.nix self pkgs;
-
-      tree-sitter-just = pkgs.tree-sitter.buildGrammar {
-        language = "just";
-        version = builtins.substring 0 8 inputs.tree-sitter-just.lastModifiedDate;
-
-        src = inputs.tree-sitter-just;
-      };
-
       default = getchvim;
     });
   };
diff --git a/neovim.nix b/neovim.nix
index 70727cd..bf7400a 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -5,7 +5,7 @@ self: {
 }: let
   config = pkgs.vimUtils.buildVimPlugin {
     pname = "neovim-config";
-    version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
+    version = builtins.substring 0 8 self.rev or self.dirtyRev or "dirty";
 
     src = null;
 
@@ -47,16 +47,12 @@ self: {
     lualine-nvim
 
     mini-nvim
-    neo-tree-nvim
 
     telescope-nvim
     # dependent on >
     plenary-nvim
 
-    (
-      nvim-treesitter.withPlugins (_:
-        nvim-treesitter.allGrammars ++ [self.packages.${pkgs.system}.tree-sitter-just])
-    )
+    nvim-treesitter.withAllGrammars
     nvim-ts-context-commentstring
     nvim-ts-autotag
     vim-just