remove most useDHCP=false settings
networking.useDHCP was deprecated, and then later undeprecated: it's safe to keep it defaulted
This commit is contained in:
parent
b254379fb1
commit
58febf51bd
|
@ -27,9 +27,7 @@ in
|
||||||
# view refused packets with: `sudo journalctl -k`
|
# view refused packets with: `sudo journalctl -k`
|
||||||
# networking.firewall.logRefusedPackets = true;
|
# networking.firewall.logRefusedPackets = true;
|
||||||
|
|
||||||
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
|
# these useDHCP lines are legacy from the auto-generated config. might be safe to remove now?
|
||||||
# Per-interface useDHCP will be mandatory in the future, so this generated config
|
|
||||||
# replicates the default behaviour.
|
|
||||||
networking.useDHCP = false;
|
networking.useDHCP = false;
|
||||||
networking.interfaces.eth0.useDHCP = true;
|
networking.interfaces.eth0.useDHCP = true;
|
||||||
# XXX colin: probably don't need this. wlan0 won't be populated unless i touch a value in networking.interfaces.wlan0
|
# XXX colin: probably don't need this. wlan0 won't be populated unless i touch a value in networking.interfaces.wlan0
|
||||||
|
|
|
@ -21,7 +21,6 @@ in
|
||||||
services.xserver.displayManager.gdm.enable = true;
|
services.xserver.displayManager.gdm.enable = true;
|
||||||
|
|
||||||
# gnome does networking stuff with networkmanager
|
# gnome does networking stuff with networkmanager
|
||||||
networking.useDHCP = false;
|
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
networking.wireless.enable = lib.mkForce false;
|
networking.wireless.enable = lib.mkForce false;
|
||||||
};
|
};
|
||||||
|
|
|
@ -74,7 +74,6 @@ in
|
||||||
services.gnome.gnome-online-miners.enable = mkForce false;
|
services.gnome.gnome-online-miners.enable = mkForce false;
|
||||||
|
|
||||||
# XXX: phosh enables networkmanager by default; can probably disable these lines
|
# XXX: phosh enables networkmanager by default; can probably disable these lines
|
||||||
networking.useDHCP = false;
|
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
networking.wireless.enable = lib.mkForce false;
|
networking.wireless.enable = lib.mkForce false;
|
||||||
|
|
||||||
|
|
|
@ -260,7 +260,6 @@ in
|
||||||
# };
|
# };
|
||||||
# sane.persist.sys.byStore.plaintext = [ "/var/lib/alsa" ];
|
# sane.persist.sys.byStore.plaintext = [ "/var/lib/alsa" ];
|
||||||
|
|
||||||
networking.useDHCP = false;
|
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
networking.wireless.enable = lib.mkForce false;
|
networking.wireless.enable = lib.mkForce false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user