major: grand unified clusterfck (ekman not tested yet)

2025-09-12 13:12:36 +02:00
parent e0846164a7 ba5f1b8add
commit 5c72112457
97 changed files with 3704 additions and 8 deletions
--- a/rossby/login/default.nix
+++ b/rossby/login/default.nix
@@ -113,10 +113,17 @@ in
    networking = {
      useDHCP = false;
      hostName = name;
+<<<<<<<< HEAD:rossby/login/default.nix
      interfaces.enp129s0f0 = {
        useDHCP = false;
        ipv4.addresses = [ {
          inherit address;
+========
+      interfaces.enp33s0f3np3 = {
+        useDHCP = false;
+        ipv4.addresses = [ {
+          address = address;
+>>>>>>>> ekman:ekman/login/default.nix
          prefixLength = 24;
        } ];
        # ipv4.routes = [