From bc67f3bb0f2423829711f89aa2087acf08c9819c Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 22 Jun 2017 01:24:47 +0200 Subject: devhell: Merge network expressions into machines Those definitions are machine-specific, so IMHO it doesn't make sense to abstract those options because in the end they're bound to a specific machine nonetheless and won't be re-used. If one day it's necessary to re-use these definitions it still can be done very easily. Signed-off-by: aszlig Cc: @devhell --- machines/devhell/eris.nix | 3 +++ machines/devhell/skunkworks.nix | 4 ++++ machines/devhell/titan.nix | 6 ++++++ 3 files changed, 13 insertions(+) (limited to 'machines') diff --git a/machines/devhell/eris.nix b/machines/devhell/eris.nix index 2aa83b9f..cce2d6b0 100644 --- a/machines/devhell/eris.nix +++ b/machines/devhell/eris.nix @@ -31,6 +31,9 @@ }; }; + networking.hostName = "eris"; + networking.networkmanager.enable = true; + fileSystems."/" = { device = "/dev/disk/by-uuid/4788e218-db0f-4fd6-916e-e0c484906eb0"; fsType = "btrfs"; diff --git a/machines/devhell/skunkworks.nix b/machines/devhell/skunkworks.nix index 04ef71e8..91ed886b 100644 --- a/machines/devhell/skunkworks.nix +++ b/machines/devhell/skunkworks.nix @@ -62,6 +62,10 @@ { device = "/dev/disk/by-uuid/3f1835a8-5587-4963-9b6c-66ecb36059de"; } ]; + networking.hostName = "skunkworks"; + networking.wireless.enable = false; + networking.useNetworkd = true; + nix.maxJobs = 8; i18n = { diff --git a/machines/devhell/titan.nix b/machines/devhell/titan.nix index 605fc714..abc640da 100644 --- a/machines/devhell/titan.nix +++ b/machines/devhell/titan.nix @@ -47,6 +47,12 @@ { device = "/dev/disk/by-uuid/fecde631-8661-4a0e-88e6-5ce5b551847a"; } ]; + networking.hostName = "titan"; + networking.wireless.enable = true; + networking.connman.enable = true; + networking.wicd.enable = false; + networking.networkmanager.enable = false; + nix = { maxJobs = 4; extraOptions = '' -- cgit 1.4.1