From 432325be09497d64cde6a970e3b58625e94f38a5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 14 Sep 2022 21:34:29 +0200
Subject: tv weechat-tv: init

---
 tv/3modules/im.nix             | 2 +-
 tv/5pkgs/simple/weechat-tv.nix | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 tv/5pkgs/simple/weechat-tv.nix

(limited to 'tv')

diff --git a/tv/3modules/im.nix b/tv/3modules/im.nix
index 8cb137510..e98a57327 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 000000000..17d286366
--- /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
+    ];
+  };
+}
-- 
cgit v1.2.3


From 9b37b535f43f361a7f57a5aebf89c139d33de01e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 1 Apr 2022 22:46:35 +0200
Subject: tv: bump HISTSIZE

---
 tv/2configs/bash/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv')

diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix
index 42914e060..92e2499a9 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=
 
-- 
cgit v1.2.3


From 707c6b640dca086634581220614c6094ebbcccbf Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 15 Sep 2022 20:35:43 +0200
Subject: tv binary-cache: use nix-serve-ng

---
 tv/2configs/binary-cache/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tv')

diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
index f6eaba36f..e5342cd54 100644
--- a/tv/2configs/binary-cache/default.nix
+++ b/tv/2configs/binary-cache/default.nix
@@ -3,6 +3,12 @@
   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;
-- 
cgit v1.2.3


From 3e6f01c3003558a7db1094742fc2cbedf985cd23 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 15 Sep 2022 20:51:27 +0200
Subject: tv binary-cache: drop krebs.secert

---
 tv/2configs/binary-cache/default.nix | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'tv')

diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
index e5342cd54..6ef7a3850 100644
--- a/tv/2configs/binary-cache/default.nix
+++ b/tv/2configs/binary-cache/default.nix
@@ -11,22 +11,7 @@
 
   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 = {
-- 
cgit v1.2.3


From d76cf33d1f000389558da8c8f5e17db966b8a5a7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 15 Sep 2022 20:52:00 +0200
Subject: tv binary-cache: add retiolum alias

---
 tv/2configs/binary-cache/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv')

diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
index 6ef7a3850..58791f4f6 100644
--- a/tv/2configs/binary-cache/default.nix
+++ b/tv/2configs/binary-cache/default.nix
@@ -19,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};
-- 
cgit v1.2.3