tv config: split stuff into fs and hw

5 files changed, 8 insertions, 17 deletions

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index d2b08bef7..69f1300be 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -24,8 +24,8 @@ with lib;
   };
 
   imports = [
-    ../2configs/CAC-Developer-2.nix
-    ../2configs/CAC-CentOS-7-64bit.nix
+    ../2configs/hw/CAC-Developer-2.nix
+    ../2configs/fs/CAC-CentOS-7-64bit.nix
     ../2configs/base.nix
     #../2configs/consul-server.nix
     ../2configs/exim-smarthost.nix
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
index f0c7dc2a0..305ea7269 100644
--- a/tv/1systems/mkdir.nix
+++ b/tv/1systems/mkdir.nix
@@ -37,8 +37,8 @@ in
   };
 
   imports = [
-    ../2configs/CAC-Developer-1.nix
-    ../2configs/CAC-CentOS-7-64bit.nix
+    ../2configs/hw/CAC-Developer-1.nix
+    ../2configs/fs/CAC-CentOS-7-64bit.nix
     ../2configs/base.nix
     ../2configs/consul-server.nix
     ../2configs/exim-smarthost.nix
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 210846215..61f833d41 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -24,7 +24,7 @@ with lib;
   };
 
   imports = [
-    ../2configs/AO753.nix
+    ../2configs/hw/AO753.nix
     ../2configs/base.nix
     #../2configs/consul-server.nix
     ../2configs/git.nix
@@ -87,13 +87,6 @@ with lib;
 
   swapDevices = [ ];
 
-  nix = {
-    buildCores = 2;
-    maxJobs = 2;
-    daemonIONiceLevel = 1;
-    daemonNiceLevel = 1;
-  };
-
   # TODO base
   boot.tmpOnTmpfs = true;
 
diff --git a/tv/1systems/rmdir.nix b/tv/1systems/rmdir.nix
index c52222cd1..f77268b53 100644
--- a/tv/1systems/rmdir.nix
+++ b/tv/1systems/rmdir.nix
@@ -37,8 +37,8 @@ in
   };
 
   imports = [
-    ../2configs/CAC-Developer-1.nix
-    ../2configs/CAC-CentOS-7-64bit.nix
+    ../2configs/hw/CAC-Developer-1.nix
+    ../2configs/fs/CAC-CentOS-7-64bit.nix
     ../2configs/base.nix
     ../2configs/consul-server.nix
     ../2configs/exim-smarthost.nix
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 586ad1725..65389b662 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -24,7 +24,7 @@ with lib;
   };
 
   imports = [
-    ../2configs/w110er.nix
+    ../2configs/hw/w110er.nix
     ../2configs/base.nix
     #../2configs/consul-client.nix
     ../2configs/git.nix
@@ -389,6 +389,4 @@ with lib;
   services.tor.enable = true;
   services.virtualboxHost.enable = true;
 
-  # TODO w110er if xserver is enabled
-  services.xserver.vaapiDrivers = [ pkgs.vaapiIntel ];
 }