From 5a9dc34ee8a884a38c07e0994b9f733582467356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Wed, 26 Jun 2024 19:35:05 +0200
Subject: [PATCH] weechat: use new api relay

---
 configs/default.nix              | 2 +-
 configs/packages.nix             | 7 +++++++
 packages/weechat-declarative.nix | 5 +++--
 systems/makanek/weechat.nix      | 9 ++++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/configs/default.nix b/configs/default.nix
index 934cb4d..310c6bc 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -3,6 +3,7 @@
   lib,
   config,
   niveumPackages,
+  unstablePackages,
   inputs,
   ...
 }: let
@@ -107,7 +108,6 @@ in {
         tmux = "${pkgs.tmux}/bin/tmux -2";
         sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
         zathura = swallow "${pkgs.zathura}/bin/zathura";
-        im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
         yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
         yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
       };
diff --git a/configs/packages.nix b/configs/packages.nix
index eaab14d..ef4e156 100644
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -9,6 +9,8 @@
 }: let
   worldradio = pkgs.callPackage ../packages/worldradio.nix {};
 
+  externalNetwork = import ../lib/external-network.nix;
+
   zoteroStyle = {
     name,
     sha256,
@@ -108,6 +110,11 @@ in {
     anki-bin # flashcards
     jbofihe # lojbanic software
     unstablePackages.zoom-us # video conferencing
+    unstablePackages.weechat
+    (pkgs.writers.writeDashBin "im" ''
+      weechat_password=$(${pkgs.pass}/bin/pass weechat)
+      exec ${unstablePackages.weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${externalNetwork.makanek}:8002 -password='"$weechat_password"'; /remote connect makanek'
+    '')
     alejandra # nix formatter
     pdfgrep # search in pdf
     pdftk # pdf toolkit
diff --git a/packages/weechat-declarative.nix b/packages/weechat-declarative.nix
index 409a473..0b58577 100644
--- a/packages/weechat-declarative.nix
+++ b/packages/weechat-declarative.nix
@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  unstablePackages,
   ...
 } @ args: let
   # config cannot be declared in the input attribute set because that would
@@ -136,7 +137,7 @@
     ))
   );
 
-  weechat = pkgs.weechat.override {
+  weechat = unstablePackages.weechat.override {
     configure = _: {
       init = "/exec -oc cat ${setFile}";
 
@@ -169,7 +170,7 @@ in
     name = "weechat-configured";
     paths = [
       wrapper
-      pkgs.weechat
+      unstablePackages.weechat
     ];
     postBuild = ''
       ln -s ${setFile} $out/weechat.set
diff --git a/systems/makanek/weechat.nix b/systems/makanek/weechat.nix
index e3d26ca..352cc0f 100644
--- a/systems/makanek/weechat.nix
+++ b/systems/makanek/weechat.nix
@@ -2,11 +2,15 @@
   lib,
   pkgs,
   config,
+  unstablePackages,
   ...
 }: let
   inherit (import ../../lib) kieran;
   weechatHome = "/var/lib/weechat";
-  weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {};
+  apiPort = 8002;
+  weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {
+    inherit unstablePackages;
+  };
 in {
   systemd.services.weechat = let
     tmux = pkgs.writers.writeDash "tmux" ''
@@ -118,6 +122,7 @@ in {
           alias.cmd.mod = "/quote omode $channel +o $nick";
           relay = {
             port.weechat = 9000;
+            port.api = apiPort;
             network.password = "\${sec.data.relay_password}";
           };
           filters = {
@@ -178,6 +183,8 @@ in {
     };
   };
 
+  networking.firewall.allowedTCPPorts = [apiPort];
+
   users.groups.weechat = {};
   users.extraUsers.weechat = {
     useDefaultShell = true;