diff --git a/systems/kibbeh/configuration.nix b/systems/kibbeh/configuration.nix
index 33ba998..1a43287 100644
--- a/systems/kibbeh/configuration.nix
+++ b/systems/kibbeh/configuration.nix
@@ -89,6 +89,7 @@
       xournalpp
       jellyfin-media-player
       niveumPackages.mpv-tv
+      telegram-desktop
       (niveumPackages.mpv-radio.override { di-fm-key-file = config.age.secrets.di-fm-key.path; })
       niveumPackages.meteo
       spotify
diff --git a/systems/makanek/weechat.sync-conflict-20250130-092406-AJVBWR2.nix b/systems/makanek/weechat.sync-conflict-20250130-092406-AJVBWR2.nix
new file mode 100644
index 0000000..3bd87ee
--- /dev/null
+++ b/systems/makanek/weechat.sync-conflict-20250130-092406-AJVBWR2.nix
@@ -0,0 +1,210 @@
+{ lib, pkgs, config, unstablePackages, ... }:
+let
+  inherit (import ../../lib) kieran;
+  weechatHome = "/var/lib/weechat";
+  weechat-declarative =
+    pkgs.callPackage ../../packages/weechat-declarative.nix {
+      inherit unstablePackages;
+    };
+in {
+  systemd.services.weechat = let
+    tmux = pkgs.writers.writeDash "tmux" ''
+      exec ${pkgs.tmux}/bin/tmux -f ${
+        pkgs.writeText "tmux.conf" ''
+          set-option -g prefix `
+          unbind-key C-b
+          bind ` send-prefix
+
+          set-option -g status off
+          set-option -g default-terminal screen-256color
+
+          #use session instead of windows
+          bind-key c new-session
+          bind-key p switch-client -p
+          bind-key n switch-client -n
+          bind-key C-s switch-client -l
+        ''
+      } "$@"
+    '';
+    weechat = weechat-declarative.override {
+      config = {
+        scripts = [
+          pkgs.weechatScripts.weechat-autosort
+          pkgs.weechatScripts.colorize_nicks
+          # pkgs.weechatScripts.weechat-matrix
+          (pkgs.callPackage ../../packages/weechatScripts/hotlist2extern.nix
+            { })
+        ];
+        settings = let nick = "kmein";
+        in {
+          weechat = {
+            look.mouse = true;
+            look.prefix_align_max = 15;
+            color.chat_nick_colors =
+              lib.lists.subtractLists (lib.range 52 69 ++ lib.range 231 248)
+              (lib.range 31 254);
+          };
+          irc = {
+            look = {
+              server_buffer = "independent";
+              color_nicks_in_nicklist = true;
+            };
+            server_default = {
+              nicks = nick;
+              msg_part = "tschö mit ö";
+              msg_quit = "ciao kakao";
+              msg_kick = "warum machst du diese?";
+              realname = lib.head (lib.strings.split " " kieran.name);
+            };
+            server = {
+              hackint = {
+                autoconnect = true;
+                addresses = "irc.hackint.org/6697";
+                ipv6 = true;
+                tls = true;
+                autojoin = [ "#eloop" "#krebs" "#the_playlist" ];
+                sasl_mechanism = "plain";
+                sasl_username = nick;
+                sasl_password = "\${sec.data.hackint_sasl}";
+              };
+              libera = {
+                autoconnect = true;
+                addresses = "irc.libera.chat/6697";
+                tls = true;
+                autojoin = [ "#haskell" "#fysi" "#binaergewitter" "#vim" ];
+                sasl_mechanism = "plain";
+                sasl_username = nick;
+                sasl_password = "\${sec.data.libera_sasl}";
+              };
+              retiolum = {
+                autoconnect = true;
+                addresses = "irc.r";
+                tls = false;
+                autojoin = [ "#xxx" "#brockman" "#flix" ];
+                command = lib.concatStringsSep "\\;" [
+                  "/oper admin aidsballs"
+                  "/msg nickserv always-on true"
+                  "/msg nickserv autoreplay-missed on"
+                  "/msg nickserv auto-away"
+                ];
+                sasl_mechanism = "plain";
+                sasl_username = nick;
+                sasl_password = "\${sec.data.retiolum_sasl}";
+              };
+              brockman = {
+                autoconnect = true;
+                addresses = "brockman.news/6667";
+                tls = false;
+                autojoin = [ "#cook" "#kmeinung" ];
+                sasl_username = nick;
+                sasl_password = "\${sec.data.brockman_sasl}";
+                sasl_mechanism = "plain";
+              };
+            };
+          };
+          logger.level.irc.news = 0;
+          plugins.var.perl.hotlist2extern = {
+            external_command_hotlist = "echo %X > ${weechatHome}/hotlist.txt";
+            external_command_hotlist_empty =
+              "echo -n %X > ${weechatHome}/hotlist.txt";
+            lowest_priority = "2";
+            use_title = "off";
+            delimiter = ",";
+          };
+          matrix.look.server_buffer = "merge_without_core";
+          matrix.server.nibbana = {
+            address = "nibbana.jp";
+            username = nick;
+            password = "\${sec.data.nibbana_account}";
+            autoconnect = true;
+          };
+          alias.cmd.mod = "/quote omode $channel +o $nick";
+          relay = {
+            port.weechat = 9000;
+            network.password = "\${sec.data.relay_password}";
+          };
+          filters = {
+            zerocovid = {
+              buffer = "irc.news.*";
+              tags = "*";
+              regex =
+                "[kc]orona|💉|🤒|😷|[kc]ovid|virus|lockdown|va[kc][sc]in|vaxx|mutante|mutation|impf|pandemi|κορ[ωο]ν[αο]ϊό|корона|expert|infe[ck]t|infizi|in[cz]iden[cz]|sars-cov|drosten|virolog|lauterbach|delta|omi[ck]ron|epidemi|booster|r-wert";
+            };
+            smart = {
+              buffer = "*";
+              tags = "irc_smart_filter";
+              regex = "*";
+            };
+            playlist_topic = {
+              buffer = "irc.*.#the_playlist";
+              tags = "irc_topic";
+              regex = "*";
+            };
+            brockman_notice = {
+              buffer = "irc.news.*";
+              tags = "irc_notice";
+              regex = "*";
+            };
+            bots = {
+              buffer = "irc.retiolum.*";
+              tags = [ "nick_gitlab" "nick_prometheus" ];
+              regex = "*";
+            };
+            people = {
+              buffer = "irc.*.*";
+              tags = map (name: "nick_${name}") [ "mod_p[matrix-fli" ];
+              regex = "*";
+            };
+          };
+        };
+        extraCommands = ''
+          /save
+          /connect -all
+        '';
+        # /matrix connect nibbana
+      };
+    };
+  in {
+    description = "Weechat bouncer";
+    after = [ "network.target" ];
+    wantedBy = [ "multi-user.target" ];
+    restartIfChanged = true;
+    path = [ pkgs.alacritty.terminfo ];
+    environment.WEECHAT_HOME = weechatHome;
+    # preStart = "${pkgs.coreutils}/bin/rm $WEECHAT_HOME/*.conf";
+    script = "${tmux} -2 new-session -d -s IM ${weechat}/bin/weechat";
+    preStop = "${tmux} kill-session -t IM";
+    serviceConfig = {
+      User = "weechat";
+      Group = "weechat";
+      RemainAfterExit = true;
+      Type = "oneshot";
+    };
+  };
+
+  users.groups.weechat = { };
+  users.extraUsers.weechat = {
+    useDefaultShell = true;
+    openssh.authorizedKeys.keys = kieran.sshKeys ++ [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@kibbeh"
+    ];
+    createHome = true;
+    group = "weechat";
+    home = "/var/lib/weechat";
+    isSystemUser = true;
+    packages = [ pkgs.tmux ];
+  };
+
+  age.secrets.weechat-sec = {
+    file = ../../secrets/weechat-sec.conf.age;
+    path = "/var/lib/weechat/sec.conf";
+    owner = "weechat";
+    group = "weechat";
+    mode = "440";
+  };
+
+  niveum.passport.services = [{
+    title = "weechat bouncer";
+    description = "keeps me logged in on IRC.";
+  }];
+}