Merge master into staging-next

2020-11-03 12:06:06 +01:00
parent fe9f55907e 72c32ad3d7
commit 237966224d
317 changed files with 3210 additions and 2827 deletions
@@ -6,9 +6,7 @@
 <para>
  Kakoune can be built to autoload plugins:
 <programlisting>(kakoune.override {
-  configure = {
-    plugins = with pkgs.kakounePlugins; [ parinfer-rust ];
-  };
+  plugins = with pkgs.kakounePlugins; [ parinfer-rust ];
 })</programlisting>
 </para>
 </section>