1
0
mirror of https://github.com/kmein/niveum synced 2026-03-16 10:11:08 +01:00

weechat: use relay instead of API

This commit is contained in:
2024-10-01 21:03:33 +02:00
parent 7e033412bd
commit 904cc4401e
4 changed files with 5 additions and 8 deletions

View File

@@ -108,6 +108,7 @@ in {
tmux = "${pkgs.tmux}/bin/tmux -2"; tmux = "${pkgs.tmux}/bin/tmux -2";
sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv"; sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
zathura = swallow "${pkgs.zathura}/bin/zathura"; 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 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 yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
}; };

View File

@@ -112,7 +112,6 @@ in {
jbofihe # lojbanic software jbofihe # lojbanic software
unstablePackages.aider-chat unstablePackages.aider-chat
# unstablePackages.zoom-us # video conferencing # unstablePackages.zoom-us # video conferencing
unstablePackages.weechat
(pkgs.writers.writeDashBin "im" '' (pkgs.writers.writeDashBin "im" ''
weechat_password=$(${pkgs.pass}/bin/pass weechat) 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' exec ${unstablePackages.weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${externalNetwork.makanek}:8002 -password='"$weechat_password"'; /remote connect makanek'

View File

@@ -7,7 +7,6 @@
}: { }: {
systemd.services.telegram-bot-tlg-wotd = { systemd.services.telegram-bot-tlg-wotd = {
enable = true; enable = true;
wantedBy = ["multi-user.target"];
wants = ["network-online.target"]; wants = ["network-online.target"];
startAt = "9:30"; startAt = "9:30";
path = [ pkgs.jq pkgs.curl pkgs.recode pkgs.deno pkgs.imagemagick pkgs.gawk pkgs.gnugrep pkgs.coreutils ]; path = [ pkgs.jq pkgs.curl pkgs.recode pkgs.deno pkgs.imagemagick pkgs.gawk pkgs.gnugrep pkgs.coreutils ];

View File

@@ -7,7 +7,6 @@
}: let }: let
inherit (import ../../lib) kieran; inherit (import ../../lib) kieran;
weechatHome = "/var/lib/weechat"; weechatHome = "/var/lib/weechat";
apiPort = 8002;
weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix { weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {
inherit unstablePackages; inherit unstablePackages;
}; };
@@ -64,7 +63,7 @@ in {
autoconnect = true; autoconnect = true;
addresses = "irc.hackint.org/6697"; addresses = "irc.hackint.org/6697";
ipv6 = true; ipv6 = true;
ssl = true; tls = true;
autojoin = ["#eloop" "#krebs" "#the_playlist"]; autojoin = ["#eloop" "#krebs" "#the_playlist"];
sasl_mechanism = "plain"; sasl_mechanism = "plain";
sasl_username = nick; sasl_username = nick;
@@ -73,7 +72,7 @@ in {
libera = { libera = {
autoconnect = true; autoconnect = true;
addresses = "irc.libera.chat/6697"; addresses = "irc.libera.chat/6697";
ssl = true; tls = true;
autojoin = ["#haskell" "#fysi" "#binaergewitter" "#vim"]; autojoin = ["#haskell" "#fysi" "#binaergewitter" "#vim"];
sasl_mechanism = "plain"; sasl_mechanism = "plain";
sasl_username = nick; sasl_username = nick;
@@ -82,6 +81,7 @@ in {
retiolum = { retiolum = {
autoconnect = true; autoconnect = true;
addresses = "irc.r"; addresses = "irc.r";
tls = false;
autojoin = ["#xxx" "#brockman" "#flix"]; autojoin = ["#xxx" "#brockman" "#flix"];
command = lib.concatStringsSep "\\;" [ command = lib.concatStringsSep "\\;" [
"/oper admin aidsballs" "/oper admin aidsballs"
@@ -96,6 +96,7 @@ in {
news = { news = {
autoconnect = true; autoconnect = true;
addresses = "news.r"; addresses = "news.r";
tls = false;
autojoin = ["#cook" "#drachengame" "#oepnv" "#kmeinung" "#memes"]; autojoin = ["#cook" "#drachengame" "#oepnv" "#kmeinung" "#memes"];
}; };
}; };
@@ -118,7 +119,6 @@ in {
alias.cmd.mod = "/quote omode $channel +o $nick"; alias.cmd.mod = "/quote omode $channel +o $nick";
relay = { relay = {
port.weechat = 9000; port.weechat = 9000;
port.api = apiPort;
network.password = "\${sec.data.relay_password}"; network.password = "\${sec.data.relay_password}";
}; };
filters = { filters = {
@@ -179,8 +179,6 @@ in {
}; };
}; };
networking.firewall.allowedTCPPorts = [apiPort];
users.groups.weechat = {}; users.groups.weechat = {};
users.extraUsers.weechat = { users.extraUsers.weechat = {
useDefaultShell = true; useDefaultShell = true;