From 63adb41f1a060c21a68143eb9e86c2790ef66f36 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 8 Aug 2024 10:45:09 +0200
Subject: ...

---
 hosts/vidhar/network/bifrost/default.nix | 46 ++++++++++++--------------------
 hosts/vidhar/network/default.nix         | 31 +++++++++++----------
 2 files changed, 32 insertions(+), 45 deletions(-)

(limited to 'hosts/vidhar/network')

diff --git a/hosts/vidhar/network/bifrost/default.nix b/hosts/vidhar/network/bifrost/default.nix
index ec354f81..59550481 100644
--- a/hosts/vidhar/network/bifrost/default.nix
+++ b/hosts/vidhar/network/bifrost/default.nix
@@ -18,12 +18,10 @@ in {
             ListenPort = 51822;
           };
           wireguardPeers = [
-            { wireguardPeerConfig = {
-                AllowedIPs = [ "::/0" ];
-                PublicKey = trim (readFile ../../../surtr/bifrost/surtr.pub);
-                PersistentKeepalive = 5;
-                Endpoint = "2a03:4000:52:ada:::51822";
-              };
+            { AllowedIPs = [ "::/0" ];
+              PublicKey = trim (readFile ../../../surtr/bifrost/surtr.pub);
+              PersistentKeepalive = 5;
+              Endpoint = "2a03:4000:52:ada:::51822";
             }
           ];
         };
@@ -36,35 +34,25 @@ in {
           };
           address = ["2a03:4000:52:ada:4:1::/96"];
           routes = [
-            { routeConfig = {
-                Destination = "2a03:4000:52:ada:4::/80";
-              };
+            { Destination = "2a03:4000:52:ada:4::/80";
             }
-            { routeConfig = {
-                Gateway = "2a03:4000:52:ada:4::";
-                GatewayOnLink = true;
-                Table = "bifrost";
-              };
+            { Gateway = "2a03:4000:52:ada:4::";
+              GatewayOnLink = true;
+              Table = "bifrost";
             }
-            { routeConfig = {
-                Destination = "2a03:4000:52:ada:4::/80";
-                GatewayOnLink = true;
-                Table = "bifrost";
-              };
+            { Destination = "2a03:4000:52:ada:4::/80";
+              GatewayOnLink = true;
+              Table = "bifrost";
             }
-            { routeConfig = {
-                Destination = "2a03:4000:52:ada:4:1::/96";
-                GatewayOnLink = true;
-                Table = "bifrost";
-              };
+            { Destination = "2a03:4000:52:ada:4:1::/96";
+              GatewayOnLink = true;
+              Table = "bifrost";
             }
           ];
           routingPolicyRules = [
-            { routingPolicyRuleConfig = {
-                Table = "bifrost";
-                From = "2a03:4000:52:ada:4:1::/96";
-                Priority = 1;
-              };
+            { Table = "bifrost";
+              From = "2a03:4000:52:ada:4:1::/96";
+              Priority = 1;
             }
           ];
           linkConfig = {
diff --git a/hosts/vidhar/network/default.nix b/hosts/vidhar/network/default.nix
index e961c17e..4a792851 100644
--- a/hosts/vidhar/network/default.nix
+++ b/hosts/vidhar/network/default.nix
@@ -89,22 +89,21 @@ with lib;
       };
     };
 
-    services.nfs.server = {
-      enable = true;
-      createMountPoints = true;
-
-      statdPort = 4000;
-      lockdPort = 4001;
-      mountdPort = 4002;
-
-      extraNfsdConfig = ''
-        vers3=off
-      '';
-
-      exports = ''
-        /srv/nfs 10.141.0.0/24(ro,async,root_squash,fsid=0) 2a03:4000:52:ada:1::/80(ro,async,root_squash,fsid=0)
-        /srv/nfs/nix-store 10.141.0.0/24(ro,async,root_squash) 2a03:4000:52:ada:1::/80(ro,async,root_squash)
-      '';
+    services.nfs = {
+      server = {
+        enable = true;
+        createMountPoints = true;
+
+        statdPort = 4000;
+        lockdPort = 4001;
+        mountdPort = 4002;
+
+        exports = ''
+          /srv/nfs 10.141.0.0/24(ro,async,root_squash,fsid=0) 2a03:4000:52:ada:1::/80(ro,async,root_squash,fsid=0)
+          /srv/nfs/nix-store 10.141.0.0/24(ro,async,root_squash) 2a03:4000:52:ada:1::/80(ro,async,root_squash)
+        '';
+      };
+      settings.nfsd.vers3 = false;
     };
 
     fileSystems = {
-- 
cgit v1.2.3