From 28817ddac9d4caf2aba09c933317812aee908222 Mon Sep 17 00:00:00 2001
From: emily <ek@kyouma.net>
Date: Wed, 12 Jun 2024 17:06:23 +0200
Subject: [PATCH] Fix deprecated networkd and forgejo settings

---
 config/common/networking.nix           | 1 +
 config/hosts/emilia/configuration.nix  | 8 ++++----
 config/hosts/integra/configuration.nix | 5 +----
 config/hosts/ns-nbg/configuration.nix  | 6 +++---
 config/profiles/kartoffel.nix          | 2 +-
 config/profiles/lxc.nix                | 1 -
 config/services/forgejo.nix            | 2 +-
 7 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/config/common/networking.nix b/config/common/networking.nix
index 575776c..c63063e 100644
--- a/config/common/networking.nix
+++ b/config/common/networking.nix
@@ -2,6 +2,7 @@
   networking = {
     domain = mkDefault "kyouma.net";
     dhcpcd.enable = false;
+    useDHCP = false;
     nftables.enable = mkDefault true;
     firewall.logRefusedConnections = mkDefault false;
   };
diff --git a/config/hosts/emilia/configuration.nix b/config/hosts/emilia/configuration.nix
index 0f49a4f..d6f52fd 100644
--- a/config/hosts/emilia/configuration.nix
+++ b/config/hosts/emilia/configuration.nix
@@ -24,12 +24,12 @@
       IPv6AcceptRA = false;
     };
     addresses = [
-      { addressConfig.Address = "95.217.83.107/26"; }
-      { addressConfig.Address = "2a01:4f9:4a:1f5f::1/64"; }
+      { Address = "95.217.83.107/26"; }
+      { Address = "2a01:4f9:4a:1f5f::1/64"; }
     ];
     routes = [
-      { routeConfig.Gateway = "95.217.83.65"; }
-      { routeConfig.Gateway = "fe80::1"; }
+      { Gateway = "95.217.83.65"; }
+      { Gateway = "fe80::1"; }
     ];
   };
 
diff --git a/config/hosts/integra/configuration.nix b/config/hosts/integra/configuration.nix
index 5d42029..63a8f1a 100644
--- a/config/hosts/integra/configuration.nix
+++ b/config/hosts/integra/configuration.nix
@@ -14,10 +14,7 @@
 
   kyouma.machine-type.physical = true;
 
-  networking = {
-    hostName = "integra";
-    useDHCP = false;
-  };
+  networking.hostName = "integra";
 
   systemd.network.networks."98-eth-default" = {
     matchConfig.Type = "ether";
diff --git a/config/hosts/ns-nbg/configuration.nix b/config/hosts/ns-nbg/configuration.nix
index 094f0a0..af51a9d 100644
--- a/config/hosts/ns-nbg/configuration.nix
+++ b/config/hosts/ns-nbg/configuration.nix
@@ -6,7 +6,7 @@
   ];
   kyouma.machine-type.physical = false;
 
-  systemd.network.networks."98-eth-static" = {
+  systemd.network.networks."98-eth-default" = {
     matchConfig.Type = "ether";
     matchConfig.Name = "e*";
     linkConfig.RequiredForOnline = "routable";
@@ -20,8 +20,8 @@
       "185.244.193.190/22"
     ];
     routes = [
-      { routeConfig.Gateway = "fe80::1"; }
-      { routeConfig.Gateway = "185.244.192.1"; }
+      { Gateway = "fe80::1"; }
+      { Gateway = "185.244.192.1"; }
     ];
   };
   services.powerdns = {
diff --git a/config/profiles/kartoffel.nix b/config/profiles/kartoffel.nix
index 7efd229..b587a86 100644
--- a/config/profiles/kartoffel.nix
+++ b/config/profiles/kartoffel.nix
@@ -14,7 +14,7 @@
       IPv6AcceptRA = false;
     };
     routes = [
-      { routeConfig.Gateway = "fe80::1"; }
+      { Gateway = "fe80::1"; }
     ];
   };
 }
diff --git a/config/profiles/lxc.nix b/config/profiles/lxc.nix
index 006d34a..2393b9f 100644
--- a/config/profiles/lxc.nix
+++ b/config/profiles/lxc.nix
@@ -14,6 +14,5 @@
     };
   };
 
-  networking.useDHCP = false;
   networking.useHostResolvConf = false;
 }
diff --git a/config/services/forgejo.nix b/config/services/forgejo.nix
index e2c5d12..d431bec 100644
--- a/config/services/forgejo.nix
+++ b/config/services/forgejo.nix
@@ -5,7 +5,7 @@
   };
   services.forgejo = {
     enable = true;
-    mailerPasswordFile = config.sops.secrets."services/forgejo/mailerPassword".path;
+    secrets.mailer.PASSWD = config.sops.secrets."services/forgejo/mailerPassword".path;
     database = {
       createDatabase = true;
       type = "postgres";