overlays/dogetipbot-telegram.nix

@@ -3,7 +3,7 @@ self: super:
 {
   dogetipbot-telegram = super.callPackage (super.fetchgit {
     url = "https://gitlab.com/nyanloutre/dogetipbot-telegram.git";
-    rev = "33e5a2273cc1e447dec9a37676913915706fd332";
-    sha256 = "1rzv5qd7bj1dzx5qa2h4mdzzvxk77hz3svfcg7hq0sff8a7npk46";
+    rev = "3bf1c89aaccded42ce41452c72f7ebf6d4d056ca";
+    sha256 = "1gd1wi054ihbxanvj1ac7mz5ghnxab89a0r3i4hy482sglbxqcih";
   }) { pkgs = self; };
 }

services/mail-server.nix

@@ -17,8 +17,8 @@ in
 
   imports = [
     (builtins.fetchTarball {
-      url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/8b7dde4b54da821ca3dc2058178d6ffbd2e25bc5/nixos-mailserver-8b7dde4b54da821ca3dc2058178d6ffbd2e25bc5.tar.gz";
-      sha256 = "0pf25ns3yq9vdbpb30cplx4zkj7srrklamd6kw7ifaf7gyc7fy65";
+      url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.0/nixos-mailserver-v2.2.0.tar.gz";
+      sha256 = "0gqzgy50hgb5zmdjiffaqp277a68564vflfpjvk1gv6079zahksc";
     })
   ];
 

systems/LoutreOS/configuration.nix

@@ -5,7 +5,7 @@
 { config, pkgs, ... }:
 
 let
-  gitRev = "0af0b7a9cf9dc426c3686fd8b9369251ef18805a";
+  gitRev = "baee8283bb858602e6b8d9c4763f11f79d4ac813";
   nixpkgs = fetchTarball "https://github.com/nyanloutre/nixpkgs/archive/${gitRev}.tar.gz";
 in
 {

systems/LoutreOS/hardware-configuration.nix

@@ -117,11 +117,6 @@
       fsType = "zfs";
     };
 
-  fileSystems."/var/lib/factorio" =
-    { device = "loutrepool/var/factorio";
-      fsType = "zfs";
-    };
-
   fileSystems."/var/dkim" =
     { device = "loutrepool/var/dkim";
       fsType = "zfs";

systems/LoutreOS/services.nix

@@ -9,7 +9,6 @@ let
   pgmanage_port = 52347;
   max_port = 52348;
   musique_port = 52349;
-  factorio_port = 52351;
 in
 
 {
@@ -22,7 +21,6 @@ in
     ../../services/python-ci.nix
     ../../services/sdtdserver.nix
     ../../containers/vsftpd.nix
-    /mnt/secrets/factorio_secrets.nix
   ];
 
   nixpkgs.overlays = [
@@ -61,7 +59,6 @@ in
         "pgmanage.${domaine}" = { ip = "127.0.0.1"; port = pgmanage_port; auth = true; };
         "gitea.${domaine}" = { ip = "127.0.0.1"; port = 3001; auth = false; };
         "ci.${domaine}" = { ip = "127.0.0.1"; port = 52350; auth = false; };
-        "factorio.${domaine}" = { ip = "127.0.0.1"; port = factorio_port; auth = false; };
       };
     };
 
@@ -212,10 +209,6 @@ in
           listen = [ { addr = "127.0.0.1"; port = riot_port; } ];
           locations = { "/" = { root = pkgs.riot-web; }; };
         };
-        "factorio" = {
-          listen = [ { addr = "127.0.0.1"; port = factorio_port; } ];
-          locations = { "/" = { root = "/var/www/factorio"; }; };
-        };
       };
     };
 
@@ -290,6 +283,7 @@ in
       };
     };
 
+    /*
     borgbackup.jobs = {
       loutre = {
         paths = [
@@ -325,11 +319,12 @@ in
         postHook = ''
           ${pkgs.zfs}/bin/zfs destroy loutrepool/var/postgresql@borgsnap
           if [[ $exitStatus == 0 ]]; then
-            ${pkgs.rclone}/bin/rclone --config /mnt/secrets/rclone_loutre.conf sync -v $BORG_REPO BackupStorage:loutre
+            ${pkgs.rclone}/bin/rclone --config /mnt/secrets/rclone_loutre.conf sync -v $BORG_REPO loutre_ovh:loutre
           fi
         '';
       };
     };
+    */
 
     borgbackup.repos = {
       diskstation = {
@@ -367,17 +362,10 @@ in
 
     python-ci.enable = true;
 
-    sdtdserver.enable = false;
-
-    factorio = {
-      enable = true;
-      autosave-interval = 10;
-      game-name = "Shame";
-      public = true;
-      username = "nyanloutre";
-    };
+    sdtdserver.enable = true;
   };
 
+  /*
   systemd.services.dogetipbot-telegram = {
     after = [ "network.target" ];
     wantedBy = [ "multi-user.target" ];
@@ -385,9 +373,11 @@ in
     enable = true;
     serviceConfig = {
       EnvironmentFile = "/mnt/secrets/dogetipbot-telegram_env";
-      DynamicUser = true;
+      User = "nobody";
+      Group = "nogroup";
     };
   };
+  */
 
   systemd.services.matrix-synapse = {
     serviceConfig = {