From bc67f3bb0f2423829711f89aa2087acf08c9819c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
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 <aszlig@redmoonstudios.org>
Cc: @devhell
---
 devhell/network/network_eris.nix       |  8 --------
 devhell/network/network_skunkworks.nix |  9 ---------
 devhell/network/network_titan.nix      | 11 -----------
 machines/devhell/eris.nix              |  3 +++
 machines/devhell/skunkworks.nix        |  4 ++++
 machines/devhell/titan.nix             |  6 ++++++
 6 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 devhell/network/network_eris.nix
 delete mode 100644 devhell/network/network_skunkworks.nix
 delete mode 100644 devhell/network/network_titan.nix

diff --git a/devhell/network/network_eris.nix b/devhell/network/network_eris.nix
deleted file mode 100644
index e55f319f..00000000
--- a/devhell/network/network_eris.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [ ./network_common.nix ];
-
-  networking.hostName = "eris";
-  networking.networkmanager.enable = true;
-}
diff --git a/devhell/network/network_skunkworks.nix b/devhell/network/network_skunkworks.nix
deleted file mode 100644
index fe943e1d..00000000
--- a/devhell/network/network_skunkworks.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [ ./network_common.nix ];
-
-  networking.hostName = "skunkworks";
-  networking.wireless.enable = false;
-  networking.useNetworkd = true;
-}
diff --git a/devhell/network/network_titan.nix b/devhell/network/network_titan.nix
deleted file mode 100644
index 06b34dcd..00000000
--- a/devhell/network/network_titan.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [ ./network_common.nix ];
-
-  networking.hostName = "titan";
-  networking.wireless.enable = true;
-  networking.connman.enable = true;
-  networking.wicd.enable = false;
-  networking.networkmanager.enable = false;
-}
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