ops/nixos: tidy up networking.useDHCP

ops/nixos/clouvider-fra01/default.nix

@@ -102,7 +102,6 @@ in {
       "8.8.8.8"
       "8.8.4.4"
     ];
-    useDHCP = false;
     defaultGateway = {
       address = "193.228.196.56";
       interface = "enp1s0";
@@ -112,7 +111,6 @@ in {
       interface = "enp1s0";
     };
     interfaces.enp1s0 = {
-      useDHCP = false;
       ipv4.addresses = [{ address = "193.228.196.57"; prefixLength = 31; }];
       ipv6.addresses = [{ address = "2a0f:93c0:0:22::2"; prefixLength = 126; }];
     };

ops/nixos/clouvider-lon01/default.nix

@@ -96,7 +96,6 @@ in {
       "8.8.8.8"
       "8.8.4.4"
     ];
-    useDHCP = false;
     defaultGateway = {
       address = "185.198.188.28";
       interface = "br-ext";

ops/nixos/etheroute-lon01/default.nix

@@ -123,7 +123,6 @@ in {
       "8.8.8.8"
       "8.8.4.4"
     ];
-    useDHCP = false;
     defaultGateway = {
       address = "83.97.19.65";
       interface = "eno1";

ops/nixos/frantech-las01/default.nix

@@ -50,7 +50,6 @@ in {
       "8.8.8.8"
       "8.8.4.4"
     ];
-    useDHCP = false;
     defaultGateway = {
       address = "205.185.116.1";
       interface = "ens3";

ops/nixos/frantech-lux01/default.nix

@@ -50,7 +50,6 @@ in {
       "8.8.8.8"
       "8.8.4.4"
     ];
-    useDHCP = false;
     defaultGateway = {
       address = "107.189.4.1";
       interface = "ens3";

ops/nixos/frantech-nyc01/default.nix

@@ -53,7 +53,6 @@ in {
       "8.8.8.8"
       "8.8.4.4"
     ];
-    useDHCP = false;
     defaultGateway = {
       address = "199.195.254.1";
       interface = "ens3";

ops/nixos/howl/default.nix

@@ -77,11 +77,6 @@ in {
   systemd.services.systemd-udev-settle.enable = false;
   systemd.services.NetworkManager-wait-online.enable = false;
 
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  # Use NetworkManager instead.
-  networking.useDHCP = false;
   networking.dhcpcd.enable = false;
   networking.networkmanager.enable = true;
 

ops/nixos/lib/blade.nix

@@ -90,7 +90,6 @@ in {
         "blade.as205479.net"
         "storage.blade.as205479.net"
       ];
-      useDHCP = false;
       bridges = let
         br = interfaces: { interfaces = lib.mkDefault interfaces; rstp = false; };
       in {

ops/nixos/lib/bvm.nix

@@ -55,7 +55,6 @@
         "blade.as205479.net"
       ];
 
-      useDHCP = false;
       defaultGateway = lib.mkDefault {
         address = "10.100.0.1";
         interface = "enp1s0";

ops/nixos/lib/common.nix

@@ -125,6 +125,7 @@ in
       switch-prebuilt
     ];
 
+    networking.useDHCP = false;
     networking.firewall = {
       allowPing = true;
       logRefusedConnections = false;

ops/nixos/porcorosso/default.nix

@@ -110,12 +110,6 @@ in {
   systemd.services.systemd-udev-settle.enable = false;
   systemd.services.NetworkManager-wait-online.enable = false;
 
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  # Use NetworkManager instead.
-  networking.useDHCP = false;
-  networking.interfaces.eno1.useDHCP = false;
   networking.networkmanager.enable = true;
   my.ip.tailscale = "100.125.26.108";
 
@@ -151,11 +145,13 @@ in {
   services.printing.drivers = with depot.pkgs; [ intermec-cups-driver ];
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
+  services.xserver = {
-  services.xserver.layout = "us";
+    enable = true;
-  services.xserver.libinput.enable = true;
+    layout = "us";
-  services.xserver.windowManager.i3.enable = true;
+    libinput.enable = true;
-  services.xserver.videoDrivers = [ "nvidia" ];
+    windowManager.i3.enable = true;
+    videoDrivers = [ "nvidia" ];
+  };
   specialisation.intelGraphics.configuration = {
     my.specialisationName = "intelGraphics";
     services.xserver.videoDrivers = lib.mkForce [ "intel" ];

ops/nixos/swann/default.nix

@@ -47,7 +47,6 @@ in {
     hostName = "swann"; # Define your hostname.
     domain = "int.as205479.net";
     nameservers = ["8.8.8.8" "8.8.4.4"];
-    useDHCP = false;
     interfaces = {
       lo = {
         ipv4.addresses = [

ops/nixos/totoro/default.nix

@@ -86,13 +86,11 @@ in {
     hostName = "totoro"; # Define your hostname.
     domain = "int.as205479.net";
     hostId = "676c08c4";
-    useDHCP = false;
     interfaces.br-ext.useDHCP = true;
     bridges.br-ext.interfaces = [ "enp0s31f6" ];
 
     interfaces.br-int = {
       virtual = true;
-      useDHCP = false;
       ipv4.addresses = [{ address = "10.0.0.2"; prefixLength = 24; }];
     };
     bridges.br-int.interfaces = [];