diff --git a/flake.nix b/flake.nix index 7752cf8..c6f89d7 100644 --- a/flake.nix +++ b/flake.nix @@ -113,6 +113,23 @@ extraModules = [ ./hardware/dell-wyse-3040.nix dump-dvb.nixosModules.disk-module + { + + networking = nixpkgs.lib.mkForce { + useDHCP = false; + defaultGateway = "141.30.30.129"; + nameservers = [ "141.30.1.1" ]; + interfaces.enp1s0 = { + useDHCP = false; + ipv4.addresses = [ + { + address = "141.30.30.149"; + prefixLength = 25; + } + ]; + }; + }; + } ]; } ]; diff --git a/hardware/dell-wyse-3040.nix b/hardware/dell-wyse-3040.nix index 3ee9030..fbd5028 100644 --- a/hardware/dell-wyse-3040.nix +++ b/hardware/dell-wyse-3040.nix @@ -5,22 +5,9 @@ # Per-interface useDHCP will be mandatory in the future, so this generated config # replicates the default behaviour. - networking = if config.dump-dvb.systemNumber != 4 then { + networking = { interfaces.enp1s0.useDHCP = true; - useDHCP = false; - } else { - useDHCP = false; - defaultGateway = "141.30.30.129"; - nameservers = [ "141.30.1.1" ]; - interfaces.enp1s0 = { - useDHCP = false; - ipv4.addresses = [ - { - address = "141.30.30.149"; - prefixLength = 25; - } - ]; - }; + useDHCP = true; }; boot.tmpOnTmpfsSize = "25%";