From e421b3e1543ea63c7ce530332c3371d7a70d03b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 3 Jun 2024 11:03:57 +0200
Subject: nixos: fix deprecated warnings

---
 nixos/configurations/binky.nix |  2 +-
 nixos/modules/wireguad.nix     | 66 +++++++++++++++++-------------------------
 2 files changed, 27 insertions(+), 41 deletions(-)

(limited to 'nixos')

diff --git a/nixos/configurations/binky.nix b/nixos/configurations/binky.nix
index 6dfb6a5..4b552d5 100644
--- a/nixos/configurations/binky.nix
+++ b/nixos/configurations/binky.nix
@@ -75,7 +75,7 @@ in {
           DHCP = "yes";
           IPv6AcceptRA = "yes";
         };
-        routes = [{routeConfig.Metric = 1088;}];
+        routes = [{Metric = 1088;}];
         linkConfig.RequiredForOnline = "routable";
       };
     };
diff --git a/nixos/modules/wireguad.nix b/nixos/modules/wireguad.nix
index eb25a6e..69e1ccd 100644
--- a/nixos/modules/wireguad.nix
+++ b/nixos/modules/wireguad.nix
@@ -29,27 +29,21 @@ in {
         };
         wireguardPeers =
           [
-            {
-              wireguardPeerConfig =
-                {
-                  Endpoint = "cynerd.cz:51820";
-                  AllowedIPs = ["0.0.0.0/0"];
-                  PublicKey = config.secrets.wireguardPubs.lipwig;
-                }
-                // (optionalAttrs (!is_endpoint) {PersistentKeepalive = 25;});
-            }
-            {
-              wireguardPeerConfig =
-                {
-                  Endpoint = "spt.cynerd.cz:51820";
-                  AllowedIPs = [
-                    "${config.cynerd.hosts.wg.spt-omnia}/32"
-                    "10.8.2.0/24"
-                  ];
-                  PublicKey = config.secrets.wireguardPubs.spt-omnia;
-                }
-                // (optionalAttrs (!is_endpoint) {PersistentKeepalive = 25;});
-            }
+            ({
+                Endpoint = "cynerd.cz:51820";
+                AllowedIPs = ["0.0.0.0/0"];
+                PublicKey = config.secrets.wireguardPubs.lipwig;
+              }
+              // (optionalAttrs (!is_endpoint) {PersistentKeepalive = 25;}))
+            ({
+                Endpoint = "spt.cynerd.cz:51820";
+                AllowedIPs = [
+                  "${config.cynerd.hosts.wg.spt-omnia}/32"
+                  "10.8.2.0/24"
+                ];
+                PublicKey = config.secrets.wireguardPubs.spt-omnia;
+              }
+              // (optionalAttrs (!is_endpoint) {PersistentKeepalive = 25;}))
             #{
             #  wireguardPeerConfig =
             #    {
@@ -64,10 +58,8 @@ in {
             #}
           ]
           ++ (optionals is_endpoint (mapAttrsToList (n: v: {
-            wireguardPeerConfig = {
-              AllowedIPs = "${config.cynerd.hosts.wg."${n}"}/32";
-              PublicKey = v;
-            };
+            AllowedIPs = "${config.cynerd.hosts.wg."${n}"}/32";
+            PublicKey = v;
           }) (filterAttrs (n: _: all (v: v != n) endpoints) config.secrets.wireguardPubs)));
       };
       networks."wg" = {
@@ -82,27 +74,21 @@ in {
         routes =
           (optional (hostName != "lipwig") {
             # OpenVPN network
-            routeConfig = {
-              Gateway = config.cynerd.hosts.wg.lipwig;
-              Destination = "10.8.0.0/24";
-              Metric = 2048;
-            };
+            Gateway = config.cynerd.hosts.wg.lipwig;
+            Destination = "10.8.0.0/24";
+            Metric = 2048;
           })
           ++ (optional (hostName != "spt-omnia") {
             # SPT network
-            routeConfig = {
-              Gateway = config.cynerd.hosts.wg.spt-omnia;
-              Destination = "10.8.2.0/24";
-              Metric = 2048;
-            };
+            Gateway = config.cynerd.hosts.wg.spt-omnia;
+            Destination = "10.8.2.0/24";
+            Metric = 2048;
           })
           ++ (optional (hostName != "adm-omnia" && hostName != "lipwig") {
             # Adamkovi network
-            routeConfig = {
-              Gateway = config.cynerd.hosts.wg.adm-omnia;
-              Destination = "10.8.3.0/24";
-              Metric = 2048;
-            };
+            Gateway = config.cynerd.hosts.wg.adm-omnia;
+            Destination = "10.8.3.0/24";
+            Metric = 2048;
           });
       };
     };
-- 
cgit v1.2.3