about summary refs log tree commit diff
path: root/machines/aszlig/managed
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2019-10-08 22:34:06 +0200
committeraszlig <aszlig@nix.build>2019-10-08 22:34:06 +0200
commit77ecf74d6e63ac3fbd85c4e203e12d07bb23fbeb (patch)
tree60738ecf7bf9c2066cf5fb544ccbe1b9a865646f /machines/aszlig/managed
parentf0a0318b99232c25f9ef782c53db724f66127135 (diff)
machines/aszlig: Explicitly set useDHCP
The usage of DHCP is no longer global since a while[1] and we now have
to explicitly enable it for the interfaces in question.

This actually is a good thing and makes it far less problematic if we
use tunnel interfaces and other more complicated networking
configuration.

I added the definitions for all machines where I actually know which
interfaces are in use and disabled useNetworkd for shakti, because I
don't know the interface names for that machine and the machine
currently isn't in use anyway, so we can add it later if needed.

[1]: https://github.com/NixOS/nixpkgs/pull/69302

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'machines/aszlig/managed')
-rw-r--r--machines/aszlig/managed/shakti.nix1
-rw-r--r--machines/aszlig/managed/tyree.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/machines/aszlig/managed/shakti.nix b/machines/aszlig/managed/shakti.nix
index 449bbe3c..330d644c 100644
--- a/machines/aszlig/managed/shakti.nix
+++ b/machines/aszlig/managed/shakti.nix
@@ -58,7 +58,6 @@
   };
 
   networking.hostName = "shakti";
-  networking.useNetworkd = true;
 
   hardware.cpu.amd.updateMicrocode = true;
 
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index 3768f11c..9296d773 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -48,6 +48,8 @@
 
   networking.hostName = "tyree";
   networking.useNetworkd = true;
+  networking.useDHCP = false;
+  networking.interfaces.wlan0.useDHCP = true;
 
   hardware.cpu.intel.updateMicrocode = true;