From 2d4ae81cdf5da17e22a6edb50cf3b047200eba8e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 29 Apr 2025 15:34:35 +0200
Subject: ...

---
 hosts/vidhar/network/default.nix      | 9 ++++++++-
 hosts/vidhar/network/dhcp/default.nix | 5 +++--
 system-profiles/nfsroot.nix           | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/hosts/vidhar/network/default.nix b/hosts/vidhar/network/default.nix
index 0643f0bb..92d755f3 100644
--- a/hosts/vidhar/network/default.nix
+++ b/hosts/vidhar/network/default.nix
@@ -103,7 +103,14 @@ with lib;
           /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;
+      settings.nfsd = {
+        rdma = true;
+        vers3 = false;
+        vers4 = true;
+        "vers4.0" = false;
+        "vers4.1" = false;
+        "vers4.2" = true;
+      };
     };
 
     fileSystems = {
diff --git a/hosts/vidhar/network/dhcp/default.nix b/hosts/vidhar/network/dhcp/default.nix
index f36d0c7f..098d3061 100644
--- a/hosts/vidhar/network/dhcp/default.nix
+++ b/hosts/vidhar/network/dhcp/default.nix
@@ -5,6 +5,7 @@ with lib;
 let
   nfsrootBaseUrl = "http://nfsroot.vidhar.yggdrasil";
   tftpIp = "10.141.0.1";
+  nfsIp = tftpIp;
   ipxe = pkgs.ipxe.override {
     additionalTargets = {
       "bin-i386-efi/ipxe.efi" = "i386-ipxe.efi";
@@ -309,7 +310,7 @@ in {
                     installerBuild = (flake.nixosConfigurations.${"installer-${system}-nfsroot"}.extendModules {
                       modules = [
                         ({ ... }: {
-                          config.nfsroot.storeDevice = "${tftpIp}:nix-store";
+                          config.nfsroot.storeDevice = "${nfsIp}:nix-store";
                           config.nfsroot.registrationUrl = "${nfsrootBaseUrl}/installer-${system}/registration";
                         })
                       ];
@@ -369,7 +370,7 @@ in {
                  eostreBuild = (flake.nixosConfigurations.eostre.extendModules {
                    modules = [
                      ({ ... }: {
-                       config.nfsroot.storeDevice = "${tftpIp}:nix-store";
+                       config.nfsroot.storeDevice = "${nfsIp}:nix-store";
                        config.nfsroot.registrationUrl = "${nfsrootBaseUrl}/eostre/registration";
                      })
                    ];
diff --git a/system-profiles/nfsroot.nix b/system-profiles/nfsroot.nix
index 1cd930d9..b0116d61 100644
--- a/system-profiles/nfsroot.nix
+++ b/system-profiles/nfsroot.nix
@@ -48,7 +48,7 @@ in {
       fileSystems."/nix/.ro-store" = mkImageMediaOverride
         { fsType = "nfs4";
           device = cfg.storeDevice;
-          options = [ "ro" ];
+          options = [ "ro" "nfsvers=4.2" ];
           neededForBoot = true;
         };
 
-- 
cgit v1.2.3