bump: neovim

willruggiano · Nov 13, 2023 · 0b449ea · 0b449ea
1 parent c0e5871
commit 0b449ea
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 24 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -41,18 +41,23 @@
             stylua.enable = true;
           };
           scripts = {
-            update-nvim-treesitter.exec = ''
-              niv update nvim-treesitter
-              nix run .#nvim-treesitter.update-grammars -- ./pkgs/nvim-treesitter
-              git commit -am 'chore: update nvim-treesitter'
+            bump-neovim.exec = ''
+              nix flake lock --update-input neovim &&
+                nom build &&
+                git commit -am 'bump: neovim'
             '';
-            update-plugin.exec = ''
+            bump-nvim-treesitter.exec = ''
+              niv update nvim-treesitter &&
+                nix run .#nvim-treesitter.update-grammars -- ./pkgs/nvim-treesitter &&
+                git commit -am 'bump: nvim-treesitter'
+            '';
+            bump-plugin.exec = ''
               [ $# -eq 0 ] && {
-                niv update
-                git commit -am "chore: update all plugins"
+                niv update &&
+                  git commit -am "bump: all plugins"
               } || {
-                niv update $1
-                git commit -am "chore: update $1"
+                niv update $1 &&
+                  git commit -am "bump: $1"
               }
             '';
           };

diff --git a/neovim.nix b/neovim.nix
@@ -16,14 +16,15 @@
           SRC_ENDPOINT = "https://sourcegraph.com";
         };
 
-        # package = inputs'.neovim.packages.default.overrideAttrs (old: {
-        #   patches = with pkgs; [
-        #     (fetchpatch {
-        #       url = "https://patch-diff.githubusercontent.com/raw/neovim/neovim/pull/20536.patch";
-        #       hash = "sha256-9HqRpOByb+I6Rw5hmuZO1iwwrulkkNTEWv1bEczKTBM=";
-        #     })
-        #   ];
-        # });
+        package = inputs'.neovim.packages.default.override {
+          libvterm-neovim = pkgs.libvterm-neovim.overrideAttrs rec {
+            version = "0.3.3";
+            src = pkgs.fetchurl {
+              url = "https://github.com/neovim/libvterm/archive/v${version}.tar.gz";
+              hash = "sha256-C6vjq0LDVJJdre3pDTUvBUqpxK5oQuqAOiDJdB4XLlY=";
+            };
+          };
+        };
 
         # Tools to bake into the neovim environment.
         # These tools are *appended* to neovim's PATH variable,

diff --git a/pkgs/nvim-treesitter/default.nix b/pkgs/nvim-treesitter/default.nix
@@ -122,10 +122,11 @@
       owner = "vigoux";
       repo = "tree-sitter-viml";
     };
-    vimdoc = {
-      owner = "neovim";
-      inherit (sources.tree-sitter-vimdoc) rev;
-    };
+    # Built into neovim.
+    # vimdoc = {
+    #   owner = "neovim";
+    #   inherit (sources.tree-sitter-vimdoc) rev;
+    # };
     xit = {
       owner = "synaptiko";
       rev = "7d79024";