(neovim) add support for justfiles

bigolu · Oct 24, 2023 · ab9e83a · ab9e83a
1 parent 360a6f3
commit ab9e83a
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 1 deletion.
diff --git a/dotfiles/neovim/lua/terminal.lua b/dotfiles/neovim/lua/terminal.lua
@@ -1804,6 +1804,9 @@ Plug(
     end,
   }
 )
+
+-- For filetype detection
+Plug('NoahTheDuke/vim-just')
 -- }}}
 
 -- File Explorer {{{

diff --git a/flake-modules/assign-inputs-to-host-managers.nix b/flake-modules/assign-inputs-to-host-managers.nix
@@ -24,6 +24,7 @@
             "nix-xdg"
             "gomod2nix"
             "speakers"
+            "tree-sitter-just"
           ] ++ plugins;
           darwin = home ++ [
             "nix-darwin"

diff --git a/flake-modules/overlay.nix b/flake-modules/overlay.nix
@@ -134,8 +134,23 @@
               configureFlags = old.configureFlags ++ ["--enable-sixel"];
             });
 
+            nvim-treesitter =
+              let
+                package = prev.vimPlugins.nvim-treesitter.withPlugins
+                  (_:
+                    prev.vimPlugins.nvim-treesitter.allGrammars ++ [
+                      (final.tree-sitter.buildGrammar {
+                        language = "just";
+                        version = inputs.tree-sitter-just.rev;
+                        src = inputs.tree-sitter-just;
+                      })
+                    ]
+                  );
+              in
+               package // {withAllGrammars = package;};
+
             crossPlatformPackages = {
-              vimPlugins = allVimPlugins;
+              vimPlugins = allVimPlugins // { inherit nvim-treesitter; };
               tmuxPlugins = allTmuxPlugins;
               fishPlugins = allFishPlugins;
               inherit pynix;

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -120,6 +120,8 @@
     "vim-plugin-nui-nvim" = {url = "github:MunifTanjim/nui.nvim"; flake = false;};
     "vim-plugin-nvim-navic" = {url = "github:SmiteshP/nvim-navic"; flake = false;};
     "vim-plugin-git-blame-nvim" = {url = "github:f-person/git-blame.nvim"; flake = false;};
+    "vim-plugin-vim-just" = {url = "github:NoahTheDuke/vim-just"; flake = false;};
+    "tree-sitter-just" = {url = "github:IndianBoy42/tree-sitter-just"; flake = false;};
 
     "tmux-plugin-resurrect" = {url = "github:tmux-plugins/tmux-resurrect"; flake = false;};
     "tmux-plugin-tmux-suspend" = {url = "github:MunifTanjim/tmux-suspend"; flake = false;};