From ec60e54c9aeaa39fbcf535b018017061529ac555 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 2 Mar 2020 22:38:36 +0100
Subject: [PATCH] maj 20.03

---
 overlays/riot-web.nix              | 22 ++++++------
 services/haproxy-acme.nix          |  1 +
 systems/LoutreOS/configuration.nix |  2 +-
 systems/LoutreOS/services.nix      | 58 +++++++++++++++---------------
 4 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/overlays/riot-web.nix b/overlays/riot-web.nix
index c92dfa5..33428ff 100644
--- a/overlays/riot-web.nix
+++ b/overlays/riot-web.nix
@@ -1,17 +1,15 @@
 self: super:
 {
   riot-web = super.riot-web.override {
-    conf = ''
-      {
-        "default_hs_url": "https://matrix.nyanlout.re",
-        "default_is_url": "https://vector.im",
-        "brand": "Nyanloutre",
-        "default_theme": "dark",
-        "integrations_ui_url": "https://dimension.t2bot.io/riot",
-        "integrations_rest_url": "https://dimension.t2bot.io/api/v1/scalar",
-        "integrations_widgets_urls": ["https://dimension.t2bot.io/widgets"],
-        "integrations_jitsi_widget_url": "https://dimension.t2bot.io/widgets/jitsi"
-      }
-    '';
+    conf = {
+      default_hs_url = "https://matrix.nyanlout.re";
+      default_is_url = "https://vector.im";
+      brand = "Nyanloutre";
+      default_theme = "dark";
+      integrations_ui_url = "https://dimension.t2bot.io/riot";
+      integrations_rest_url = "https://dimension.t2bot.io/api/v1/scalar";
+      integrations_widgets_urls = ["https://dimension.t2bot.io/widgets"];
+      integrations_jitsi_widget_url = "https://dimension.t2bot.io/widgets/jitsi";
+    };
   };
 } 
diff --git a/services/haproxy-acme.nix b/services/haproxy-acme.nix
index 4309e95..9383f38 100644
--- a/services/haproxy-acme.nix
+++ b/services/haproxy-acme.nix
@@ -126,6 +126,7 @@ in
       };
     };
 
+    security.acme.acceptTerms = true;
     security.acme.certs = {
       ${cfg.domaine} = {
         extraDomains = mapAttrs' (name: value:
diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix
index 8edcfe9..a1d8c67 100644
--- a/systems/LoutreOS/configuration.nix
+++ b/systems/LoutreOS/configuration.nix
@@ -33,7 +33,7 @@ in
   ];
 
   nixpkgs.config.allowUnfree = false;
-  nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.pname).name [ "factorio-headless" "perl5.30.0-slimserver" "minecraft-server" ]);
+  nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.pname).name [ "factorio-headless" "perl5.30.1-slimserver" "minecraft-server" ]);
 
   services.zfs = {
     autoSnapshot.enable = true;
diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix
index ebbfc84..6f77f1f 100644
--- a/systems/LoutreOS/services.nix
+++ b/systems/LoutreOS/services.nix
@@ -262,36 +262,36 @@ in
     };
   };
 
-  systemd.services.minecraft-overviewer =
-  let
-    clientJar = pkgs.fetchurl {
-      url = "https://overviewer.org/textures/1.14";
-      sha256 = "0fij9wac7vj6h0kd3mfhqpn0w9gl8pbs9vs9s085zajm0szpr44k";
-      name = "client.jar";
-    };
-    configFile = pkgs.runCommand "overviewer-config" { CLIENT_JAR = clientJar; } ''
-      substitute ${./config-overviewer.py} $out \
-        --subst-var CLIENT_JAR
-    '';
-  in
-  {
-    script = ''
-      ${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile}
-      ${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile} --genpoi
-      rm /var/www/minecraft-overviewer/progress.json
-    '';
-    serviceConfig = {
-      User = "nginx";
-      Group = "nginx";
-    };
-  };
+  # systemd.services.minecraft-overviewer =
+  # let
+  #   clientJar = pkgs.fetchurl {
+  #     url = "https://overviewer.org/textures/1.14";
+  #     sha256 = "0fij9wac7vj6h0kd3mfhqpn0w9gl8pbs9vs9s085zajm0szpr44k";
+  #     name = "client.jar";
+  #   };
+  #   configFile = pkgs.runCommand "overviewer-config" { CLIENT_JAR = clientJar; } ''
+  #     substitute ${./config-overviewer.py} $out \
+  #       --subst-var CLIENT_JAR
+  #   '';
+  # in
+  # {
+  #   script = ''
+  #     ${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile}
+  #     ${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile} --genpoi
+  #     rm /var/www/minecraft-overviewer/progress.json
+  #   '';
+  #   serviceConfig = {
+  #     User = "nginx";
+  #     Group = "nginx";
+  #   };
+  # };
 
-  systemd.timers.minecraft-overviewer = {
-    wantedBy = [ "multi-user.target" ];
-    timerConfig = {
-      OnCalendar = "*-*-* 04:00:00";
-    };
-  };
+  # systemd.timers.minecraft-overviewer = {
+  #   wantedBy = [ "multi-user.target" ];
+  #   timerConfig = {
+  #     OnCalendar = "*-*-* 04:00:00";
+  #   };
+  # };
 
   systemd.packages = with pkgs; [
     tgt