Merge pull request #947 from Mic92/joerg-ci

move the wiki to a flake

flake.nix

@@ -84,6 +84,14 @@
 
     flake-utils.url = "github:numtide/flake-utils";
 
+    nixos-wiki.url = "github:Mic92/nixos-wiki-infra";
+    nixos-wiki.inputs.nixpkgs.follows = "nixpkgs";
+    nixos-wiki.inputs.flake-parts.follows = "flake-parts";
+    nixos-wiki.inputs.treefmt-nix.follows = "treefmt-nix";
+    nixos-wiki.inputs.disko.follows = "disko";
+    nixos-wiki.inputs.sops-nix.follows = "sops-nix";
+    nixos-wiki.inputs.srvos.follows = "srvos";
+
     #microvm.url = "github:astro/microvm.nix";
     #microvm.inputs.nixpkgs.follows = "nixpkgs";
     #microvm.inputs.flake-utils.follows = "flake-utils";

home/.config/qtile/config.py

@@ -113,7 +113,7 @@ def create_screenshot(qtile: Qtile) -> None:
     ),
     Key([mod, "control"], "r", lazy.reload_config(), desc="Reload the config"),
     Key([mod, "control"], "q", lazy.shutdown(), desc="Shutdown Qtile"),
-    Key([mod], "r", lazy.spawncmd(), desc="Spawn a command using a prompt widget"),
+    Key([mod], "r", lazy.spawn("rofi -show run"), desc="Spawn rofi"),
     Key(
         [mod],
         "Print",

nixos/eve/configuration.nix

@@ -60,7 +60,6 @@
     ./modules/users.nix
     ./modules/wireguard.nix
     ./modules/nixos-wiki
-    ./modules/nixos-wiki/backup.nix
     ./modules/zerotier.nix
     #./modules/headscale.nix
     #./modules/wiregrill

nixos/eve/modules/nixos-wiki/default.nix

@@ -1,101 +1,10 @@
-{ config, pkgs, ... }:
-let
-  hostname = "nixos-wiki.thalheim.io";
-  githubClientId = "Iv1.95ed182c83df1d22";
-in
+{ config, lib, ... }:
 {
-  sops.secrets."nixos-wiki".owner = config.services.phpfpm.pools.mediawiki.user;
-  sops.secrets.nixos-wiki-github-client-secret.owner = config.services.phpfpm.pools.mediawiki.user;
-
-  services.mediawiki = {
-    enable = true;
-    webserver = "nginx";
-    database.type = "postgres";
-    nginx.hostName = hostname;
-    uploadsDir = "/var/lib/mediawiki-uploads/";
-    passwordFile = config.sops.secrets."nixos-wiki".path;
-
-    extensions.SyntaxHighlight_GeSHi = null; # provides <SyntaxHighlight> tags
-    extensions.ParserFunctions = null;
-    extensions.Cite = null;
-    extensions.VisualEditor = null;
-    extensions.AuthManagerOAuth = pkgs.fetchzip {
-      url = "https://github.com/mohe2015/AuthManagerOAuth/releases/download/v0.3.0/AuthManagerOAuth.zip";
-      hash = "sha256-4ev8LwuConmHzFm5cPr+ni9aYPDOHLArGoJhzdugEn4=";
-    }; # Github login
-    extensions.ConfirmEdit = null; # Combat SPAM with a simple Captcha
-    extensions.StopForumSpam = pkgs.fetchzip {
-      url = "https://extdist.wmflabs.org/dist/extensions/StopForumSpam-REL1_40-71b57ba.tar.gz";
-      hash = "sha256-g8v4zr11c2e4bY0BNipJ48miyAF4WTNvlSMgb/NxPBA=";
-    };
-
-    extraConfig = ''
-      #$wgDebugLogFile = "/var/log/mediawiki/debug.log";
-
-      # allow local login
-      $wgAuthManagerOAuthConfig = [
-        'github' => [
-          'clientId'                => '${githubClientId}',
-          'clientSecret'            => file_get_contents("${config.sops.secrets.nixos-wiki-github-client-secret.path}"),
-          'urlAuthorize'            => 'https://github.com/login/oauth/authorize',
-          'urlAccessToken'          => 'https://github.com/login/oauth/access_token',
-          'urlResourceOwnerDetails' => 'https://api.github.com/user'
-        ],
-      ];
-
-      # Enable account creation globally
-      $wgGroupPermissions['*']['createaccount'] = true;
-      $wgGroupPermissions['*']['autocreateaccount'] = true;
-
-      # Disable anonymous editing
-      $wgGroupPermissions['*']['edit'] = false;
-
-      # Allow svg upload
-      $wgFileExtensions[] = 'svg';
-      $wgSVGConverterPath = "${pkgs.imagemagick}/bin";
-
-      # Pretty URLs
-      $wgUsePathInfo = true;
-
-      # cache pages with APCu
-      $wgMainCacheType = CACHE_ACCEL;
-
-      # TODO: nixos favicon
-      #$wgFavicon = "/favicon.ico";
-      $wgDefaultSkin = 'vector-2022';
-      # configure logos for vector-2022: https://www.mediawiki.org/wiki/Manual:$wgLogos
-      $wgLogos = [
-        '1x' => '/nixos.png',	
-        'icon' => '/nixos.png',	
-      ];
-
-      # Combat SPAM with IP-Blocklists (StopForumSpam extension)
-      $wgEnableDnsBlacklist = true;
-      $wgDnsBlacklistUrls = array(
-        'dnsbl.dronebl.org'
-      );
-
-      # required for fancy VisualEditor extension
-      $wgGroupPermissions['user']['writeapi'] = true;
-
-      # Enable content security policy
-      $wgCSPHeader = true;
-
-      # Disallow framing
-      $wgEditPageFrameOptions = "DENY";
-
-      $wgEnableEmail = true;
-      $wgAllowHTMLEmail = false;
-      $wgEmergencyContact = "nixos-wiki-emergency@thalheim.io";
-      $wgPasswordSender   = "nixos-wiki@thalheim.io";           # Default FROM address
-      $wgNoReplyAddress   = "nixos-wiki-no-reply@thalheim.io";  # Default Reply-To address
-    '';
-  };
-
+  services.nixos-wiki.hostname = "nixos-wiki.thalheim.io";
+  services.nixos-wiki.githubClientId = "Iv1.95ed182c83df1d22";
 
   services.nginx.virtualHosts.${config.services.mediawiki.nginx.hostName} = {
+    enableACME = lib.mkForce false;
     useACMEHost = "thalheim.io";
-    forceSSL = true;
-    locations."=/nixos.png".alias = ./nixos.png;
   };
 }

nixos/flake-module.nix

@@ -93,6 +93,8 @@ in
           inputs.buildbot-nix.nixosModules.buildbot-worker
           inputs.buildbot-nix.nixosModules.buildbot-master
           inputs.disko.nixosModules.disko
+          inputs.nixos-wiki.nixosModules.nixos-wiki
+          inputs.nixos-wiki.nixosModules.nixos-wiki-backup
         ];
       };