lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

ops/nixos: tidy up networking.useDHCP

Browse source
This commit is contained in:
Luke Granger-Brown 2022-01-08 21:45:18 +00:00
parent f463055acf
commit ad95bffd3d
13 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ops/nixos/clouvider-fra01/default.nix
View file

@ -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; }];
};

1
ops/nixos/clouvider-lon01/default.nix
View file

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

1
ops/nixos/etheroute-lon01/default.nix
View file

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

1
ops/nixos/frantech-las01/default.nix
View file

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

1
ops/nixos/frantech-lux01/default.nix
View file

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

1
ops/nixos/frantech-nyc01/default.nix
View file

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

5
ops/nixos/howl/default.nix
View file

@ -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;

1
ops/nixos/lib/blade.nix
View file

@ -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 {

1
ops/nixos/lib/bvm.nix
View file

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

1
ops/nixos/lib/common.nix
View file

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

18
ops/nixos/porcorosso/default.nix
View file

@ -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.layout = "us";
services.xserver.libinput.enable = true;
services.xserver.windowManager.i3.enable = true;
services.xserver.videoDrivers = [ "nvidia" ];
services.xserver = {
enable = true;
layout = "us";
libinput.enable = true;
windowManager.i3.enable = true;
videoDrivers = [ "nvidia" ];
};
specialisation.intelGraphics.configuration = {
my.specialisationName = "intelGraphics";
services.xserver.videoDrivers = lib.mkForce [ "intel" ];

1
ops/nixos/swann/default.nix
View file

@ -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 = [

2
ops/nixos/totoro/default.nix
View file

@ -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 = [];