Fixing all warnings

modules/common/default.nix

@@ -16,21 +16,21 @@
     # Unstable
     (final: prev: {
       unstable = import nixpkgs-unstable {
-        system = prev.system;
+        system = final.stdenv.hostPlatform.system;
       };
     })
 
     # Stable
     (final: prev: {
       stable = import nixpkgs-stable {
-        system = prev.system;
+        system = final.stdenv.hostPlatform.system;
       };
     })
 
     # Pins
     (final: prev: {
       pin = {
-        factorio = import pin-factorio { system = prev.system; config.allowUnfree = true; };
+        factorio = import pin-factorio { system = final.stdenv.hostPlatform.system; config.allowUnfree = true; };
       };
     })
   ];

modules/desktop/gaming/default.nix

@@ -23,7 +23,7 @@
   programs.gamemode.enable = true;
 
   environment.systemPackages = with pkgs; [
-    wineWowPackages.waylandFull
+    wineWow64Packages.waylandFull
     mangohud
     protonup-ng
   ];

modules/desktop/networking.nix

@@ -20,18 +20,20 @@
 
   services.resolved = {
     enable = false;
-    dnssec = "true";
-    domains = [ "~." ];
-    fallbackDns = [
-      "9.9.9.9"
-      "149.112.112.112"
-      "1.1.1.1"
-      "1.0.0.1"
-      "2620:fe::fe"
-      "2620:fe::9"
-    ];
-    settings.Resolve = {
-      DNSOverTLS = true;
+    settings = {
+      Resolve = {
+        DNSOverTLS = true;
+        DNSSEC = true;
+        Domains = [ "~." ];
+        FallbackDns = [
+          "9.9.9.9"
+          "149.112.112.112"
+          "1.1.1.1"
+          "1.0.0.1"
+          "2620:fe::fe"
+          "2620:fe::9"
+        ];
+      };
     };
   };
 

modules/server/baba/default.nix

@@ -7,7 +7,7 @@
 
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud32;
+    package = pkgs.nextcloud33;
     hostName = "cloud.lyes.eu";
     https = true;
     configureRedis = true;
@@ -15,7 +15,8 @@
 
     extraAppsEnable = true;
     extraApps = {
-      inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks news dav_push repod gpoddersync phonetrack music;
+      inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks dav_push repod gpoddersync phonetrack music;
+      # inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks news dav_push repod gpoddersync phonetrack music;
       # gpoddersync = pkgs.fetchNextcloudApp {
       #   hash = "sha256-EQVs1fe0ierjqFZ5+KVc1Yj67zrwjLBAzY5A+QsC7AU=";
       #   url = "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2r/gpoddersync.tar.gz";

modules/server/lanayru/default.nix

@@ -42,6 +42,8 @@
     };
   };
 
+  networking.vpn-netns.encapsulatedServices.suwayomi-server.enable = true;
+
   age.secrets = {
     suwayomi-pass = {
       file = ../../../secrets/zora/services/lanayru-pass.age;

modules/server/link/client.nix

@@ -2,12 +2,13 @@
 
 {
   services.kanidm = {
-    package = pkgs.kanidmWithSecretProvisioning_1_8;
+    package = pkgs.kanidmWithSecretProvisioning_1_9;
 
-    enableClient = true;
-
-    clientSettings = {
-      uri = "https://auth.lyes.eu";
+    client = {
+      enable = true;
+      settings = {
+        uri = "https://auth.lyes.eu";
+      };
     };
   };
 }

modules/server/link/default.nix

@@ -13,19 +13,21 @@ in
   services.kanidm = {
     # package = pkgs.kanidmWithSecretProvisioning_1_7;
 
-    enableServer = true;
-    serverSettings = {
-      bindaddress = "127.0.0.1:${port}";
-      ldapbindaddress = "0.0.0.0:636";
-      domain = hostname;
-      origin = "https://${hostname}";
-      tls_chain = "/var/lib/acme/${hostname}/cert.pem";
-      tls_key = "/var/lib/acme/${hostname}/key.pem";
+    server = {
+      enable = true;
+      settings = {
+        bindaddress = "127.0.0.1:${port}";
+        ldapbindaddress = "0.0.0.0:636";
+        domain = hostname;
+        origin = "https://${hostname}";
+        tls_chain = "/var/lib/acme/${hostname}/cert.pem";
+        tls_key = "/var/lib/acme/${hostname}/key.pem";
 
-      online_backup = {
-        path = "/var/data/backups/kanidm";
-        schedule = "00 06 * * *";
-        versions = 5;
+        online_backup = {
+          path = "/var/data/backups/kanidm";
+          schedule = "00 06 * * *";
+          versions = 5;
+        };
       };
     };
 

modules/server/mogma/forwarding.nix

@@ -32,6 +32,8 @@ let
   } forwardedServices;
 
   serviceList = lib.mapAttrsToList (name: _: name + ".service") forwardedServices;
+  encServicesList = lib.mapAttrsToList (name: _: name + ".service") cfg.encapsulatedServices;
+
 in
 lib.mkIf (forwardedServices != { } && cfg.portForwarding.enable) {
   assertions = [
@@ -49,8 +51,8 @@ lib.mkIf (forwardedServices != { } && cfg.portForwarding.enable) {
     services.natpmpc-lease = {
       description = "Request VPN port forwarding leases.";
 
-      wantedBy = serviceList;
-      after = [ "wireguard.target" ];
+      # wantedBy = serviceList;
+      after = [ "wireguard.target" ] ++ encServicesList;
       wants = [ "wireguard.target" ];
 
       # preStart = "sleep 3";