5 files changed, 21 insertions, 10 deletions
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 1320e0782..e0948d95e 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -17,6 +17,7 @@ in {
     ../2configs/redis.nix
     ../2configs/go.nix
     ../2configs/ircd.nix
+    ../2configs/newsbot-js.nix
     {
       networking.interfaces.enp2s1.ip4 = [
         {
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;
+  };
 }
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 43c4f4e34..7fdc643a7 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -44,7 +44,7 @@ with lib;
     build.source = {
       git.nixpkgs = {
         url = https://github.com/Lassulus/nixpkgs;
-        rev = "e916273209560b302ab231606babf5ce1c481f08";
+        rev = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da";
       };
     };
   };
diff --git a/lass/2configs/bitlbee.nix b/lass/2configs/bitlbee.nix
index 3a0080402..fa14c7fea 100644
--- a/lass/2configs/bitlbee.nix
+++ b/lass/2configs/bitlbee.nix
@@ -8,8 +8,9 @@ in {
     ../3modules/bitlbee.nix
   ];
 
-  config.lass.bitlbee = {
+  lass.bitlbee = {
     enable = true;
     bitlbeePkg = lpkgs.bitlbee;
+    portNumber = 6666;
   };
 }
diff --git a/lass/2configs/ircd.nix b/lass/2configs/ircd.nix
index e48bbfd3e..4d2c134b6 100644
--- a/lass/2configs/ircd.nix
+++ b/lass/2configs/ircd.nix
@@ -46,24 +46,28 @@
 
       class "users" {
         ping_time = 2 minutes;
-        number_per_ident = 200;
-        number_per_ip = 200;
-        number_per_ip_global = 500;
+        number_per_ident = 10;
+        number_per_ip = 2048;
+        number_per_ip_global = 4096;
         cidr_ipv4_bitlen = 24;
         cidr_ipv6_bitlen = 64;
-        number_per_cidr = 9000;
-        max_number = 10000;
-        sendq = 400 kbytes;
+        number_per_cidr = 65536;
+        max_number = 3000;
+        sendq = 1 megabyte;
       };
 
       exempt {
         ip = "127.0.0.1";
       };
 
+      exempt {
+        ip = "10.243.0.0/16";
+      };
+
       auth {
         user = "*@*";
         class = "users";
-        flags = exceed_limit;
+        flags = kline_exempt, exceed_limit, flood_exempt;
       };
 
       channel {