Merge pull request #149330 from oxalica/bump/vim-lua-plugins

{vimPlugins,luaPackages}: update

maintainers/scripts/pluginupdate.py

@@ -385,7 +385,7 @@ def check_results(
         sys.exit(1)
 
 def parse_plugin_line(line: str) -> PluginDesc:
-    branch = "master"
+    branch = "HEAD"
     alias = None
     name, repo = line.split("/")
     if " as " in repo:

pkgs/development/lua-modules/generated-packages.nix

@@ -15,7 +15,7 @@ buildLuarocksPackage {
   pname = "alt-getopt";
   version = "0.8.0-1";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/alt-getopt-0.8.0-1.rockspec";
+    url    = "https://luafr.org/luarocks/alt-getopt-0.8.0-1.rockspec";
     sha256 = "17yxi1lsrbkmwzcn1x48x8758d7v1frsz1bmnpqfv4vfnlh0x210";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -159,7 +159,7 @@ buildLuarocksPackage {
   pname = "busted";
   version = "2.0.0-1";
   knownRockspec = (fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/busted-2.0.0-1.rockspec";
+    url    = "https://luafr.org/luarocks/busted-2.0.0-1.rockspec";
     sha256 = "0cbw95bjxl667n9apcgng2kr5hq6bc7gp3vryw4dzixmfabxkcbw";
   }).outPath;
   src = fetchurl {
@@ -184,7 +184,7 @@ buildLuarocksPackage {
   pname = "cassowary";
   version = "2.3.1-2";
   knownRockspec = (fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cassowary-2.3.1-2.rockspec";
+    url    = "https://luafr.org/luarocks/cassowary-2.3.1-2.rockspec";
     sha256 = "04y882f9ai1jhk0zwla2g0fvl56a75rwnxhsl9r3m0qa5i0ia1i5";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -244,7 +244,7 @@ buildLuarocksPackage {
   pname = "cosmo";
   version = "16.06.04-1";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/cosmo-16.06.04-1.rockspec";
+    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cosmo-16.06.04-1.rockspec";
     sha256 = "0ipv1hrlhvaz1myz6qxabq7b7kb3bz456cya3r292487a3g9h9pb";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -276,7 +276,7 @@ buildLuarocksPackage {
   pname = "coxpcall";
   version = "1.17.0-1";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/coxpcall-1.17.0-1.rockspec";
+    url    = "https://luafr.org/luarocks/coxpcall-1.17.0-1.rockspec";
     sha256 = "0mf0nggg4ajahy5y1q5zh2zx9rmgzw06572bxx6k8b736b8j7gca";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -307,7 +307,7 @@ buildLuarocksPackage {
   pname = "cqueues";
   version = "20200726.52-0";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/cqueues-20200726.52-0.rockspec";
+    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/cqueues-20200726.52-0.rockspec";
     sha256 = "0w2kq9w0wda56k02rjmvmzccz6bc3mn70s9v7npjadh85i5zlhhp";
   }).outPath;
   src = fetchurl {
@@ -393,7 +393,7 @@ buildLuarocksPackage {
   pname = "dkjson";
   version = "2.5-3";
   knownRockspec = (fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/dkjson-2.5-3.rockspec";
+    url    = "https://luafr.org/luarocks/dkjson-2.5-3.rockspec";
     sha256 = "18xngdzl2q207cil64aj81qi6qvj1g269pf07j5x4pbvamd6a1l3";
   }).outPath;
   src = fetchurl {
@@ -418,7 +418,7 @@ buildLuarocksPackage {
   pname = "fifo";
   version = "0.2-0";
   knownRockspec = (fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/fifo-0.2-0.rockspec";
+    url    = "https://luafr.org/luarocks/fifo-0.2-0.rockspec";
     sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq";
   }).outPath;
   src = fetchurl {
@@ -444,10 +444,10 @@ buildLuarocksPackage {
 
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
   "url": "https://github.com/lewis6991/gitsigns.nvim",
-  "rev": "552f114caeaec4ce97822cb55dfa7c7e5368136b",
+  "rev": "5eb87a0b05914d3763277ebe257bd5bafcdde8cd",
-  "date": "2021-10-15T13:31:44+01:00",
+  "date": "2021-12-06T18:02:22+00:00",
-  "path": "/nix/store/40vkv3sc4h6gh9ac88k7pilszxmy38yv-gitsigns.nvim",
+  "path": "/nix/store/c5l5bz7m5f48l57p4yrpxfhqga0cxsny-gitsigns.nvim",
-  "sha256": "0qdafm3arjf8bcqpvv085dwzbikad3sr3xzvrn3gfa0dsls8pg6q",
+  "sha256": "02cmgc3fgrwx6v6ylzqxdwgk9jsmd8j2q6fdnfbllg3zjwx3agcd",
   "fetchLFS": false,
   "fetchSubmodules": true,
   "deepClone": false,
@@ -496,14 +496,14 @@ inspect = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
 }:
 buildLuarocksPackage {
   pname = "inspect";
-  version = "3.1.1-0";
+  version = "3.1.2-0";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/inspect-3.1.1-0.rockspec";
+    url    = "https://luarocks.org/inspect-3.1.2-0.rockspec";
-    sha256 = "00spibq2h4an8v0204vr1hny4vv6za720c37ipsahpjk198ayf1p";
+    sha256 = "13jbv3rhj4mv2farrxns88g7j34ljag7vz0kma0fm2pzdz3686vx";
   }).outPath;
   src = fetchurl {
-    url    = "https://github.com/kikito/inspect.lua/archive/v3.1.1.tar.gz";
+    url    = "https://github.com/kikito/inspect.lua/archive/v3.1.2.tar.gz";
-    sha256 = "1nz0yqhkd0nkymghrj99gb2id40g50drh4a96g3v5k7h1sbg94h2";
+    sha256 = "08ln4p5bmvcs8wj8hzs4ny66m63abyxjkmcxhjji5ay99g85cn3b";
   };
 
   disabled = with lua; (luaOlder "5.1");
@@ -524,14 +524,14 @@ buildLuarocksPackage {
   version = "scm-0";
   knownRockspec = (fetchurl {
     url    = "mirror://luarocks/ldbus-scm-0.rockspec";
-    sha256 = "1yhkw5y8h1qf44vx31934k042cmnc7zcv2k0pv0g27wsmlxrlznx";
+    sha256 = "1c0h6fx7avzh89hl17v6simy1p4mjg8bimlsbjybks0zxznd8rbm";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
   "url": "https://github.com/daurnimator/ldbus.git",
-  "rev": "9e176fe851006037a643610e6d8f3a8e597d4073",
+  "rev": "6d4909c983c8a0e2c7384bac8055c628aa524ea2",
-  "date": "2019-08-16T14:26:05+10:00",
+  "date": "2021-11-10T23:58:54+11:00",
-  "path": "/nix/store/gg4zldd6kx048d6p65b9cimg3arma8yh-ldbus",
+  "path": "/nix/store/j830jk2hkanz7abkdsbvg2warsyr0a2c-ldbus",
-  "sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s",
+  "sha256": "18q98b98mfvjzbyssf18bpnlx4hsx4s9lwcwia4z9dxiaiw7b77j",
   "fetchLFS": false,
   "fetchSubmodules": true,
   "deepClone": false,
@@ -539,7 +539,7 @@ buildLuarocksPackage {
 }
  '') ["date" "path"]) ;
 
-  disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4");
+  disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
   propagatedBuildInputs = [ lua ];
 
   meta = {
@@ -585,7 +585,7 @@ buildLuarocksPackage {
   pname = "lgi";
   version = "0.9.2-1";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/lgi-0.9.2-1.rockspec";
+    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lgi-0.9.2-1.rockspec";
     sha256 = "1gqi07m4bs7xibsy4vx8qgyp3yb1wnh0gdq1cpwqzv35y6hn5ds3";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -666,7 +666,7 @@ buildLuarocksPackage {
   pname = "lpeg";
   version = "1.0.2-1";
   knownRockspec = (fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeg-1.0.2-1.rockspec";
+    url    = "https://luafr.org/luarocks/lpeg-1.0.2-1.rockspec";
     sha256 = "08a8p5cwlwpjawk8sczb7bq2whdsng4mmhphahyklf1bkvl2li89";
   }).outPath;
   src = fetchurl {
@@ -692,7 +692,7 @@ buildLuarocksPackage {
   pname = "lpeg_patterns";
   version = "0.5-0";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/lpeg_patterns-0.5-0.rockspec";
+    url    = "https://luafr.org/luarocks/lpeg_patterns-0.5-0.rockspec";
     sha256 = "1vzl3ryryc624mchclzsfl3hsrprb9q214zbi1xsjcc4ckq5qfh7";
   }).outPath;
   src = fetchurl {
@@ -716,7 +716,7 @@ buildLuarocksPackage {
   pname = "lpeglabel";
   version = "1.6.0-1";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/lpeglabel-1.6.0-1.rockspec";
+    url    = "https://luafr.org/luarocks/lpeglabel-1.6.0-1.rockspec";
     sha256 = "13gc32pggng6f95xx5zw9n9ian518wlgb26mna9kh4q2xa1k42pm";
   }).outPath;
   src = fetchurl {
@@ -741,7 +741,7 @@ buildLuarocksPackage {
   pname = "lpty";
   version = "1.2.2-1";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/lpty-1.2.2-1.rockspec";
+    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.rockspec";
     sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg";
   }).outPath;
   src = fetchurl {
@@ -766,7 +766,7 @@ buildLuarocksPackage {
   pname = "lrexlib-gnu";
   version = "2.9.1-1";
   knownRockspec = (fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-gnu-2.9.1-1.rockspec";
+    url    = "https://luafr.org/luarocks/lrexlib-gnu-2.9.1-1.rockspec";
     sha256 = "1jfjxh26iwsavipkwmscwv52l77qxzvibfmlvpskcpawyii7xcw8";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -799,7 +799,7 @@ buildLuarocksPackage {
   pname = "lrexlib-pcre";
   version = "2.9.1-1";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/lrexlib-pcre-2.9.1-1.rockspec";
+    url    = "https://luafr.org/luarocks/lrexlib-pcre-2.9.1-1.rockspec";
     sha256 = "036k27xaplxn128b3p67xiqm8k40s7bxvh87wc8v2cx1cc4b9ia4";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -833,7 +833,7 @@ buildLuarocksPackage {
   pname = "lrexlib-posix";
   version = "2.9.1-1";
   knownRockspec = (fetchurl {
-    url    = "https://luafr.org/luarocks/lrexlib-posix-2.9.1-1.rockspec";
+    url    = "https://luarocks.org/lrexlib-posix-2.9.1-1.rockspec";
     sha256 = "1zxrx9yifm9ry4wbjgv86rlvq3ff6qivldvib3ha4767azla0j0r";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1111,17 +1111,17 @@ lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
 , fetchgit}:
 buildLuarocksPackage {
   pname = "lua-resty-openssl";
-  version = "0.7.5-1";
+  version = "0.8.2-1";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/lua-resty-openssl-0.7.5-1.rockspec";
+    url    = "https://luarocks.org/lua-resty-openssl-0.8.2-1.rockspec";
-    sha256 = "13v14in9cgmjgarmy6br9629ns1qlhw7a30c061y6gncjannnv6y";
+    sha256 = "1dxaxh3l4vhrv5p2pwphl7jn7jpcjq3dmawfl9wbp3a88121gbsx";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
   "url": "https://github.com/fffonion/lua-resty-openssl.git",
-  "rev": "6a7f4a1649da7e0499b542b73c61e8dbdf91f57e",
+  "rev": "53e2d4ba7e8c31181c1fd71d3817911da0533675",
-  "date": "2021-09-18T06:15:54+08:00",
+  "date": "2021-11-22T12:07:07+08:00",
-  "path": "/nix/store/01bninsbgix30zl97lk0p10ycqkc37kx-lua-resty-openssl",
+  "path": "/nix/store/x7s51wf9ysxs2xs4adixf7ypmadfwp5c-lua-resty-openssl",
-  "sha256": "1ypji678lna9z3a48lhxs7wrw8d1prln7yfvqfm96lbmfvr5wfxw",
+  "sha256": "19cvqz81d0lxql55pgsbgynval0jxh8sicps94nzapvj90xqjviy",
   "fetchLFS": false,
   "fetchSubmodules": true,
   "deepClone": false,
@@ -1176,7 +1176,7 @@ buildLuarocksPackage {
   pname = "lua-term";
   version = "0.7-1";
   knownRockspec = (fetchurl {
-    url    = "https://luafr.org/luarocks/lua-term-0.7-1.rockspec";
+    url    = "https://luarocks.org/lua-term-0.7-1.rockspec";
     sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2";
   }).outPath;
   src = fetchurl {
@@ -1232,7 +1232,7 @@ buildLuarocksPackage {
   pname = "lua-yajl";
   version = "2.0-1";
   knownRockspec = (fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-yajl-2.0-1.rockspec";
+    url    = "https://luarocks.org/lua-yajl-2.0-1.rockspec";
     sha256 = "0h600zgq5qc9z3cid1kr35q3qb98alg0m3qf0a3mfj33hya6pcxp";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1266,7 +1266,7 @@ buildLuarocksPackage {
   pname = "lua-zlib";
   version = "1.2-1";
   knownRockspec = (fetchurl {
-    url    = "https://luafr.org/luarocks/lua-zlib-1.2-1.rockspec";
+    url    = "https://luarocks.org/lua-zlib-1.2-1.rockspec";
     sha256 = "18rpbg9b4vsnh3svapiqrvwwshw1abb5l5fd7441byx1nm3fjq9w";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1385,7 +1385,7 @@ buildLuarocksPackage {
   pname = "luacov";
   version = "0.15.0-1";
   knownRockspec = (fetchurl {
-    url    = "https://luafr.org/luarocks/luacov-0.15.0-1.rockspec";
+    url    = "https://luarocks.org/luacov-0.15.0-1.rockspec";
     sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1484,7 +1484,7 @@ buildLuarocksPackage {
   pname = "luadbi-postgresql";
   version = "0.7.2-1";
   knownRockspec = (fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-postgresql-0.7.2-1.rockspec";
+    url    = "https://luarocks.org/luadbi-postgresql-0.7.2-1.rockspec";
     sha256 = "07rx4agw4hjyzf8157apdwfqh9s26nqndmkr3wm7v09ygjvdjiix";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1550,7 +1550,7 @@ buildLuarocksPackage {
   pname = "luaepnf";
   version = "0.3-2";
   knownRockspec = (fetchurl {
-    url    = "https://luafr.org/luarocks/luaepnf-0.3-2.rockspec";
+    url    = "https://luarocks.org/luaepnf-0.3-2.rockspec";
     sha256 = "0kqmnj11wmfpc9mz04zzq8ab4mnbkrhcgc525wrq6pgl3p5li8aa";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1667,7 +1667,7 @@ buildLuarocksPackage {
   pname = "luafilesystem";
   version = "1.7.0-2";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/luafilesystem-1.7.0-2.rockspec";
+    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luafilesystem-1.7.0-2.rockspec";
     sha256 = "0xivgn8bbkx1g5a30jrjcv4hg5mpiiyrm3fhlz9lndgbh4cnjrq6";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@@ -1699,17 +1699,17 @@ lualogging = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
 }:
 buildLuarocksPackage {
   pname = "lualogging";
-  version = "1.5.2-1";
+  version = "1.6.0-2";
   knownRockspec = (fetchurl {
-    url    = "https://luarocks.org/lualogging-1.5.2-1.rockspec";
+    url    = "https://luarocks.org/lualogging-1.6.0-2.rockspec";
-    sha256 = "0jlqjhr5p9ji51bkmz8n9jc55i3vzqjfwjxvxp2ib9h4gmh2zqk3";
+    sha256 = "1235sfss0gmcw744rnhzfffhd1z732g2b2vsbpbz9kcvvhznmamb";
   }).outPath;
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
   "url": "https://github.com/lunarmodules/lualogging.git",
-  "rev": "8b4d8dd5a311245a197890405ba9324b9f5f5ab1",
+  "rev": "0bc4415de03ff1a99c92c02a5bed14a45b078079",
-  "date": "2021-08-12T19:29:39+02:00",
+  "date": "2021-11-09T20:20:42+01:00",
-  "path": "/nix/store/q1v28n04hh3r7aw37cxakzksfa3kw5qa-lualogging",
+  "path": "/nix/store/p3cyhqjw12bj7s6y4hndzqdkdfwq3958-lualogging",
-  "sha256": "0nj0ik91lgl9rwgizdkn7vy9brddsz1kxfn70c01x861vaxi63iz",
+  "sha256": "18664k4kfi4zq9n0217j57h42li6ws8s3f6d4yj0rcqsl19fxa7c",
   "fetchLFS": false,
   "fetchSubmodules": true,
   "deepClone": false,
@@ -2060,7 +2060,7 @@ buildLuarocksPackage {
   pname = "lyaml";
   version = "6.2.7-1";
   knownRockspec = (fetchurl {
-    url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lyaml-6.2.7-1.rockspec";
+    url    = "https://luarocks.org/lyaml-6.2.7-1.rockspec";
     sha256 = "0m5bnzg24nyk35gcn4rydgzk0ysk1f6rslxwxd0w3drl1bg64zja";
   }).outPath;
   src = fetchurl {
@@ -2252,10 +2252,10 @@ buildLuarocksPackage {
 
   src = fetchgit ( removeAttrs (builtins.fromJSON ''{
   "url": "https://github.com/nvim-lua/plenary.nvim",
-  "rev": "80bb2b9bb74bdca38a46480b6f2e15af990406e4",
+  "rev": "c2bb2d8fd5b44bfc6aad3a5463c84576a98dd4a9",
-  "date": "2021-10-06T19:20:08+02:00",
+  "date": "2021-12-06T21:11:29+01:00",
-  "path": "/nix/store/mw4r562qxr7giy1n43iylp3qb8ch0jqs-plenary.nvim",
+  "path": "/nix/store/h376md0lpbv31n5wyrq0cilkpx2lkr18-plenary.nvim",
-  "sha256": "11akcpxcp4m997a2y76ajknnmsifac2hj4nq9i4a8b1j08bxinim",
+  "sha256": "12csjz882yv9wwhzx964fq210655m8820491xjsrjlwccfc09i35",
   "fetchLFS": false,
   "fetchSubmodules": true,
   "deepClone": false,

pkgs/misc/vim-plugins/deprecated.json

@@ -1,4 +1,8 @@
 {
+    "compe-tmux": {
+        "date": "2021-12-07",
+        "new": "cmp-tmux"
+    },
     "gist-vim": {
         "date": "2020-03-27",
         "new": "vim-gist"

pkgs/misc/vim-plugins/overrides.nix

@@ -748,7 +748,7 @@ self: super: {
             libiconv
           ];
 
-          cargoSha256 = "sha256-XFo3FLaeLnXVQAEZol9PipqYYZ9C1z23S/qijxf0uIE=";
+          cargoSha256 = "sha256-zYm+7qAvhVGa/afddHhI2aQxmiLOkus5PHZBDP9S/Qg=";
         };
       in
       ''

pkgs/misc/vim-plugins/vim-plugin-names

@@ -1,16 +1,16 @@
 907th/vim-auto-save
 aca/completion-tabnine
-AckslD/nvim-neoclip.lua@main
+AckslD/nvim-neoclip.lua
-AckslD/nvim-whichkey-setup.lua@main
+AckslD/nvim-whichkey-setup.lua
-ackyshake/Spacegray.vim@main
+ackyshake/Spacegray.vim
-ahmedkhalf/lsp-rooter.nvim@main
+ahmedkhalf/lsp-rooter.nvim
 airblade/vim-gitgutter
 airblade/vim-rooter
 ajmwagar/vim-deus
 akinsho/bufferline.nvim
 akinsho/toggleterm.nvim
 aklt/plantuml-syntax
-allendang/nvim-expand-expr@main
+allendang/nvim-expand-expr
 altercation/vim-colors-solarized
 alvan/vim-closetag
 alvarosevilla95/luatab.nvim
@@ -20,26 +20,26 @@ amiorin/ctrlp-z
 andersevenrud/compe-tmux@cmp
 andrep/vimacs
 andreshazard/vim-logreview
-AndrewRadev/sideways.vim@main
+AndrewRadev/sideways.vim
-AndrewRadev/splitjoin.vim@main
+AndrewRadev/splitjoin.vim
 AndrewRadev/tagalong.vim
 andsild/peskcolor.vim
 andviro/flake8-vim
-andweeb/presence.nvim@main
+andweeb/presence.nvim
 andymass/vim-matchup
 andys8/vim-elm-syntax
 antoinemadec/coc-fzf
 antoinemadec/FixCursorHold.nvim
 ap/vim-css-color
-arcticicestudio/nord-vim
+arcticicestudio/nord-vim@master
 arkav/lualine-lsp-progress
 arthurxavierx/vim-unicoder
 artur-shaik/vim-javacomplete2
 autozimu/LanguageClient-neovim
 axelf4/vim-strip-trailing-whitespace
 ayu-theme/ayu-vim
-b0o/SchemaStore.nvim@main
+b0o/SchemaStore.nvim
-b3nj5m1n/kommentary@main
+b3nj5m1n/kommentary
 bakpakin/fennel.vim
 bazelbuild/vim-bazel
 bbchung/clighter8
@@ -53,15 +53,15 @@ blueballs-theme/blueballs-neovim
 blueyed/vim-diminactive
 bogado/file-line
 bohlender/vim-smt2
-brennanfee/vim-gui-position@main
+brennanfee/vim-gui-position
 bronson/vim-trailing-whitespace
 brooth/far.vim
 buoto/gotests-vim
 camspiers/lens.vim
-camspiers/snap@main
+camspiers/snap
 carlitux/deoplete-ternjs
 ccarpita/rtorrent-syntax-file
-cespare/vim-toml@main
+cespare/vim-toml
 chaoren/vim-wordmotion
 chentau/marks.nvim
 chikatoike/concealedyank.vim
@@ -121,7 +121,7 @@ dpelle/vim-LanguageTool
 dracula/vim as dracula-vim
 drewtempelmeyer/palenight.vim
 drmingdrmer/xptemplate
-dstein64/nvim-scrollview@main
+dstein64/nvim-scrollview
 dstein64/vim-startuptime
 dylanaraps/wal.vim
 eagletmt/ghcmod-vim
@@ -129,21 +129,21 @@ eagletmt/neco-ghc
 easymotion/vim-easymotion
 eddiebergman/nvim-treesitter-pyfold
 eddyekofo94/gruvbox-flat.nvim
-EdenEast/nightfox.nvim@main
+EdenEast/nightfox.nvim
 editorconfig/editorconfig-vim
 edkolev/tmuxline.vim
-edluffy/hologram.nvim@main
+edluffy/hologram.nvim
-edluffy/specs.nvim@main
+edluffy/specs.nvim
 edwinb/idris2-vim
 ehamberg/vim-cute-python
 eigenfoo/stan-vim
 eikenb/acp
 elixir-editors/vim-elixir
-ellisonleao/glow.nvim@main
+ellisonleao/glow.nvim
-ellisonleao/gruvbox.nvim@main
+ellisonleao/gruvbox.nvim
 elmcast/elm-vim
 elzr/vim-json
-embark-theme/vim@main as embark-vim
+embark-theme/vim as embark-vim
 embear/vim-localvimrc
 enomsg/vim-haskellConcealPlus
 enricobacis/vim-airline-clock
@@ -167,12 +167,12 @@ fiatjaf/neuron.vim
 fisadev/vim-isort
 flazz/vim-colorschemes
 floobits/floobits-neovim
-folke/lsp-colors.nvim@main
+folke/lsp-colors.nvim
-folke/todo-comments.nvim@main
+folke/todo-comments.nvim
-folke/tokyonight.nvim@main
+folke/tokyonight.nvim
-folke/trouble.nvim@main
+folke/trouble.nvim
-folke/twilight.nvim@main
+folke/twilight.nvim
-folke/which-key.nvim@main
+folke/which-key.nvim
 FooSoft/vim-argwrap
 freitass/todo.txt-vim
 frigoeu/psc-ide-vim
@@ -180,7 +180,7 @@ fruit-in/brainfuck-vim
 fruit-in/vim-nong-theme
 fsharp/vim-fsharp
 garbas/vim-snipmate
-gbrlsnchs/telescope-lsp-handlers.nvim@trunk
+gbrlsnchs/telescope-lsp-handlers.nvim
 gcmt/taboo.vim
 gcmt/wildfire.vim
 gelguy/wilder.nvim
@@ -188,16 +188,16 @@ gennaro-tedesco/nvim-jqx
 gennaro-tedesco/nvim-peekup
 gentoo/gentoo-syntax
 GEverding/vim-hocon
-gfanto/fzf-lsp.nvim@main
+gfanto/fzf-lsp.nvim
-ggandor/lightspeed.nvim@main
+ggandor/lightspeed.nvim
 gibiansky/vim-textobj-haskell
 gioele/vim-autoswap
 gleam-lang/gleam.vim
 glepnir/dashboard-nvim
-glepnir/galaxyline.nvim@main
+glepnir/galaxyline.nvim
-glepnir/lspsaga.nvim@main
+glepnir/lspsaga.nvim
 glepnir/oceanic-material
-glepnir/zephyr-nvim@main
+glepnir/zephyr-nvim
 glts/vim-textobj-comment
 godlygeek/csapprox
 godlygeek/tabular
@@ -231,17 +231,17 @@ henrik/vim-indexed-search
 HerringtonDarkholme/yats.vim
 honza/vim-snippets
 hotwatermorning/auto-git-diff
-hrsh7th/cmp-buffer@main
+hrsh7th/cmp-buffer
-hrsh7th/cmp-calc@main
+hrsh7th/cmp-calc
-hrsh7th/cmp-cmdline@main
+hrsh7th/cmp-cmdline
-hrsh7th/cmp-emoji@main
+hrsh7th/cmp-emoji
-hrsh7th/cmp-nvim-lsp-document-symbol@main
+hrsh7th/cmp-nvim-lsp
-hrsh7th/cmp-nvim-lsp@main
+hrsh7th/cmp-nvim-lsp-document-symbol
-hrsh7th/cmp-nvim-lua@main
+hrsh7th/cmp-nvim-lua
-hrsh7th/cmp-omni@main
+hrsh7th/cmp-omni
-hrsh7th/cmp-path@main
+hrsh7th/cmp-path
-hrsh7th/cmp-vsnip@main
+hrsh7th/cmp-vsnip
-hrsh7th/nvim-cmp@main
+hrsh7th/nvim-cmp
 hrsh7th/nvim-compe
 hrsh7th/vim-vsnip
 hrsh7th/vim-vsnip-integ
@@ -270,12 +270,12 @@ ivanov/vim-ipython
 jackguo380/vim-lsp-cxx-highlight
 jacoborus/tender.vim
 jakwings/vim-pony
-jamessan/vim-gnupg@main
+jamessan/vim-gnupg
 jaredgorski/SpaceCamp
 jasonccox/vim-wayland-clipboard
 jaxbot/semantic-highlight.vim
 JazzCore/ctrlp-cmatcher
-jbyuki/venn.nvim@main
+jbyuki/venn.nvim
 jc-doyle/cmp-pandoc-references
 jceb/vim-hier
 jceb/vim-orgmode
@@ -284,7 +284,7 @@ jeetsukumaran/vim-indentwise
 jeffkreeftmeijer/neovim-sensible
 jeffkreeftmeijer/vim-numbertoggle
 jelera/vim-javascript-syntax
-jgdavey/tslime.vim@main
+jgdavey/tslime.vim
 jhradilek/vim-docbk
 jhradilek/vim-snippets as vim-docbk-snippets
 jiangmiao/auto-pairs
@@ -296,22 +296,22 @@ jnurmine/zenburn
 jonbri/vim-colorstepper
 jonsmithers/vim-html-template-literals
 joonty/vim-xdebug
-joosepalviste/nvim-ts-context-commentstring@main
+joosepalviste/nvim-ts-context-commentstring
 jordwalke/vim-reasonml
 josa42/coc-lua
 josa42/vim-lightline-coc
-jose-elias-alvarez/minsnip.nvim@main
+jose-elias-alvarez/minsnip.nvim
-jose-elias-alvarez/null-ls.nvim@main
+jose-elias-alvarez/null-ls.nvim
-jose-elias-alvarez/nvim-lsp-ts-utils@main
+jose-elias-alvarez/nvim-lsp-ts-utils
-joshdick/onedark.vim@main
+joshdick/onedark.vim
-jpalardy/vim-slime@main
+jpalardy/vim-slime
 jparise/vim-graphql
 jparise/vim-phabricator
 jreybert/vimagit
 jsfaint/gen_tags.vim
 JuliaEditorSupport/deoplete-julia
 JuliaEditorSupport/julia-vim
-Julian/lean.nvim@main
+Julian/lean.nvim
 Julian/vim-textobj-variable-segment
 juliosueiras/vim-terraform-completion
 junegunn/fzf.vim
@@ -347,16 +347,16 @@ karb94/neoscroll.nvim
 kassio/neoterm
 kbenzie/vim-spirv
 kchmck/vim-coffee-script
-kdheepak/cmp-latex-symbols@main
+kdheepak/cmp-latex-symbols
 kdheepak/lazygit.nvim
-kdheepak/tabline.nvim@main
+kdheepak/tabline.nvim
 KeitaNakamura/neodark.vim
 keith/investigate.vim
 keith/rspec.vim
 keith/swift.vim
-kevinhwang91/nvim-bqf@main
+kevinhwang91/nvim-bqf
-kevinhwang91/nvim-hlslens@main
+kevinhwang91/nvim-hlslens
-kevinhwang91/rnvimr@main
+kevinhwang91/rnvimr
 kien/rainbow_parentheses.vim
 knubie/vim-kitty-navigator
 konfekt/fastfold
@@ -388,8 +388,8 @@ leanprover/lean.vim
 ledger/vim-ledger
 lepture/vim-jinja
 lervag/vimtex
-lewis6991/gitsigns.nvim@main
+lewis6991/gitsigns.nvim
-lf-lang/lingua-franca.vim@main
+lf-lang/lingua-franca.vim
 lfe-support/vim-lfe
 lfilho/cosco.vim
 lifepillar/vim-gruvbox8
@@ -456,7 +456,7 @@ megaannum/forms
 megaannum/self
 mengelbrecht/lightline-bufferline
 metakirby5/codi.vim
-metalelf0/jellybeans-nvim@main
+metalelf0/jellybeans-nvim
 mfukar/robotframework-vim
 mfussenegger/nvim-dap
 mfussenegger/nvim-jdtls
@@ -475,7 +475,7 @@ michaeljsmith/vim-indent-object
 mileszs/ack.vim
 milkypostman/vim-togglelist
 mindriot101/vim-yapf
-mk12/vim-lean@main
+mk12/vim-lean
 mkasa/lushtags
 mlr-msft/vim-loves-dafny
 moll/vim-bbye
@@ -485,7 +485,7 @@ motus/pig.vim
 mpickering/hlint-refactor-vim
 ms-jpq/chadtree@chad
 mtikekar/vim-bsv
-MunifTanjim/nui.nvim@main
+MunifTanjim/nui.nvim
 mzlogin/vim-markdown-toc
 mzlogin/vim-smali
 nacro90/numb.nvim
@@ -493,7 +493,7 @@ nanotech/jellybeans.vim
 natebosch/vim-lsc
 nathanaelkane/vim-indent-guides
 nathangrigg/vim-beancount
-nathanmsmith/nvim-ale-diagnostic@main
+nathanmsmith/nvim-ale-diagnostic
 navicore/vissort.vim
 nbouscal/vim-stylish-haskell
 ncm2/float-preview.nvim
@@ -548,32 +548,33 @@ nvim-lua/lsp_extensions.nvim
 nvim-lua/plenary.nvim
 nvim-lua/popup.nvim
 nvim-lualine/lualine.nvim
-nvim-neorg/neorg@main
+nvim-neorg/neorg
 nvim-orgmode/orgmode
+nvim-pack/nvim-spectre
 nvim-telescope/telescope-cheat.nvim
 nvim-telescope/telescope-dap.nvim
 nvim-telescope/telescope-frecency.nvim
-nvim-telescope/telescope-fzf-native.nvim@main
+nvim-telescope/telescope-fzf-native.nvim
 nvim-telescope/telescope-fzf-writer.nvim
 nvim-telescope/telescope-fzy-native.nvim
 nvim-telescope/telescope-project.nvim
 nvim-telescope/telescope-symbols.nvim
-nvim-telescope/telescope-z.nvim@main
+nvim-telescope/telescope-z.nvim
 nvim-telescope/telescope.nvim
 nvim-treesitter/completion-treesitter
+nvim-treesitter/nvim-treesitter
 nvim-treesitter/nvim-treesitter-refactor
 nvim-treesitter/nvim-treesitter-textobjects
-nvim-treesitter/nvim-treesitter
 nvim-treesitter/playground
 oberblastmeister/neuron.nvim
 oberblastmeister/termwrapper.nvim
 ocaml/vim-ocaml
 octol/vim-cpp-enhanced-highlight
-ojroques/nvim-bufdel@main
+ojroques/nvim-bufdel
-ojroques/vim-oscyank@main
+ojroques/vim-oscyank
 Olical/aniseed
 Olical/conjure
-olimorris/onedarkpro.nvim@main
+olimorris/onedarkpro.nvim
 onsails/diaglist.nvim
 onsails/lspkind-nvim
 OrangeT/vim-csharp
@@ -597,7 +598,7 @@ petRUShka/vim-opencl
 phaazon/hop.nvim
 phanviet/vim-monokai-pro
 plasticboy/vim-markdown
-Pocco81/TrueZen.nvim@main
+Pocco81/TrueZen.nvim
 ponko2/deoplete-fish
 posva/vim-vue
 powerman/vim-plugin-AnsiEsc
@@ -622,8 +623,8 @@ qpkorr/vim-bufkill
 Quramy/tsuquyomi
 racer-rust/vim-racer
 radenling/vim-dispatch-neovim
-rafamadriz/friendly-snippets@main
+rafamadriz/friendly-snippets
-rafamadriz/neon@main
+rafamadriz/neon
 rafaqz/ranger.vim
 rafi/awesome-vim-colorschemes
 raghur/fruzzy
@@ -648,10 +649,10 @@ rhysd/vim-grammarous
 rhysd/vim-operator-surround
 RishabhRD/nvim-lsputils
 RishabhRD/popfix
-rktjmp/fwatch.nvim@main
+rktjmp/fwatch.nvim
-rktjmp/lush.nvim@main
+rktjmp/lush.nvim
-rmagatti/auto-session@main
+rmagatti/auto-session
-rmagatti/goto-preview@main
+rmagatti/goto-preview
 RobertAudi/securemodelines
 rodjek/vim-puppet
 romainl/vim-cool
@@ -676,7 +677,7 @@ rust-lang/rust.vim
 ryanoasis/vim-devicons
 ryvnf/readline.vim
 saadparwaiz1/cmp_luasnip
-saecki/crates.nvim@main
+saecki/crates.nvim
 sainnhe/edge
 sainnhe/gruvbox-material
 sainnhe/sonokai
@@ -684,7 +685,7 @@ sakhnik/nvim-gdb
 saltstack/salt-vim
 samoshkin/vim-mergetool
 sbdchd/neoformat
-scalameta/nvim-metals@main
+scalameta/nvim-metals
 sdiehl/vim-ormolu
 sebastianmarkow/deoplete-rust
 SevereOverfl0w/deoplete-github
@@ -718,7 +719,7 @@ SidOfc/mkdx
 simnalamburt/vim-mundo
 simrat39/rust-tools.nvim
 simrat39/symbols-outline.nvim
-sindrets/diffview.nvim@main
+sindrets/diffview.nvim
 SirVer/ultisnips
 sjl/gundo.vim
 sjl/splice.vim
@@ -755,7 +756,7 @@ ternjs/tern_for_vim
 terryma/vim-expand-region
 terryma/vim-multiple-cursors
 tex/vimpreviewpandoc
-Th3Whit3Wolf/one-nvim@main
+Th3Whit3Wolf/one-nvim
 theHamsta/nvim-dap-virtual-text
 ThePrimeagen/git-worktree.nvim
 ThePrimeagen/harpoon
@@ -779,7 +780,7 @@ tmhedberg/SimpylFold
 tmsvg/pear-tree
 tmux-plugins/vim-tmux
 tmux-plugins/vim-tmux-focus-events
-tom-anders/telescope-vim-bookmarks.nvim@main
+tom-anders/telescope-vim-bookmarks.nvim
 tomasiser/vim-code-dark
 tomasr/molokai
 tomlion/vim-solidity
@@ -822,11 +823,11 @@ tpope/vim-tbone
 tpope/vim-unimpaired
 tpope/vim-vinegar
 travitch/hasksyn
-tremor-rs/tremor-vim@main
+tremor-rs/tremor-vim
 triglav/vim-visual-increment
 troydm/zoomwintab.vim
 turbio/bracey.vim
-tversteeg/registers.nvim@main
+tversteeg/registers.nvim
 tweekmonster/wstrip.vim
 twerth/ir_black
 twinside/vim-haskellconceal
@@ -834,8 +835,8 @@ Twinside/vim-hoogle
 tyru/caw.vim
 tyru/open-browser-github.vim
 tyru/open-browser.vim
-tzachar/cmp-tabnine@main
+tzachar/cmp-tabnine
-tzachar/compe-tabnine@main
+tzachar/compe-tabnine
 uarun/vim-protobuf
 udalov/kotlin-vim
 ujihisa/neco-look
@@ -905,7 +906,7 @@ w0ng/vim-hybrid
 wakatime/vim-wakatime
 wannesm/wmgraphviz.vim
 wbthomason/packer.nvim
-weilbith/nvim-code-action-menu@main
+weilbith/nvim-code-action-menu
 wellle/targets.vim
 wellle/tmux-complete.vim
 wfxr/minimap.vim
@@ -915,7 +916,6 @@ wincent/command-t
 wincent/ferret
 wincent/terminus
 windwp/nvim-autopairs
-windwp/nvim-spectre
 winston0410/cmd-parser.nvim
 winston0410/range-highlight.nvim
 wlangstroth/vim-racket
@@ -926,8 +926,8 @@ xolox/vim-misc
 xuhdev/vim-latex-live-preview
 Xuyuanp/nerdtree-git-plugin
 Xuyuanp/scrollbar.nvim
-yamatsum/nvim-cursorline@main
+yamatsum/nvim-cursorline
-yamatsum/nvim-nonicons@main
+yamatsum/nvim-nonicons
 ycm-core/YouCompleteMe
 Yggdroot/hiPairs
 Yggdroot/indentLine