3 files changed, 18 insertions, 7 deletions
diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index 0aca2146d..17915e087 100644
--- a/lass/1systems/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -5,11 +5,9 @@ let
   inherit (lib) head;
 
   ip = (head config.krebs.build.host.nets.internet.addrs4);
-  r_ip = (head config.krebs.build.host.nets.retiolum.addrs4);
 in {
   imports = [
-    ../../tv/2configs/CAC-Developer-2.nix
-    ../../tv/2configs/CAC-CentOS-7-64bit.nix
+    ../2configs/os-templates/CAC-CentOS-7-64bit.nix
     ../2configs/base.nix
     ../2configs/retiolum.nix
     ../2configs/fastpoke-pages.nix
@@ -28,6 +26,10 @@ in {
       ];
 
     }
+    {
+      nix.maxJobs = 1;
+      sound.enable = false;
+    }
   ];
 
   krebs.build = {
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 1320e0782..feaf77ef6 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -4,11 +4,10 @@ let
   inherit (import ../4lib { inherit pkgs lib; }) getDefaultGateway;
   inherit (lib) head;
 
-  ip = (head config.krebs.hosts.echelon.nets.internet.addrs4);
+  ip = (head config.krebs.build.host.nets.internet.addrs4);
 in {
   imports = [
-    ../../tv/2configs/CAC-Developer-2.nix
-    ../../tv/2configs/CAC-CentOS-7-64bit.nix
+    ../2configs/os-templates/CAC-CentOS-7-64bit.nix
     ../2configs/base.nix
     ../2configs/retiolum.nix
     ../2configs/realwallpaper-server.nix
@@ -17,6 +16,7 @@ in {
     ../2configs/redis.nix
     ../2configs/go.nix
     ../2configs/ircd.nix
+    ../2configs/newsbot-js.nix
     {
       networking.interfaces.enp2s1.ip4 = [
         {
@@ -30,6 +30,10 @@ in {
       ];
 
     }
+    {
+      nix.maxJobs = 1;
+      sound.enable = false;
+    }
   ];
 
   krebs.build = {
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index c0c33828b..7076c8b14 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -23,7 +23,6 @@
     ../2configs/wordpress.nix
     ../2configs/bitlbee.nix
     ../2configs/firefoxPatched.nix
-    ../2configs/realwallpaper.nix
     ../2configs/skype.nix
   ];
 
@@ -179,6 +178,7 @@
     sshpass
     get
     genid
+    teamspeak_client
   ];
 
   #TODO: fix this shit
@@ -210,4 +210,9 @@
       ];
     };
   };
+  #touchpad config
+  services.xserver.synaptics = {
+    enable = true;
+    tapButtons = false;
+  };
 }