diff options
Diffstat (limited to '')
| -rw-r--r-- | irssi/Dockerfile | 36 | ||||
| -rw-r--r-- | irssi/config | 210 | ||||
| -rw-r--r-- | irssi/docker-compose.yaml | 59 | ||||
| -rw-r--r-- | irssi/otr_powerline.diff | 21 | ||||
| -rw-r--r-- | irssi/pantalaimon.conf | 13 | ||||
| -rw-r--r-- | irssi/proxychains.conf | 2 | ||||
| -rw-r--r-- | irssi/solarized-powerline.theme | 48 |
7 files changed, 290 insertions, 99 deletions
diff --git a/irssi/Dockerfile b/irssi/Dockerfile index 2a630f4..20caa13 100644 --- a/irssi/Dockerfile +++ b/irssi/Dockerfile @@ -21,8 +21,6 @@ RUN set -eux; \ ENV LANG C.UTF-8 -ENV IRSSI_VERSION 1.4.3 - RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ @@ -48,9 +46,12 @@ RUN set -eux; \ tar \ libotr-dev \ libgcrypt-dev \ - ; \ - \ - wget "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz" -O /tmp/irssi.tar.xz; \ + ; + +ENV IRSSI_VERSION 1.4.4 +RUN apk add patch +COPY ./otr_powerline.diff / +RUN wget "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz" -O /tmp/irssi.tar.xz; \ wget "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz.asc" -O /tmp/irssi.tar.xz.asc; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key DDBEF0E1: public key "The Irssi project <staff@irssi.org>" imported @@ -64,6 +65,7 @@ RUN set -eux; \ rm /tmp/irssi.tar.xz; \ \ cd /usr/src/irssi; \ + patch ./src/otr/otr-formats.c < /otr_powerline.diff; \ meson \ -Denable-true-color=yes \ -Dwith-bot=yes \ @@ -75,16 +77,16 @@ RUN set -eux; \ ninja -C Build -j "$(nproc)"; \ ninja -C Build install; ENV HTTPS_PROXY=socks5://192.168.1.214:9995 -RUN apk add git glib python3-dev && \ - cd /home/user && \ - git clone https://github.com/irssi-import/irssi-python && \ - cd /home/user/irssi-python && \ - autoreconf -ivf -I. && \ - ./configure --with-irssi=/usr/src/irssi && \ - make -C src constants && \ - make && \ - mkdir /home/user/.irssi/modules && \ - cp src/.libs/libpython.so ~/.irssi/modules +# RUN apk add git glib python3-dev && \ +# cd /home/user && \ +# git clone https://github.com/irssi-import/irssi-python && \ +# cd /home/user/irssi-python && \ +# autoreconf -ivf -I. && \ +# ./configure --with-irssi=/usr/src/irssi && \ +# make -C src constants && \ +# make && \ +# mkdir /home/user/.irssi/modules && \ +# cp src/.libs/libpython.so ~/.irssi/modules ENV HTTPS_PROXY= RUN cd /; \ rm -rf /usr/src/irssi; \ @@ -97,7 +99,7 @@ RUN cd /; \ )"; \ apk add --virtual .irssi-rundeps $runDeps; \ echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && apk update; \ - apk add --no-cache perl-glib perl-datetime perl-dbi perl-dbd-pg perl-lwp-protocol-https proxychains-ng perl-glib-object-introspection perl-mojolicious libnotify; \ + apk add --no-cache perl-regexp-common-net-cidr perl-regexp-common perl-xml-rss perl-glib perl-datetime perl-dbi perl-dbd-pg perl-lwp-protocol-https proxychains-ng perl-glib-object-introspection perl-mojolicious libnotify; \ # apk add dbus; \ # dbus-uuidgen > /var/lib/dbus/machine-id; \ # mkdir -p /var/run/dbus; \ @@ -110,7 +112,7 @@ RUN cd /; \ COPY ./proxychains.conf /etc/proxychains/ WORKDIR $HOME -RUN cp /home/user/.irssi/modules/libpython.so /usr/local/lib/irssi/modules/libpython_core.so +# RUN cp /home/user/.irssi/modules/libpython.so /usr/local/lib/irssi/modules/libpython_core.so USER user CMD ["proxychains4", "-q", "irssi"] diff --git a/irssi/config b/irssi/config index a05f05b..ed72682 100644 --- a/irssi/config +++ b/irssi/config @@ -8,15 +8,15 @@ servers = ( port = "6667"; autoconnect = "yes"; }, - { - address = "kfswfco7mfb38dj7hsm4b8gs13ppjnog886y8zcgzno4jt16cepy.loki"; - chatnet = "BonoboNET_LOKI"; - port = "6697"; - tls_cert = "~/.irssi/certs/nick.pem"; - use_tls = "yes"; - tls_verify = "no"; - autoconnect = "yes"; - }, + # { + # address = "rany.irc.bnet.eu.org"; + # chatnet = "BonoboNET_LOKI"; + # port = "6697"; + # tls_cert = "~/.irssi/certs/nick.pem"; + # use_tls = "yes"; + # tls_verify = "no"; + # autoconnect = "yes"; + # }, # { # address = "irc.oftc.net"; # chatnet = "OFTC"; @@ -38,12 +38,12 @@ servers = ( chatnet = "bitlbee_local"; autoconnect = "yes"; }, - { - address = "192.168.1.214"; - port = "8668"; - chatnet = "matterircd"; - autoconnect = "no"; - }, + # { + # address = "192.168.1.214"; + # port = "8668"; + # chatnet = "matterircd"; + # autoconnect = "no"; + # }, # { # address = "192.168.1.214"; # port = "8667"; @@ -89,9 +89,20 @@ servers = ( }, { address = "185.130.45.46"; + chatnet = "Bonobonet_ZNC"; + port = "1025"; + password = "terminaldweller/Bonobonet:babun"; #pragma: allowlist secret + use_tls = "yes"; + tls_cert = "~/.irssi/certs/nick.pem"; + tls_verify = "no"; + autoconnect = "yes"; + }, + { + address = "185.130.45.46"; chatnet = "IRCNet_ZNC"; port = "1025"; - password = "terminaldweller/IRCNET:network";# pragma: allowlist secret + password = "terminaldweller/IRCNET:network"; #pragma: allowlist secret + # pragma: allowlist secret use_tls = "yes"; tls_cert = "~/.irssi/certs/nick.pem"; tls_verify = "no"; @@ -101,7 +112,7 @@ servers = ( # address = "185.130.45.46"; # chatnet = "BonoboNET_LOKI_ZNC"; # port = "1025"; - # password = "terminaldweller/Bonobonet_Loki:network";# pragma: allowlist secret + # password = "terminaldweller/Bonobonet_Loki:network"; #pragma: allowlist secret # tls_cert = "~/.irssi/certs/nick.pem"; # use_tls = "yes"; # tls_verify = "no"; @@ -111,7 +122,8 @@ servers = ( address = "185.130.45.46"; chatnet = "Libera-ZNC"; port = "1025"; - password = "terminaldweller/Liberachat:lama";# pragma: allowlist secret + password = "terminaldweller/Liberachat:lama"; #pragma: allowlist secret + # pragma: allowlist secret use_tls = "yes"; tls_cert = "~/.irssi/certs/nick.pem"; tls_verify = "no"; @@ -121,7 +133,8 @@ servers = ( address = "185.130.45.46"; chatnet = "OFTC-ZNC"; port = "1025"; - password = "terminaldweller/OFTC:network";# pragma: allowlist secret + password = "terminaldweller/OFTC:network"; #pragma: allowlist secret + # pragma: allowlist secret use_tls = "yes"; tls_cert = "~/.irssi/certs/nick.pem"; tls_verify = "no"; @@ -131,7 +144,8 @@ servers = ( address = "185.130.45.46"; chatnet = "Rizon-ZNC"; port = "1025"; - password = "terminaldweller/Rizon:network";# pragma: allowlist secret + password = "terminaldweller/Rizon:network"; #pragma: allowlist secret + # pragma: allowlist secret use_tls = "yes"; tls_cert = "~/.irssi/certs/nick.pem"; tls_verify = "no"; @@ -141,7 +155,8 @@ servers = ( address = "185.130.45.46"; chatnet = "Undernet-ZNC"; port = "1025"; - password = "terminaldweller/undernet:network";# pragma: allowlist secret + password = "terminaldweller/undernet:network"; #pragma: allowlist secret + # pragma: allowlist secret use_tls = "yes"; tls_cert = "~/.irssi/certs/nick.pem"; tls_verify = "no"; @@ -159,7 +174,7 @@ servers = ( address = "185.130.45.46"; chatnet = "EFnet_ZNC"; port = "1025"; - password = "terminaldweller/EFNET:locolobo";# pragma: allowlist secret + password = "terminaldweller/EFNET:locolobo"; #pragma: allowlist secret use_tls = "yes"; tls_cert = "~/.irssi/certs/nick.pem"; tls_verify = "no"; @@ -177,7 +192,7 @@ servers = ( address = "185.130.45.46"; chatnet = "DALnet_ZNC"; port = "1025"; - password = "terminaldweller/DALNET:netwqkkk";# pragma: allowlist secret + password = "terminaldweller/DALNET:netwqkkk"; #pragma: allowlist secret use_tls = "yes"; tls_cert = "~/.irssi/certs/nick.pem"; tls_verify = "no"; @@ -187,7 +202,8 @@ servers = ( address = "185.130.45.46"; chatnet = "TildeChat_ZNC"; port = "1025"; - password = "terminaldweller/Tilde_Chat:network";# pragma: allowlist secret + password = "terminaldweller/Tilde_Chat:network"; #pragma: allowlist secret + # pragma: allowlist secret tls_cert = "~/.irssi/certs/nick.pem"; use_tls = "yes"; tls_verify = "no"; @@ -215,7 +231,7 @@ chatnets = { I2P_ILITIA = { type = "IRC"; nick = "useruseR"; }; I2P_POSTMAN = { type = "IRC"; nick = "useruseR"; }; PROBABLY_LOKI = { type = "IRC"; nick = "terminaldweller"; }; - BonoboNET_LOKI = { type = "IRC"; nick = "terminaldweller"; }; + Bonobonet_ZNC = { type = "IRC"; nick = "terminaldweller"; }; # OFTC = { # type = "IRC"; # nick = "terminaldweller"; @@ -250,6 +266,9 @@ chatnets = { "Libera-ZNC" = { type = "IRC"; autosendcmd = "/^mode terminaldweller +g;wait 3000"; + max_kicks = "1"; + max_msgs = "4"; + max_whois = "1"; }; # Rizon = { # type = "IRC"; @@ -258,24 +277,44 @@ chatnets = { "Rizon-ZNC" = { type = "IRC"; autosendcmd = "/^mode terminaldweller +RCGpx;msg hostserv on;wait 3000"; + max_kicks = "1"; + max_msgs = "1"; + max_whois = "1"; + }; + IRCNet_ZNC = { + type = "IRC"; + max_kicks = "1"; + max_msgs = "1"; + max_whois = "1"; }; - IRCNet_ZNC = { type = "IRC"; }; "Undernet-ZNC" = { type = "IRC"; nick = "terminaldwel"; - autosendcmd = "/^mode terminaldwel +ix;msg *status traffic;wait 3000"; + autosendcmd = "/^mode terminaldwel +ix;msg *status listallusernetworks;wait 3000"; + max_kicks = "1"; + max_msgs = "1"; + max_whois = "1"; + }; + EFnet_ZNC = { + type = "IRC"; + nick = "termi"; + max_kicks = "1"; + max_msgs = "4"; + max_whois = "1"; }; - EFnet_ZNC = { type = "IRC"; nick = "termi";}; DALnet_ZNC = { type = "IRC"; nick = "terminaldweller"; - autosendcmd = "/^msg nickserv@services.dal.net identify ;mode terminaldweller HRCi;wait 3000"; + autosendcmd = "/^msg nickserv@services.dal.net identify @@@@@@@@@@@@;mode terminaldweller HRCi;wait 3000"; + max_kicks = "4"; + max_msgs = "20"; + max_whois = "30"; }; TildeChat_ZNC = { type = "IRC"; }; devinet = { type = "IRC"; nick = "terminaldweller"; - # autosendcmd = "/^msg nickserv identify terminaldweller;wait 3000;"; + autosendcmd = "/^msg hostserv on;wait 3000"; sasl_mechanism = "EXTERNAL"; sasl_username = "terminaldweller"; }; @@ -285,6 +324,9 @@ channels = ( # { name = "#dpdk"; chatnet = "Libera-ZNC"; autojoin = "yes"; }, # { name = "#fdio-vpp"; chatnet = "Libera-ZNC"; autojoin = "yes"; }, # { name = "#openssl"; chatnet = "Libera-ZNC"; autojoin = "yes"; }, + { name = "#sopelbot"; chatnet = "devinet"; autojoin = "yes"; }, + { name = "#matterbridge"; chatnet = "devinet"; autojoin = "yes"; }, + { name = "#rss"; chatnet = "devinet"; autojoin = "yes"; }, { name = "#netbsd"; chatnet = "Libera-ZNC"; autojoin = "yes"; }, # { name = "#netplan"; chatnet = "Libera-ZNC"; autojoin = "yes"; }, { name = "#ubuntu"; chatnet = "Libera-ZNC"; autojoin = "yes"; }, @@ -292,7 +334,7 @@ channels = ( { name = "#debian"; chatnet = "OFTC-ZNC"; autojoin = "yes"; }, # { name = "#virt"; chatnet = "OFTC-ZNC"; autojoin = "yes"; }, { name = "#openwrt"; chatnet = "OFTC-ZNC"; autojoin = "yes"; }, - { + { name = "#selfhosting"; chatnet = "TildeChat_ZNC"; autojoin = "yes"; @@ -300,7 +342,7 @@ channels = ( { name = "#tor"; chatnet = "OFTC-ZNC"; autojoin = "yes"; }, { name = "#llvm"; chatnet = "OFTC-ZNC"; autojoin = "yes"; }, { name = "#bitlbee"; chatnet = "OFTC-ZNC"; autojoin = "yes"; }, - { + { name = "##terminaldweller"; chatnet = "OFTC-ZNC"; autojoin = "yes"; @@ -314,15 +356,15 @@ channels = ( { name = "#qutebrowser"; chatnet = "Libera-ZNC"; autojoin = "yes"; }, { name = "#lokinet"; chatnet = "PROBABLY_LOKI"; autojoin = "yes"; }, { name = "#general"; chatnet = "PROBABLY_LOKI"; autojoin = "yes"; }, - { name = "#crxn"; chatnet = "BonoboNET_LOKI"; autojoin = "yes"; }, + { name = "#crxn"; chatnet = "Bonobonet_ZNC"; autojoin = "yes"; }, { name = "#networking"; - chatnet = "BonoboNET_LOKI"; + chatnet = "Bonobonet_ZNC"; autojoin = "yes"; }, { name = "#general"; - chatnet = "BonoboNET_LOKI"; + chatnet = "Bonobonet_ZNC"; autojoin = "yes"; }, { name = "#go-nuts"; chatnet = "Libera-ZNC"; autojoin = "yes"; }, @@ -439,11 +481,11 @@ statusbar = { # window_empty is printed with empty windows window = " %Z00af00{sb $tag/{channel $itemname} %C {sbmode $M}} %C%n "; window_empty = "{sb {sbservertag $tag}}"; - prompt = "please%z005f87{%k%z005f87%9$c $*%w%k$R%w%k$S%w%k$N%w%k$T %N%Z005f87}%n"; - prompt_empty = "you%z005f87%k%z005f87%9$c $*%w%k$R%w%k$S%w%k$N%w%k$T %N%Z005f87%n"; + # prompt = "please%z005f87{%k%z005f87%9$c $*%w%k$R%w%k$S%w%k$T %N%Z005f87}%n"; + # prompt_empty = "you%z005f87%k%z005f87%9$c $*%w%k$R%w%k$S%w%k$T %N%Z005f87%n"; - topic = "%Z005f00%k%z005f00%N%Z005f00%N %Z5f5faf%9 $topic%N"; - topic_empty = " Irssi v$J - http://www.irssi.org"; + topic = "%Z005f00%k%z005f00%N%Z005f00%N %Z5f5faf%9 $topic%N %Z005f00%N%z005f00%k%N"; + topic_empty = " Irssi v$J - https://www.irssi.org"; # all of these treated specially, they're only displayed when needed # Powerline @@ -456,6 +498,11 @@ statusbar = { vim_windows_1 = "%Z005f5f%0%z005f5f%k%9 $vim_wins%z005f5f"; itime = "%Z005f00%k%z005f00%9 $0 %z005f00"; + + extra = "%Z5f5f87%k%z5f5f87%9 $X $Y $O $E $F %z5f5f87"; + + prompt_right = "%Z5f5fd7%N%k%9%z5f5fd7 $,%N%k%z5f5fd7%N%Z5f5faf $Q $W %N%Z5f5f87%k%z5f5f87%9 $J"; + server_info = "%k%z005f87%9 Server:$tag %w%kChatnet:$chatnet%w%k$R%w%k$S %n%Z005f87"; }; # there's two type of statusbars. root statusbars are either at the top @@ -539,7 +586,21 @@ statusbar = { barend = { alignment = "right"; }; }; }; - dccstat = { items = { dccstat = { }; }; }; + dccstat = { + items = { + dccstat = { }; + extra = { alignment = "right";}; + }; + }; + server_info = { + items = { + barstart = { }; + server_info = { }; + prompt_right = { alignment = "right"; }; + barend = { alignment = "right"; }; + }; + position = "50"; + }; prompt = { items = { uberprompt = { priority = "-1"; }; @@ -597,13 +658,14 @@ settings = { real_name = "john doe"; user_name = "devi"; nick = "terminaldweller"; + recode_transliterate = "yes"; + settings_autosave = "no"; # use_proxy = "no"; # proxy_address = "127.0.0.1"; # proxy_port = "9050"; # proxy_string = "CONNECT %s:%d HTTP/1.0\012\012"; # proxy_string_after = "conn %s %d"; - # proxy_password = ""; - # recode_transliterate = "no"; + # proxy_password = ""; #pragma: allowlist secret }; "fe-common/core" = { theme = "solarized-powerline"; @@ -615,9 +677,9 @@ settings = { }; "fe-text" = { actlist_sort = "refnum"; - # scrollback_lines = "1000"; - # scrollback_time = "3days"; - # scrollback_max_age = "0"; + scrollback_lines = "1000"; + scrollback_time = "3days"; + scrollback_max_age = "0"; }; "perl/core/scripts" = { # adv_windowlist.pl @@ -639,12 +701,12 @@ settings = { usercount_show_zero = "ON"; # timezones timezones_divider = " %Zeeeeee%Z008080 "; - timezones = "GMT:GMT EST:EST CET:CET Tehran:Asia/Tehran Tokyo:Asia/Tokyo Montreal:America/Montreal Pacific:America/Los_Angeles Paris:Europe/Paris"; + timezones = "GMT:GMT EST:EST EEST:Europe/Riga CET:CET Tehran:Asia/Tehran Tokyo:Asia/Tokyo Montreal:America/Montreal Pacific:America/Los_Angeles Paris:Europe/Paris Moscow:Europe/Moscow"; # hilite_url url_color = "32"; hilite_url = "32"; # rotator - rotator_chars = "%Z005f5f%z005f5f%k..%N %Z005f5f%z005f5f%koo%N %Z005f5f%z005f5f%k00%N %Z005f5f%z005f5f%kOO%N %Z005f5f%z005f5f%k00%N %Z005f5f%z005f5f%koo%N"; + rotator_chars = "%Z005f5f%z005f5f%k...%N %Z005f5f%z005f5f%kooo%N %Z005f5f%z005f5f%k000%N %Z005f5f%z005f5f%kOOO%N %Z005f5f%z005f5f%k000%N %Z005f5f%z005f5f%kooo%N %Z005f5f%z005f5f%k...%N"; rotator_speed = "1000"; rotator_bounce = "yes"; rotator_seperator = " "; @@ -652,8 +714,10 @@ settings = { dccstat_hide_sbar_when_inactive = "no"; dccstat_cycle_through_transfers = "yes"; # uberprmpt - uberprompt_format = "%k%z005f87%9$c $*%w%k$R%w%k$S%w%k$N%w%k$T %N%Z005f87%Z005f5f$uber"; - uberprompt_format_empty = "%k%z005f87%9$c $*%w%k$R%w%k$S%w%k$N%w%k$T %N%Z005f87%Z005f5f$uber"; + # uberprompt_format = "%k%z005f87%9$c $*%w%k$R%w%k$S%w%k$T %N%Z005f87%Z005f5f$uber"; + # uberprompt_format_empty = "%k%z005f87%9$c $*%w%k$R%w%k$S%w%k$T %N%Z005f87%Z005f5f$uber"; + uberprompt_format = "%Zff5f5f$T >>>$uber"; + uberprompt_format_empty = "%Zff5f5f$T >>>$uber"; # irssi_logger il_dbname = "irc"; il_dbuser = "postgres"; @@ -712,6 +776,8 @@ keyboard = ( { key = "meta-,"; id = "change_window"; data = "38"; }, { key = "meta-."; id = "change_window"; data = "39"; }, { key = "meta-/"; id = "change_window"; data = "40"; }, + { key = "meta2-1"; id = "change_window"; data = "41"; }, + { key = "meta2-2"; id = "change_window"; data = "42"; }, ); ignores = ( { level = "JOINS PARTS QUITS NICKS"; channels = ( "#docker" ); }, @@ -740,7 +806,7 @@ ignores = ( { level = "JOINS PARTS QUITS NICKS"; channels = ( "#git" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#voidlinux" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#openwrt" ); }, - { + { level = "JOINS PARTS QUITS NICKS"; channels = ( "#debian-next" ); }, @@ -751,7 +817,7 @@ ignores = ( { level = "JOINS PARTS QUITS NICKS"; channels = ( "#linux" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#shadow" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#tor" ); }, - { + { level = "JOINS PARTS QUITS NICKS"; channels = ( "#CataclysmDDA" ); }, @@ -759,6 +825,8 @@ ignores = ( { level = "JOINS PARTS QUITS NICKS"; channels = ( "#busybox" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#bookz" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#qubes" ); }, + { level = "JOINS PARTS QUITS NICKS"; channels = ( "#wayland" ); }, + { level = "JOINS PARTS QUITS NICKS"; channels = ( "#gopher" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#gnupg" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#supersonic" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#news" ); }, @@ -773,7 +841,7 @@ ignores = ( { level = "JOINS PARTS QUITS NICKS"; channels = ( "#crxn" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#meta" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#python" ); }, - { + { level = "JOINS PARTS QUITS NICKS"; channels = ( "#qutebrowser" ); }, @@ -782,7 +850,7 @@ ignores = ( { level = "JOINS PARTS QUITS NICKS"; channels = ( "#gemini" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#llvm" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#opennic" ); }, - { + { level = "JOINS PARTS QUITS NICKS"; channels = ( "#selfhosting" ); }, @@ -797,7 +865,7 @@ windows = { 2 = { immortal = "yes"; name = "(notices)"; - level = "MSGS NOTICES SNOTES WALLOPS INVITES"; + level = "MSGS NOTICES SNOTES WALLOPS INVITES CLIENTNOTICE CLIENTCRAP CLIENTERROR CTCPS ACTIONS MODES TOPICS DCC DCCMSGS"; }; 3 = { items = ( @@ -812,26 +880,46 @@ windows = { 4 = { items = ( { - type = "CHANNEL"; + type = "QUERY"; chat_type = "IRC"; - name = "#general"; - tag = "BonoboNET_LOKI"; + name = "*status"; + tag = "Undernet-ZNC"; } ); }; 5 = { items = ( { - type = "QUERY"; + type = "CHANNEL"; chat_type = "IRC"; - name = "*status"; - tag = "Undernet-ZNC"; + name = "#sopelbot"; + tag = "devinet"; + } + ); + }; + 6 = { + items = ( + { + type = "CHANNEL"; + chat_type = "IRC"; + name = "#rss"; + tag = "devinet"; + } + ); + }; + 7 = { + items = ( + { + type = "CHANNEL"; + chat_type = "IRC"; + name = "#general"; + tag = "Bonobonet_ZNC"; } ); }; }; mainwindows = { - 3 = { + 3 = { first_line = "1"; lines = "47"; first_column = "0"; diff --git a/irssi/docker-compose.yaml b/irssi/docker-compose.yaml new file mode 100644 index 0000000..af820d8 --- /dev/null +++ b/irssi/docker-compose.yaml @@ -0,0 +1,59 @@ +version: "3.8" +services: + irssi: + image: devi_irssi + build: + context: . + networks: + - irssinet + restart: unless-stopped + user: ${UID:-1000}:${GID:-1000} + volumes: + - /home/devi/.irssi-home:/home/user:ro + - /etc/localtime:/etc/localtime:ro + - /home/devi/.irssi-home/.irssi/otr:/home/user/.irssi/otr:ro + environment: + - TERM=screen-256color + - COLORTERM=truecolor + - HTTP_PROXY=http://host.docker.internal:8118 + - HTTPS_PROXY=http://host.docker.internal:8118 + - ALL_PROXY=socks5h://host.docker.internal:9969 + - NO_PROXY=localhost,127.0.0.0/8,[::1],192.168.0.0/24,172.16.0.0/16,10.0.0.0/8 + runtime: runsc + extra_hosts: + - "host.docker.internal:host-gateway" + depends_on: + - pantalaimon + cap_drop: + - ALL + cap_add: + - NET_BIND_SERVICE + - SET_GID + - SET_UID + - DAC_OVERRIDE + pantalaimon: + image: matrixdotorg/pantalaimon:v0.10.5 + networks: + - irssinet + restart: unless-stopped + user: ${UID:-1000}:${GID:-1000} + volumes: + - ./pantalaimon.conf:/home/pantalaimon/.config/pantalaimon/pantalaimon.conf:ro + environment: + - HTTP_PROXY=http://host.docker.internal:8118 + - HTTPS_PROXY=http://host.docker.internal:8118 + - ALL_PROXY=http://host.docker.internal:8118 + - NO_PROXY=localhost, 127.0.0.0/8,[::1],192.168.0.0/24,172.16.0.0/24,10.0.0.0/8 + runtime: runsc + extra_hosts: + - "host.docker.internal:host-gateway" + cap_drop: + - ALL + cap_add: + - NET_BIND_SERVICE + - SET_GID + - SET_UID + - DAC_OVERRIDE + - CHOWN +networks: + irssinet: diff --git a/irssi/otr_powerline.diff b/irssi/otr_powerline.diff new file mode 100644 index 0000000..6b7e334 --- /dev/null +++ b/irssi/otr_powerline.diff @@ -0,0 +1,21 @@ +diff --git a/src/otr/otr-formats.c b/src/otr/otr-formats.c +index d4d273d1..195011d5 100644 +--- a/src/otr/otr-formats.c ++++ b/src/otr/otr-formats.c +@@ -28,11 +28,11 @@ FORMAT_REC fe_otr_formats[] = { + /* Status bar format. */ + { NULL, "OTR Statusbar", 0 }, + +- { "otr_stb_plaintext", "{sb plaintext}", 0}, +- { "otr_stb_finished", "{sb %yfinished%n}", 0}, +- { "otr_stb_unknown", "{sb {hilight state unknown (BUG!)}}", 0}, +- { "otr_stb_untrusted", "{sb %GOTR%n (%runverified%n)}", 0}, +- { "otr_stb_trust", "{sb %GOTR%n}", 0}, ++ { "otr_stb_plaintext", "{sb %0%Zff8700%zff8700%k plaintext $0 %Zff8700%0%N}", 0}, ++ { "otr_stb_finished", "{sb %0%Z5f8700%z5f8700%k finished $0 %Z5f8700%0%N}", 0}, ++ { "otr_stb_unknown", "{sb %0%Zff005f%zff005f%k OTR:unknown_state(bug) $0 %Zff005f%0%N}", 0}, ++ { "otr_stb_untrusted", "{sb %0%Zff8700%zff8700%k OTR:unverified $0 %Zff8700%0%N}", 0}, ++ { "otr_stb_trust", "{sb %0%Z5f875f%z5f875f%k OTR $0 %Z5f875f%0%N}", 0}, + + /* OTR format. */ + { NULL, "OTR", 0 }, diff --git a/irssi/pantalaimon.conf b/irssi/pantalaimon.conf new file mode 100644 index 0000000..4af899d --- /dev/null +++ b/irssi/pantalaimon.conf @@ -0,0 +1,13 @@ +[Default] +LogLevel = Debug +Notifications = On + +[DeviMatrix] +Homeserver = https://matrix.terminaldweller.com +ListenAddress = 0.0.0.0 +ListenPort = 8009 +Proxy = http://host.docker.internal:8118 +SSL = True +IgnoreVerification = False +UseKeyring = False +DropOldKeys = False diff --git a/irssi/proxychains.conf b/irssi/proxychains.conf index 2a19d56..3f62aa8 100644 --- a/irssi/proxychains.conf +++ b/irssi/proxychains.conf @@ -65,4 +65,4 @@ localnet 127.0.0.0/255.0.0.0 # add proxy here ... # meanwile # defaults set to "tor" -socks5 192.168.1.214 9995 +socks5 192.168.1.214 9969 diff --git a/irssi/solarized-powerline.theme b/irssi/solarized-powerline.theme index 7a3772e..b3b1f09 100644 --- a/irssi/solarized-powerline.theme +++ b/irssi/solarized-powerline.theme @@ -144,7 +144,7 @@ abstracts = { ## # the basic styling of how to print message, $0 = nick mode, $1 = nick - msgnick = "%z005f87%Zeeeeee $0%Zeeeeee{nick $1-} %Z005f5f"; + msgnick = "%m%Zeeeeee$0{nick $1-}%N%m%0%Z005f5f"; # message from you is printed. "msgownnick" specifies the styling of the # nick ($0 part in msgnick) and "ownmsgnick" specifies the styling of the @@ -173,7 +173,7 @@ abstracts = { # public message in channel meant for me, $0 = nick mode, $1 = nick # %5 = magenta - pubmsgmenick = "%K%m%5%k%Z0087ff{msgnick $0$1-}%N%m %Z005f5f"; + pubmsgmenick = "%m%5%k{msgnick $0$1-}%N%m %Z005f5f"; menick = "%Zeeeeee$* %Z005f5f"; # public highlighted message in channel @@ -395,7 +395,7 @@ abstracts = { # $4 = to/from # $5 = nick sb_ds_normal_waiting = "$0 $1: '$2' $3 $4 $5 waiting"; - sb_ds_separator = ", "; + sb_ds_separator = " "; }; formats = { @@ -438,10 +438,10 @@ formats = { end_of_who = "%z00d700%kWHO %Z00d700%0%N END"; end_of_whois = "%z00d700%kWHOIS %Z00d700%0%N END"; end_of_whowas = "%z00d700%kWHOWAS %Z00d700%0%N END"; - netsplit = "%0%Z8787ff%z8787ff%k NETSPLIT %z8787ff%Z00d700%z00d700%k {iserver $0} {iserver $1} %Z00d700%0%Z8787ff Quits: $2"; + netsplit = "%0%Z8787ff%z8787ff%k NETSPLIT %z8787ff%Z00af00%z00af00%k {iserver $0} {iserver $1} %Z00af00%0%Z8787ff Quits: $2"; netsplit_join = "%k%z8787ff NETSPLIT %k%8%N Joins: $0"; netsplit_join_more = "%k%z8787ff NETSPLIT %k%8%N Joins: $0 (+$1 more)"; - netsplit_more = "%k%z8787ff%8%8 NETSPLIT %0%w%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N Quits: $2 (+$3 more, use /NETSPLIT to show all of them)"; + netsplit_more = "%0%Z8787ff%z8787ff%k NETSPLIT %z8787ff%Z00af00%z00af00%k {iserver $0} {iserver $1} %Z00af00%0%Z8787ff Quits: $2 (+$3 more, use /NETSPLIT to show all of them)"; no_topic = "%k%N No topic set for {channelhilight $0}"; own_ctcp = "%k%z005f87 CTCP {hilight $2-} {inick $0} %n%Z005f87%N"; server_chanmode_change = "%k%z8787ff SERVERMODE %k%8 {channelhilight $0} {mode $1} by {nick $2}"; @@ -453,26 +453,26 @@ formats = { whois = "%z00d700%kWHOIS %Z00d700%z005f87 {nick $0} %Z005f87%0 {nickhost $1@$2}%:{whois ircname $3}"; whowas = "%z00d700%kWHOWAS %Z00d700%z005f87 {nick $0} %Z005f87%0 {nickhost $1@$2}%:{whois was $3}"; own_action = "$nickalign{ownaction $0$nicktrunc}$1"; - action_private = "$nickalign{pvtaction $[.10]0$nicktrunc}$2"; - action_private_query = "$nickalign{pvtaction_query $[.10]0$nicktrunc}$2"; - action_public = "$nickalign{pubaction $[.10]0$nicktrunc}$1"; + action_private = "$nickalign{pvtaction $[.15]0$nicktrunc}$2"; + action_private_query = "$nickalign{pvtaction_query $[.15]0$nicktrunc}$2"; + action_public = "$nickalign{pubaction $[.15]0$nicktrunc}$1"; }; "Irssi::Script::adv_windowlist" = { awl_display_header = ""; - awl_display_key = " %0$N $H$C$S %n"; - awl_display_key_active = "%9%W%Z005f00%0%8 %0$N $H$C$S%8 %0%8%8%n"; - awl_display_key_visible = "%Z005fff %m$N %k $H$C$S %8%8%n"; - awl_display_nokey = " %0$N %U$C%U %n"; - awl_display_nokey_active = "%k%z005f87 %k$N %k %U$C%U %8%8%n"; - awl_display_nokey_visible = "%k%z5f5fff %m$N %k %U$C%U %8%8%n"; + awl_display_key = "%0%Z005fff$N $H[$Q]$C$S %N"; + awl_display_key_active = "%9%k%z005f00 $N $H[$Q]$C$S %N%Z005f00%N"; + awl_display_key_visible = "%k%z005fff $N $H[$Q]$C$S %N%Z005fff%N"; + awl_display_nokey = "%0%Z005faf$N $H[$Q]$C$S %N"; + awl_display_nokey_active = "%9%k%z005f87 $N $H[$Q]$C$S %N%Z005f87%N"; + awl_display_nokey_visible ="%k%z005fff $N $H[$Q]$C$S %N%Z005fff%N"; awl_separator = ""; }; "Irssi::Script::usercount" = { - sb_usercount = "%z00af5f{sb $0 nicks ($1-)}"; - sb_uc_ircops = "%z00d787*$*"; - sb_uc_ops = "%z00d787@$*"; - sb_uc_halfops = "%z00d787%%$*"; - sb_uc_voices = "%z00af5f+$*"; + sb_usercount = "%9%z00af5f{sb $0 nicks ($1-)}"; + sb_uc_ircops = "%9%z00d787*$*"; + sb_uc_ops = "%9%z00d787@$*"; + sb_uc_halfops = "%9%z00d787%%$*"; + sb_uc_voices = "%9%z00af5f+$*"; sb_uc_normal = "$*"; sb_uc_space = " "; }; @@ -487,5 +487,13 @@ formats = { mh_sbsplitmode_info = "%Zaf5f87{server $0} $1 {hilight splitmode}"; mh_sbsplitmode_info_details = "%Zaf5f87{server $0} $1 {hilight splitmode} {comment $2}"; mh_sbsplitmode_error = "%Zaf5f87{error $0}"; - } + }; + "otr/core" = { + otr_stb_plaintext = "{sb %yplaintext%N}"; + otr_stb_finished = "{sb %yfinished%n}"; + otr_stb_unknown = "{sb {hilight state unknown (BUG!)}}"; + otr_stb_untrusted = "{sb %pOTR%n (%runverified%n)}"; + otr_stb_trust = "{sb %GOTR%n}"; + + }; }; |