Adapt Syncthing to upstream changes

flake.lock

@@ -151,16 +151,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701540982,
-        "narHash": "sha256-5ajSy6ODgGmAbmymRdHnjfVnuVrACjI8wXoGVvrtvww=",
+        "lastModified": 1701539137,
+        "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6386d8aafc28b3a7ed03880a57bdc6eb4465491d",
+        "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "type": "indirect"
       }
     },

flake.nix

@@ -2,7 +2,7 @@
   description = "System configuration for zion";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.05";
+    nixpkgs.url = "nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
     agenix = {
       url = "github:ryantm/agenix";

modules/datasync.nix

@@ -7,80 +7,82 @@
     guiAddress = "0.0.0.0:8384";
     dataDir = "/vault/syncthing";
     key = config.age.secrets.syncthing.path;
-    devices = {
-      panacea.id =
-        "NF4SYEJ-RSGPDEF-CDEYC3A-JWZMKNC-KG4FVQP-CZ5HRFY-XM22BZD-N7B6VAH";
-      caravanserai.id =
-        "MIRF73R-S7AV47R-VLWZUK2-TFCVQPV-FRYCPND-Y4VR3W2-ZAIQXZD-JAEQCAD";
-    };
     extraOptions = {
       options = {
         maxFolderConcurrency = 4;
         progressUpdateIntervalS = -1;
       };
     };
-    folders = {
-      Documents = {
-        id = "wusdj-bfjkr";
-        type = "receiveonly";
-        path = "/vault/syncthing/Documents";
-        devices = [ "panacea" "caravanserai" ];
+    settings = {
+      devices = {
+        panacea.id =
+          "NF4SYEJ-RSGPDEF-CDEYC3A-JWZMKNC-KG4FVQP-CZ5HRFY-XM22BZD-N7B6VAH";
+        caravanserai.id =
+          "MIRF73R-S7AV47R-VLWZUK2-TFCVQPV-FRYCPND-Y4VR3W2-ZAIQXZD-JAEQCAD";
       };
+      folders = {
+        Documents = {
+          id = "wusdj-bfjkr";
+          type = "receiveonly";
+          path = "/vault/syncthing/Documents";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Notes = {
-        id = "kafhz-bfmzm";
-        type = "receiveonly";
-        path = "/vault/syncthing/Notes";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Notes = {
+          id = "kafhz-bfmzm";
+          type = "receiveonly";
+          path = "/vault/syncthing/Notes";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Music = {
-        id = "2aqt7-vpprc";
-        type = "receiveonly";
-        path = "/vault/syncthing/Music";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Music = {
+          id = "2aqt7-vpprc";
+          type = "receiveonly";
+          path = "/vault/syncthing/Music";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Photos = {
-        id = "mjibc-ustcg";
-        type = "receiveonly";
-        path = "/vault/syncthing/Photos";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Photos = {
+          id = "mjibc-ustcg";
+          type = "receiveonly";
+          path = "/vault/syncthing/Photos";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Projects = {
-        id = "cjhmu-avy9v";
-        type = "receiveonly";
-        path = "/vault/syncthing/Projects";
-        devices = [ "panacea" ];
-      };
+        Projects = {
+          id = "cjhmu-avy9v";
+          type = "receiveonly";
+          path = "/vault/syncthing/Projects";
+          devices = [ "panacea" ];
+        };
 
-      Phone = {
-        id = "m2007j20cg_vc7r-photos";
-        type = "receiveonly";
-        path = "/vault/syncthing/Photos/Phone";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Phone = {
+          id = "m2007j20cg_vc7r-photos";
+          type = "receiveonly";
+          path = "/vault/syncthing/Photos/Phone";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Files = {
-        id = "tsk52-u6rbk";
-        type = "receiveonly";
-        path = "/vault/syncthing/Files";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Files = {
+          id = "tsk52-u6rbk";
+          type = "receiveonly";
+          path = "/vault/syncthing/Files";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Phone-screenshots = {
-        id = "pp70r-pbr70";
-        type = "receiveonly";
-        path = "/vault/syncthing/Photos/Phone-screenshots";
-        devices = [ "panacea" "caravanserai" ];
-      };
+        Phone-screenshots = {
+          id = "pp70r-pbr70";
+          type = "receiveonly";
+          path = "/vault/syncthing/Photos/Phone-screenshots";
+          devices = [ "panacea" "caravanserai" ];
+        };
 
-      Audio = {
-        id = "tarrs-5mxck";
-        type = "receiveonly";
-        path = "/vault/syncthing/Audio";
-        devices = [ "panacea" "caravanserai" ];
+        Audio = {
+          id = "tarrs-5mxck";
+          type = "receiveonly";
+          path = "/vault/syncthing/Audio";
+          devices = [ "panacea" "caravanserai" ];
+        };
       };
     };
   };

modules/networking.nix

@@ -29,7 +29,7 @@ in {
     matchConfig.Name = "end0";
     address = [ "192.168.13.2/24" ];
     gateway = [ "192.168.13.1" ];
-    dns = [ "192.168.13.2" ];
+    dns = [ "1.1.1.1" "9.9.9.9" ];
     networkConfig.DNSSEC = "no";
   };
 

modules/webstack.nix

@@ -187,7 +187,10 @@
   # ACME certs configuration
   security.acme = {
     acceptTerms = true;
-    defaults.email = "akasroua@gmail.com";
+    defaults = {
+      email = "akasroua@disroot.org";
+      dnsResolver = "127.0.0.1:53";
+    };
   };
 
   # Generate dhparams