Update deps

flake.lock

@@ -79,11 +79,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1661543330,
+        "lastModified": 1661573386,
-        "narHash": "sha256-+ZeHUZoY8C+WmS8mS/yUruw5F1i7Rp35ph741LzgCOs=",
+        "narHash": "sha256-pBEg8iY00Af/SAtU2dlmOAv+2x7kScaGlFRDjNoVJO8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5bb1f67568366fbb2402cf1110f116d74857c3f6",
+        "rev": "d89bdff445eadff03fe414e9c30486bc8166b72b",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1661481978,
+        "lastModified": 1661587018,
-        "narHash": "sha256-FlPUmqKRK7x80vKmpFQ39iL8mVI3UWDcI8tJpngQvR0=",
+        "narHash": "sha256-cnF1OQ42fim5Fv7foDdG7aDIVpFR3k29fGYgk4PqnUI=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "946c0aa66f7b52c406b2654b9869edcb79db5ada",
+        "rev": "09c6ce8c4e4c6415cca9b834539ed0df461373f6",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1661501886,
+        "lastModified": 1661588180,
-        "narHash": "sha256-fiyiH9MAJaDBBVo9Ubnixse+cJ4wq0mLbqUt6W87qtU=",
+        "narHash": "sha256-DiJvSaFFSUzi7VSrpGh+i8Y9rww1HrMTV364ojcnxgw=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "a5ab01e6ecd69449937a9f2807b95959947cf7b3",
+        "rev": "bf6145be882486b2f05ae47e39a4384b31a7e6f8",
         "type": "github"
       },
       "original": {
@@ -160,11 +160,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1661336769,
+        "lastModified": 1661353537,
-        "narHash": "sha256-5Sf9tMd1Jdm+lTBGspbQ4kEoYCDKpUhEVAZHRcm6mGU=",
+        "narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "03428dbaaa23d6bf458770907b0927b377c873a8",
+        "rev": "0e304ff0d9db453a4b230e9386418fd974d5804a",
         "type": "github"
       },
       "original": {

home/programs/nvim/default.nix

@@ -102,6 +102,42 @@ in
       dracula-nvim
 
       # Syntax
+      {
+        plugin = nvim-treesitter.withPlugins (
+          plugins: with plugins; [
+            tree-sitter-bash
+            tree-sitter-comment
+            tree-sitter-css
+            tree-sitter-dockerfile
+            tree-sitter-elixir
+            tree-sitter-erlang
+            tree-sitter-fennel
+            tree-sitter-fish
+            tree-sitter-heex
+            tree-sitter-html
+            tree-sitter-http
+            tree-sitter-javascript
+            tree-sitter-jsdoc
+            tree-sitter-json
+            tree-sitter-lua
+            tree-sitter-make
+            tree-sitter-nix
+            tree-sitter-query
+            tree-sitter-regex
+            tree-sitter-ruby
+            tree-sitter-scss
+            tree-sitter-svelte
+            tree-sitter-toml
+            tree-sitter-tsx
+            tree-sitter-typescript
+            tree-sitter-vim
+            tree-sitter-yaml
+          ]
+        );
+        config = builtins.readFile ../../config/nvim/plugins/treesitter.fnl;
+        type = "fennel";
+      }
+
       nvim-ts-rainbow
       playground
 
@@ -292,43 +328,6 @@ in
       # Fixes
       FixCursorHold-nvim
 
-      # Syntax
-      {
-        plugin = nvim-treesitter.withPlugins (
-          plugins: with plugins; [
-            tree-sitter-bash
-            tree-sitter-comment
-            tree-sitter-css
-            tree-sitter-dockerfile
-            tree-sitter-elixir
-            tree-sitter-erlang
-            tree-sitter-fennel
-            tree-sitter-fish
-            tree-sitter-heex
-            tree-sitter-html
-            tree-sitter-http
-            tree-sitter-javascript
-            tree-sitter-jsdoc
-            tree-sitter-json
-            tree-sitter-lua
-            tree-sitter-make
-            tree-sitter-nix
-            tree-sitter-query
-            tree-sitter-regex
-            tree-sitter-ruby
-            tree-sitter-scss
-            tree-sitter-svelte
-            tree-sitter-toml
-            tree-sitter-tsx
-            tree-sitter-typescript
-            tree-sitter-vim
-            tree-sitter-yaml
-          ]
-        );
-        config = builtins.readFile ../../config/nvim/plugins/treesitter.fnl;
-        type = "fennel";
-      }
-
       # UI
       undotree
     ]);

home/programs/nvim/plugins.nix

@@ -1,6 +1,6 @@
 # This file has been auto-generated
 { pkgs, ... }:
-{
+rec {
   impatient-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "impatient.nvim";
     version = "2022-08-19";
@@ -111,14 +111,36 @@
       fetchSubmodules = false;
     };
   };
+  nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
+    pname = "nvim-treesitter";
+    version = "2022-08-27";
+    src = pkgs.fetchFromGitHub {
+      owner = "nvim-treesitter";
+      repo = "nvim-treesitter";
+      rev = "8a1ff3cf6a43cff98abdf572d2605407306e58ba";
+      sha256 = "0j3mvk8mlr2akz5c98m1zydal4cj8g2322fx0yb2jgl2rvrs2grs";
+      fetchSubmodules = false;
+    };
+    passthru.withPlugins =
+      grammarFn: nvim-treesitter.overrideAttrs (_: {
+        postPatch =
+          let
+            grammars = pkgs.tree-sitter.withPlugins grammarFn;
+          in
+          ''
+            rm -r parser
+            ln -s ${grammars} parser
+          '';
+      });
+  };
   nvim-ts-rainbow = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-ts-rainbow";
-    version = "2022-08-10";
+    version = "2022-08-27";
     src = pkgs.fetchFromGitHub {
       owner = "p00f";
       repo = "nvim-ts-rainbow";
-      rev = "1e904f6d1b41adb9d3b87df2108dc4a315a72379";
+      rev = "20cc17b4d2d8a9e3d3fc5db3e5dfe27c73ec016d";
-      sha256 = "1x4mfq63z7fxg7cyv2dmhzy7kxq9xgz16cvfj69gxz0mqxmmg3xz";
+      sha256 = "0adivnmra71jil23k2wd5z9vd0ksr01rj5mqk1ga91mrzh4dqwhs";
       fetchSubmodules = false;
     };
   };
@@ -135,12 +157,12 @@
   };
   telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "telescope.nvim";
-    version = "2022-08-26";
+    version = "2022-08-27";
     src = pkgs.fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "c92f86386f8446e4deaa79941baabaf825683be9";
+      rev = "b923665e64380e97294af09117e50266c20c71c7";
-      sha256 = "0gz49xmafjwczmv1jd3l9bi974d4kz8jpqi9hjypjbi1anc0fs3c";
+      sha256 = "0iwlmr94kdr1xwsn2l7ryxx7x1cicpbk86flxzza6877dmig226w";
       fetchSubmodules = false;
     };
   };
@@ -208,12 +230,12 @@
   };
   nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2022-08-26";
+    version = "2022-08-27";
     src = pkgs.fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "b89530f9f8783f19a172ed3a94fca2ba993c653b";
+      rev = "165295dcd9ac10a933d88803def117d5dff1eed0";
-      sha256 = "1nr2jxrdlgk5in7lif63j2jxp3llq1vqkwwgpb95ax2yp3jacsw5";
+      sha256 = "0wl9gy6p5km6vpf6qmsjv61jck34231xn6whahlbw9nr4r5g4sqd";
       fetchSubmodules = false;
     };
   };
@@ -252,12 +274,12 @@
   };
   comment-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "comment.nvim";
-    version = "2022-08-24";
+    version = "2022-08-27";
     src = pkgs.fetchFromGitHub {
       owner = "numtostr";
       repo = "comment.nvim";
-      rev = "728f38ef5b9d77f310fc9d56f87582c24111f793";
+      rev = "80e7746e42fa685077a7941e9022308c7ad6adf8";
-      sha256 = "01hly1jska3p2lq1bhrmd339pcsm2lin4q81kl4vhm9x9s4b34pf";
+      sha256 = "0sanlafz217l83cwv6qy10712civddadp5vagcdl9nghg9zkm5wy";
       fetchSubmodules = false;
     };
   };
@@ -428,23 +450,23 @@
   };
   vim-matchup = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "vim-matchup";
-    version = "2022-08-24";
+    version = "2022-08-27";
     src = pkgs.fetchFromGitHub {
       owner = "andymass";
       repo = "vim-matchup";
-      rev = "e59d5c73f1bf696c7de9fc13090a240d1ceb13f7";
+      rev = "5aa3e58db430bf158f7bd0f64387a1f66c43fa7c";
-      sha256 = "086mc303qq2igbibavri72l68spc4nrx0hl0yay6rb5n394bj2xc";
+      sha256 = "015a8a81nfzi178sqcdy4593n7baz18dynndypknq1h46p1d5cii";
       fetchSubmodules = false;
     };
   };
   nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-textobjects";
-    version = "2022-08-25";
+    version = "2022-08-27";
     src = pkgs.fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "bcf4ebe60f6a64d4a16b9ae7e69d0f13e92b428b";
+      rev = "761e283a8e3ab80ee5ec8daf4f19d92d23ee37e4";
-      sha256 = "1i35l4ni3f0c1p4zy2awxnh7z0vqfq6pzni9cbf4cqg57li2h2fp";
+      sha256 = "01qvgvw9p7y87kcz90r1zjnhcnr23lrsa3aqr6lqx1g4g2p1dal4";
       fetchSubmodules = false;
     };
   };
@@ -549,12 +571,12 @@
   };
   nvim-notify = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-notify";
-    version = "2022-08-24";
+    version = "2022-08-27";
     src = pkgs.fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-notify";
-      rev = "df6fc96ecb082e08f51b5f99d4858b5d4b5ed93b";
+      rev = "cf5dc4f7095673b8402c51bf80448596d7b97fc6";
-      sha256 = "0jxh9s0i2v20lszn2y6vnh5gs3sv0zcjbwmmqxfckz51mxik2chh";
+      sha256 = "1npkq30720qsz2fgpxdbgwwrpxrrbglvv87yz0mfw442sxfchly9";
       fetchSubmodules = false;
     };
   };

home/programs/nvim/plugins.yaml

@@ -17,7 +17,7 @@
 - src: Mofiqul/dracula.nvim
 
 # Syntax
-# - src: nvim-treesitter/nvim-treesitter
+- src: nvim-treesitter/nvim-treesitter
 - src: p00f/nvim-ts-rainbow
 - src: nvim-treesitter/playground
 

home/programs/nvim/update-plugins.sh

@@ -19,7 +19,7 @@ rm -f "$nix_new_file"
 echo '# This file has been auto-generated' >"$nix_new_file"
 echo '{ pkgs, ... }:' >>"$nix_new_file"
 
-echo "{" >>"$nix_new_file"
+echo "rec {" >>"$nix_new_file"
 for plugin in "${plugin_array[@]}"; do
   raw_src="$(echo "$plugin" | dasel -r json --plain '.src')"
   owner="$(echo "$raw_src" | awk -F'/' '{ print $(NF-1) }')"
@@ -97,6 +97,27 @@ for plugin in "${plugin_array[@]}"; do
     printf "buildPhase = ''\n%s\n'';\n" "$build_phase" >>"$nix_new_file"
   fi
 
+  case "$name" in
+  nvim-treesitter)
+    passthru="passthru.withPlugins =
+      grammarFn: nvim-treesitter.overrideAttrs (_: {
+        postPatch =
+          let
+            grammars = pkgs.tree-sitter.withPlugins grammarFn;
+          in
+          ''
+            rm -r parser
+            ln -s \${grammars} parser
+          '';
+      });"
+    ;;
+  *)
+    passthru=""
+    ;;
+  esac
+
+  echo -n "$passthru" >>"$nix_new_file"
+
   echo '};' >>"$nix_new_file"
 done
 echo "}" >>"$nix_new_file"