machines/mimir/configuration.nix

@@ -146,7 +146,7 @@
 
   # Use the systemd-boot EFI boot loader.
   boot = {
-    kernelPackages = pkgs.linuxPackages_6_10;
+    kernelPackages = pkgs.linuxPackages_latest;
     initrd = {
       availableKernelModules = [
         "nvme"
@@ -163,6 +163,7 @@
       "apple-mfi-fastcharge"
       "zenpower"
     ];
+    kernelParams = [ "nvidia_drm.fbdev=1" ];
     extraModulePackages = with config.boot.kernelPackages; [
       zenpower
       cpupower
@@ -260,85 +261,76 @@
     };
   };
 
-  systemd = {
+  systemd.network = {
-    network = {
+    enable = true;
-      enable = true;
 
-      # wait-online.extraArgs = [ "--interface=enp4s0" ];
+    # wait-online.extraArgs = [ "--interface=enp4s0" ];
-      wait-online.anyInterface = true;
+    wait-online.anyInterface = true;
 
-      links = {
+    links = {
-        "40-enp4s0" = {
+      "40-enp4s0" = {
-          matchConfig = {
+        matchConfig = {
-            Name = "enp4s0";
+          Name = "enp4s0";
-          };
-          linkConfig = {
-            WakeOnLan = "magic";
-          };
         };
-      };
+        linkConfig = {
-
+          WakeOnLan = "magic";
-      netdevs = {
-        "10-microvm" = {
-          netdevConfig = {
-            Kind = "bridge";
-            Name = "microvm";
-          };
-        };
-      };
-
-      networks = {
-        "40-enp4s0" = {
-          enable = true;
-          DHCP = "yes";
-
-          domains = [
-            "internal.horus.nu"
-            "bedum.horus.nu"
-          ];
-
-          dhcpV4Config = {
-            RouteMetric = 64;
-          };
-
-          matchConfig = {
-            Name = "enp4s0";
-          };
-        };
-
-        "40-enp5s0f1" = {
-          enable = true;
-          linkConfig = {
-            RequiredForOnline = "no";
-          };
-          matchConfig = {
-            Name = "enp5s0f1";
-          };
-        };
-
-        "10-microvm" = {
-          matchConfig = {
-            Name = "microvm";
-          };
-
-          addresses = [ { Address = "172.16.0.1/24"; } ];
-        };
-
-        "11-microvm" = {
-          matchConfig = {
-            Name = "vm-*";
-          };
-          networkConfig = {
-            Bridge = "microvm";
-          };
         };
       };
     };
 
-    services = {
+    netdevs = {
-      ollama = {
+      "10-microvm" = {
-        after = [ "tailscaled.service" ];
+        netdevConfig = {
-        preStart = "${pkgs.coreutils}/bin/sleep 10"; # Tailscale reports ready before getting an IP address
+          Kind = "bridge";
+          Name = "microvm";
+        };
+      };
+    };
+
+    networks = {
+      "40-enp4s0" = {
+        enable = true;
+        DHCP = "yes";
+
+        domains = [
+          "internal.horus.nu"
+          "bedum.horus.nu"
+        ];
+
+        dhcpV4Config = {
+          RouteMetric = 64;
+        };
+
+        matchConfig = {
+          Name = "enp4s0";
+        };
+      };
+
+      "40-enp5s0f1" = {
+        enable = true;
+        linkConfig = {
+          RequiredForOnline = "no";
+        };
+        matchConfig = {
+          Name = "enp5s0f1";
+        };
+      };
+
+      "10-microvm" = {
+        matchConfig = {
+          Name = "microvm";
+        };
+
+        addresses = [ { Address = "172.16.0.1/24"; } ];
+      };
+
+      "11-microvm" = {
+        matchConfig = {
+          Name = "vm-*";
+        };
+        networkConfig = {
+          Bridge = "microvm";
+        };
       };
     };
   };
@@ -484,8 +476,6 @@
 
     sessionVariables = {
       WLR_NO_HARDWARE_CURSORS = "1";
-      GBM_BACKEND = "nvidia-drm";
-      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
     };
   };
 

users/erwin/work.nix

@@ -169,7 +169,7 @@ in
           };
         };
         services = {
-          kanshi.enable = false;
+          kanshi.enable = true;
           xbanish.enable = false;
           wayvnc = {
             enable = true;