4 files changed, 19 insertions, 18 deletions
diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix
index 42914e06..92e2499a 100644
--- a/tv/2configs/bash/default.nix
+++ b/tv/2configs/bash/default.nix
@@ -6,7 +6,7 @@ with import <stockholm/lib>;
   programs.bash = {
     interactiveShellInit = /* sh */ ''
       HISTCONTROL='erasedups:ignorespace'
-      HISTSIZE=65536
+      HISTSIZE=900001
       HISTFILESIZE=$HISTSIZE
       HISTTIMEFORMAT=
 
diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
index f6eaba36..58791f4f 100644
--- a/tv/2configs/binary-cache/default.nix
+++ b/tv/2configs/binary-cache/default.nix
@@ -3,24 +3,15 @@
   environment.etc."binary-cache.pubkey".text =
     config.krebs.build.host.binary-cache.pubkey;
 
+  nixpkgs.overlays = [
+    (self: super: {
+      nix-serve = self.haskellPackages.nix-serve-ng;
+    })
+  ];
+
   services.nix-serve = {
     enable = true;
-    secretKeyFile = config.krebs.secret.files.binary-cache-seckey.path;
-  };
-
-  systemd.services.nix-serve = {
-    after = [
-      config.krebs.secret.files.binary-cache-seckey.service
-    ];
-    partOf = [
-      config.krebs.secret.files.binary-cache-seckey.service
-    ];
-  };
-
-  krebs.secret.files.binary-cache-seckey = {
-    path = "/run/secret/nix-serve.key";
-    owner.name = "nix-serve";
-    source-path = toString <secrets> + "/nix-serve.key";
+    secretKeyFile = toString <secrets> + "/nix-serve.key";
   };
 
   services.nginx = {
@@ -28,6 +19,7 @@
     virtualHosts.nix-serve = {
       serverAliases = [
         "cache.${config.krebs.build.host.name}.hkw"
+        "cache.${config.krebs.build.host.name}.r"
       ];
       locations."/".extraConfig = ''
         proxy_pass http://localhost:${toString config.services.nix-serve.port};
diff --git a/tv/3modules/im.nix b/tv/3modules/im.nix
index 8cb13751..e98a5732 100644
--- a/tv/3modules/im.nix
+++ b/tv/3modules/im.nix
@@ -71,7 +71,7 @@ in {
           export PATH=${lib.makeSearchPath "bin" [
             pkgs.tmux
             pkgs.gnugrep
-            pkgs.weechat
+            pkgs.weechat-tv
           ]}
           if tmux list-sessions -F\#S | grep -q '^im''$'; then
             exec tmux attach -t im
diff --git a/tv/5pkgs/simple/weechat-tv.nix b/tv/5pkgs/simple/weechat-tv.nix
new file mode 100644
index 00000000..17d28636
--- /dev/null
+++ b/tv/5pkgs/simple/weechat-tv.nix
@@ -0,0 +1,9 @@
+{ lib, pkgs }:
+
+pkgs.wrapWeechat pkgs.weechat-unwrapped {
+  configure = { availablePlugins, ... }: {
+    scripts = [
+      pkgs.weechatScripts.weechat-matrix
+    ];
+  };
+}