Merge commit 'f057233bc5'

trivionomicon/modules/mediawiki/options.nix

@@ -12,22 +12,22 @@ with lib.types; {
       description = "name of the wiki";
       example = "posixlycorrect wiki";
     };
-    
+
     passwordFile = lib.mkOption {
       type = types.path;
       description = "A file containing the initial password for the administrator account 'admin'";
       example = "/run/keys/mediawiki-password";
     };
-    
+
     skins = lib.mkOption {
       type = types.attrsOf (types.nullOr str);
       description = "skins for mediawiki";
       default = {};
-      example = ''{
-        citizen = "flakes.mediawikiSkinCitizen";
-      };'';
+      example = ''        {
+                citizen = "flakes.mediawikiSkinCitizen";
+              };'';
     };
-    
+
     extraConfig = lib.mkOption {
       type = str;
       default = "";
@@ -42,21 +42,21 @@ with lib.types; {
       type = types.attrsOf (types.nullOr types.path);
       description = "some extensions are included and can enabled by passing null";
       default = {};
-      example = ''{
-        VisualEditor = null;
-        CategoryTree = null;
-        CiteThisPage = null;
-        Scribunto = null;
-        Cite = null;
-        CodeEditor = null;
-        Math = null;
-        MultimediaViewer = null;
-        PdfHandler = null;
-        Poem = null;
-        SecureLinkFixer = null;
-        WikiEditor = null;
-        ParserFunctions = null;
-      };'';
+      example = ''        {
+                VisualEditor = null;
+                CategoryTree = null;
+                CiteThisPage = null;
+                Scribunto = null;
+                Cite = null;
+                CodeEditor = null;
+                Math = null;
+                MultimediaViewer = null;
+                PdfHandler = null;
+                Poem = null;
+                SecureLinkFixer = null;
+                WikiEditor = null;
+                ParserFunctions = null;
+              };'';
     };
   };
 }

trivionomicon/modules/mediawiki/sys.nix

@@ -4,7 +4,8 @@
   cfg,
   doctrine,
   ...
-}: with lib; {
+}:
+with lib; {
   services = {
     nginx = {
       virtualHosts.${cfg.hostName} = {