Merge remote-tracking branch 'prism/master'

3 files changed, 29 insertions, 16 deletions

diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix
index 789fc2f2f..0de07a027 100644
--- a/krebs/2configs/ircd.nix
+++ b/krebs/2configs/ircd.nix
@@ -5,6 +5,8 @@
     6667 6669
   ];
 
+  systemd.services.charybdis.serviceConfig.LimitNOFILE = 16384;
+
   krebs.charybdis = {
     enable = true;
     motd = ''
@@ -15,7 +17,7 @@
       serverinfo {
         name = "${config.krebs.build.host.name}.irc.r";
         sid = "1as";
-        description = "miep!";
+        description = "irc!";
         network_name = "irc.r";
 
         vhost = "0.0.0.0";
@@ -26,7 +28,7 @@
         #ssl_dh_params = "etc/dh.pem";
         #ssld_count = 1;
 
-        default_max_clients = 100000;
+        default_max_clients = 2048;
         #nicklen = 30;
       };
 
@@ -38,12 +40,12 @@
          */
         host = "0.0.0.0";
         port = 6667;
-        sslport = 6697;
+        #sslport = 6697;
 
         /* Listen on IPv6 (if you used host= above). */
         host = "::";
         port = 6667;
-        sslport = 6697;
+        #sslport = 6697;
       };
 
       class "users" {
@@ -53,9 +55,9 @@
         number_per_ip_global = 4096;
         cidr_ipv4_bitlen = 24;
         cidr_ipv6_bitlen = 64;
-        number_per_cidr = 65536;
-        max_number = 100000;
-        sendq = 10 megabyte;
+        number_per_cidr = 65535;
+        max_number = 65535;
+        sendq = 1000 megabyte;
       };
 
       privset "op" {
@@ -91,7 +93,7 @@
         use_knock = yes;
         knock_delay = 5 minutes;
         knock_delay_channel = 1 minute;
-        max_chans_per_user = 15;
+        max_chans_per_user = 150;
         max_bans = 100;
         max_bans_large = 500;
         default_split_user_count = 0;
diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix
index 3bf991433..ce4e83408 100644
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@@ -39,10 +39,12 @@
     };
   };
 
-  krebs.reaktor2.news = {
+  krebs.reaktor2.news = let
+    name = "candyman";
+  in {
     hostname = "localhost";
     port = "6667";
-    nick = "brockman-helper";
+    nick = name;
     plugins = [
       {
         plugin = "register";
@@ -60,23 +62,23 @@
           hooks.PRIVMSG = [
             {
               activate = "match";
-              pattern = "^brockman-helper:\\s*(\\S*)(?:\\s+(.*\\S))?\\s*$";
+              pattern = "^${name}:\\s*(\\S*)(?:\\s+(.*\\S))?\\s*$";
               command = 1;
               arguments = [2];
               commands = {
                 add-reddit.filename = pkgs.writeDash "add-reddit" ''
                   set -euf
                   if [ "$#" -ne 1 ]; then
-                    echo 'usage: brockman-helper: add-reddit $reddit_channel'
+                    echo 'usage: ${name}: add-reddit $reddit_channel'
                     exit 1
                   fi
                   reddit_channel=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
-                  echo "brockman: add r_$reddit_channel http://rss.r/?action=display&bridge=Telegram&username=$reddit_channel&format=Mrss"
+                  echo "brockman: add r_$reddit_channel http://rss.r/?action=display&bridge=Reddit&context=single&r=$reddit_channel&format=Atom"
                 '';
                 add-telegram.filename = pkgs.writeDash "add-telegram" ''
                   set -euf
                   if [ "$#" -ne 1 ]; then
-                    echo 'usage: brockman-helper: add-telegram $telegram_user'
+                    echo 'usage: ${name}: add-telegram $telegram_user'
                     exit 1
                   fi
                   telegram_user=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
@@ -85,7 +87,7 @@
                 add-youtube.filename = pkgs.writeDash "add-youtube" ''
                   set -euf
                   if [ "$#" -ne 1 ]; then
-                    echo 'usage: brockman-helper: add-youtube $nick $channelid'
+                    echo 'usage: ${name}: add-youtube $nick $channelid'
                     exit 1
                   fi
                   youtube_nick=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
@@ -95,7 +97,7 @@
                 search.filename = pkgs.writeDash "search" ''
                   set -euf
                   if [ "$#" -ne 1 ]; then
-                    echo 'usage: brockman-helper: search $searchterm'
+                    echo 'usage: ${name}: search $searchterm'
                     exit 1
                   fi
                   searchterm=$(echo "$1" | ${pkgs.jq}/bin/jq -Rr '[match("(\\S+)\\s*";"g").captures[].string][0]')
diff --git a/krebs/2configs/shack/glados/default.nix b/krebs/2configs/shack/glados/default.nix
index d546564c5..53d6e6f4a 100644
--- a/krebs/2configs/shack/glados/default.nix
+++ b/krebs/2configs/shack/glados/default.nix
@@ -1,5 +1,11 @@
 { config, pkgs, lib, ... }:
 let
+  unstable = import (pkgs.fetchFromGitHub {
+    owner = "nixos";
+    repo = "nixpkgs";
+    rev = (lib.importJSON ../../../nixpkgs-unstable.json).rev;
+    sha256 = (lib.importJSON ../../../nixpkgs-unstable.json).sha256;
+  }) {};
 in {
   services.nginx.virtualHosts."hass.shack" = {
     serverAliases = [ "glados.shack" ];
@@ -40,6 +46,9 @@ in {
     {
     enable = true;
     autoExtraComponents = true;
+    package = unstable.home-assistant.overrideAttrs (old: {
+      doInstallCheck = false;
+    });
     config = {
       homeassistant = {
         name = "Glados";