updates

6 files changed, 25 insertions, 262 deletions

diff --git a/.Xresources b/.Xresources
index 8400303..f3a9b93 100644
--- a/.Xresources
+++ b/.Xresources
@@ -22,7 +22,7 @@ xterm*scaleHeight: 1.01
 #define base05 #75507B
 #define base06 #06989A
 #define base07 #D3D7CF
-#define base08 #000000
+#define base08 #767676
 #define base09 #EF2929
 #define base0A #8AE234
 #define base0B #FCE94F
diff --git a/.zshenv b/.zshenv
index 414c3bc..1afbcd2 100644
--- a/.zshenv
+++ b/.zshenv
@@ -1,2 +1,4 @@
-source "$HOME/.cargo/env"
+. "$HOME/.cargo/env"
 skip_global_compinit=1
+PYPI_PASSWORD=""
+PYPI_USERNAME="__token__"
diff --git a/.zshrc b/.zshrc
index e066ee4..5e982bd 100644
--- a/.zshrc
+++ b/.zshrc
@@ -130,7 +130,7 @@ alias jupyterlab="jupyter lab --no-browser --port 9989"
 alias iredisrc="vim ~/scripts/.iredisrc"
 alias fixiredisrc="cp ~/scripts/.iredisrc ~/.iredisrc"
 # alias irssi="irssi -n terminaldweller"
-alias irssi="TERM=screen-256color docker run --runtime=runsc -it -e TERM -u $(id -u):$(id -g) --log-driver=none -v $HOME/.irssi:/home/user/.irssi:ro -v /etc/localtime:/etc/localtime:ro devi_irssi"
+alias irssi="TERM=screen-256color docker run --runtime=runsc -it -e TERM -u $(id -u):$(id -g) --log-driver=none -v $HOME/.irssi:/home/user/.irssi:ro -v /etc/localtime:/etc/localtime:ro bloodstalker/irssi:latest"
 alias joplinkeymap="vim ~/scripts/.config/joplin/keymap.json"
 alias fixjoplinkeymap="cp ~/scripts/.config/joplin/keymap.json ~/.config/joplin/keymap.json"
 alias postitrc="vim ~/scripts/postit"
@@ -185,8 +185,8 @@ alias inputrc="vim ~/scripts/.inputrc"
 alias fixinputrc="cp ~/scripts/.inputrc ~/.inputrc"
 alias gdbinit="vim ~/scripts/.gdbinit"
 alias fixgdbinit="cp ~/scripts/.gdbinit ~/.gdbinit"
-alias d="docker"
-alias dc="docker-compose"
+alias d="https_proxy=socks5://[::1]:9993 docker"
+alias dc="https_proxy=socks5://[::1]:9993 docker-compose"
 alias zh_freebsd="zssh dev@192.168.90.15"
 alias zh_linux="zssh dev@192.168.90.17"
 alias zh_router_root="zssh root@192.168.90.71"
@@ -230,6 +230,8 @@ alias socat="socat -d -d"
 alias cmusrc="vim ~/scripts/.config/cmus/rc"
 alias fixcmusrc="cp ~/scripts/.config/cmus/rc ~/.config/cmus/rc"
 # alias cointop="ssh -oHostKeyAlgorithms=+ssh-rsa cointop@185.112.147.110 -p 2222 -t cointop --colorscheme devi"
+alias zshenv="vim ~/scripts/.zshenv"
+alias fixzshenv="cp ~/scripts/.zshenv ~/.zshenv"
 
 #autosuggest
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#5f5fff,bg=#000000,bold,underline"
diff --git a/ipv6/torrc b/ipv6/torrc
index 4fc242f..4b24a79 100644
--- a/ipv6/torrc
+++ b/ipv6/torrc
@@ -1,259 +1,6 @@
-# vi: set syntax=config :
-## Configuration file for a typical Tor user
-## Last updated 28 February 2019 for Tor 0.3.5.1-alpha.
-## (may or may not work for much older or much newer versions of Tor.)
-##
-## Lines that begin with "## " try to explain what's going on. Lines
-## that begin with just "#" are disabled commands: you can enable them
-## by removing the "#" symbol.
-##
-## See 'man tor', or https://www.torproject.org/docs/tor-manual.html,
-## for more options you can use in this file.
-##
-## Tor will look for this file in various places based on your platform:
-## https://www.torproject.org/docs/faq#torrc
-
-# ControlSocket /run/tor/control
-# ControlSocketsGroupWritable 1
-# CookieAuthentication 1
-# CookieAuthFile /run/tor/control.authcookie
-# CookieAuthFileGroupReadable 1
-
-## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't
-## configure one below. Set "SOCKSPort 0" if you plan to run Tor only
-## as a relay, and not make any local application connections yourself.
-##SOCKSPort [::1]:9050 # Default: Bind to localhost:9050 for local connections.
-#SOCKSPort 192.168.0.1:9100 # Bind to this address:port too.
-SOCKSPort 0
-
-## Entry policies to allow/deny SOCKS requests based on IP address.
-## First entry that matches wins. If no SOCKSPolicy is set, we accept
-## all (and only) requests that reach a SOCKSPort. Untrusted users who
-## can access your SOCKSPort may be able to learn about the connections
-## you make.
-#SOCKSPolicy accept 192.168.0.0/16
-#SOCKSPolicy accept6 FC00::/7
-#SOCKSPolicy reject *
-
-## Logs go to stdout at level "notice" unless redirected by something
-## else, like one of the below lines. You can have as many Log lines as
-## you want.
-##
-## We advise using "notice" in most cases, since anything more verbose
-## may provide sensitive information to an attacker who obtains the logs.
-##
-## Send all messages of level 'notice' or higher to /var/log/tor/notices.log
-#Log notice file /var/log/tor/notices.log
-## Send every possible message to /var/log/tor/debug.log
-#Log debug file /var/log/tor/debug.log
-## Use the system log instead of Tor's logfiles
-#Log notice syslog
-## To send all messages to stderr:
-#Log debug stderr
-
-## Uncomment this to start the process in the background... or use
-## --runasdaemon 1 on the command line. This is ignored on Windows;
-## see the FAQ entry if you want Tor to run as an NT service.
-#RunAsDaemon 1
-
-## The directory for keeping all the keys/etc. By default, we store
-## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-#DataDirectory /var/lib/tor
-
-## The port on which Tor will listen for local connections from Tor
-## controller applications, as documented in control-spec.txt.
-ControlPort 9051
-## If you enable the controlport, be sure to enable one of these
-## authentication methods, to prevent attackers from accessing it.
-# HashedControlPassword 16:872860B76453A77D60CA2BB8C1A7042072093276A3D701AD684053EC4C
 CookieAuthentication 1
-
-############### This section is just for location-hidden services ###
-
-## Once you have configured a hidden service, you can look at the
-## contents of the file ".../hidden_service/hostname" for the address
-## to tell people.
-##
-## HiddenServicePort x y:z says to redirect requests on port x to the
-## address y:z.
-
-#HiddenServiceDir /var/lib/tor/hidden_service/
-#HiddenServicePort 80 127.0.0.1:80
-
-#HiddenServiceDir /var/lib/tor/other_hidden_service/
-#HiddenServicePort 80 127.0.0.1:80
-#HiddenServicePort 22 127.0.0.1:22
-
-################ This section is just for relays #####################
-#
-## See https://www.torproject.org/docs/tor-doc-relay for details.
-
-## Required: what port to advertise for incoming Tor connections.
-#ORPort 9001
-## If you want to listen on a port other than the one advertised in
-## ORPort (e.g. to advertise 443 but bind to 9090), you can do it as
-## follows.  You'll need to do ipchains or other port forwarding
-## yourself to make this work.
-#ORPort 443 NoListen
-#ORPort 127.0.0.1:9090 NoAdvertise
-
-## The IP address or full DNS name for incoming connections to your
-## relay. Leave commented out and Tor will guess.
-#Address noname.example.com
-
-## If you have multiple network interfaces, you can specify one for
-## outgoing traffic to use.
-## OutboundBindAddressExit will be used for all exit traffic, while
-## OutboundBindAddressOR will be used for all OR and Dir connections
-## (DNS connections ignore OutboundBindAddress).
-## If you do not wish to differentiate, use OutboundBindAddress to
-## specify the same address for both in a single line.
-#OutboundBindAddressExit 10.0.0.4
-#OutboundBindAddressOR 10.0.0.5
-
-## A handle for your relay, so people don't have to refer to it by key.
-## Nicknames must be between 1 and 19 characters inclusive, and must
-## contain only the characters [a-zA-Z0-9].
-## If not set, "Unnamed" will be used.
-#Nickname ididnteditheconfig
-
-## Define these to limit how much relayed traffic you will allow. Your
-## own traffic is still unthrottled. Note that RelayBandwidthRate must
-## be at least 75 kilobytes per second.
-## Note that units for these config options are bytes (per second), not
-## bits (per second), and that prefixes are binary prefixes, i.e. 2^10,
-## 2^20, etc.
-#RelayBandwidthRate 100 KBytes  # Throttle traffic to 100KB/s (800Kbps)
-#RelayBandwidthBurst 200 KBytes # But allow bursts up to 200KB (1600Kb)
-
-## Use these to restrict the maximum traffic per day, week, or month.
-## Note that this threshold applies separately to sent and received bytes,
-## not to their sum: setting "40 GB" may allow up to 80 GB total before
-## hibernating.
-##
-## Set a maximum of 40 gigabytes each way per period.
-#AccountingMax 40 GBytes
-## Each period starts daily at midnight (AccountingMax is per day)
-#AccountingStart day 00:00
-## Each period starts on the 3rd of the month at 15:00 (AccountingMax
-## is per month)
-#AccountingStart month 3 15:00
-
-## Administrative contact information for this relay or bridge. This line
-## can be used to contact you if your relay or bridge is misconfigured or
-## something else goes wrong. Note that we archive and publish all
-## descriptors containing these lines and that Google indexes them, so
-## spammers might also collect them. You may want to obscure the fact that
-## it's an email address and/or generate a new address for this purpose.
-##
-## If you are running multiple relays, you MUST set this option.
-##
-#ContactInfo Random Person <nobody AT example dot com>
-## You might also include your PGP or GPG fingerprint if you have one:
-#ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>
-
-## Uncomment this to mirror directory information for others. Please do
-## if you have enough bandwidth.
-#DirPort 9030 # what port to advertise for directory connections
-## If you want to listen on a port other than the one advertised in
-## DirPort (e.g. to advertise 80 but bind to 9091), you can do it as
-## follows.  below too. You'll need to do ipchains or other port
-## forwarding yourself to make this work.
-#DirPort 80 NoListen
-#DirPort 127.0.0.1:9091 NoAdvertise
-## Uncomment to return an arbitrary blob of html on your DirPort. Now you
-## can explain what Tor is if anybody wonders why your IP address is
-## contacting them. See contrib/tor-exit-notice.html in Tor's source
-## distribution for a sample.
-#DirPortFrontPage /etc/tor/tor-exit-notice.html
-
-## Uncomment this if you run more than one Tor relay, and add the identity
-## key fingerprint of each Tor relay you control, even if they're on
-## different networks. You declare it here so Tor clients can avoid
-## using more than one of your relays in a single circuit. See
-## https://www.torproject.org/docs/faq#MultipleRelays
-## However, you should never include a bridge's fingerprint here, as it would
-## break its concealability and potentially reveal its IP/TCP address.
-##
-## If you are running multiple relays, you MUST set this option.
-##
-## Note: do not use MyFamily on bridge relays.
-#MyFamily $keyid,$keyid,...
-
-## Uncomment this if you want your relay to be an exit, with the default
-## exit policy (or whatever exit policy you set below).
-## (If ReducedExitPolicy, ExitPolicy, or IPv6Exit are set, relays are exits.
-## If none of these options are set, relays are non-exits.)
-#ExitRelay 1
-
-## Uncomment this if you want your relay to allow IPv6 exit traffic.
-## (Relays do not allow any exit traffic by default.)
-#IPv6Exit 1
-
-## Uncomment this if you want your relay to be an exit, with a reduced set
-## of exit ports.
-#ReducedExitPolicy 1
-
-## Uncomment these lines if you want your relay to be an exit, with the
-## specified set of exit IPs and ports.
-##
-## A comma-separated list of exit policies. They're considered first
-## to last, and the first match wins.
-##
-## If you want to allow the same ports on IPv4 and IPv6, write your rules
-## using accept/reject *. If you want to allow different ports on IPv4 and
-## IPv6, write your IPv6 rules using accept6/reject6 *6, and your IPv4 rules
-## using accept/reject *4.
-##
-## If you want to _replace_ the default exit policy, end this with either a
-## reject *:* or an accept *:*. Otherwise, you're _augmenting_ (prepending to)
-## the default exit policy. Leave commented to just use the default, which is
-## described in the man page or at
-## https://www.torproject.org/documentation.html
-##
-## Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
-## for issues you might encounter if you use the default exit policy.
-##
-## If certain IPs and ports are blocked externally, e.g. by your firewall,
-## you should update your exit policy to reflect this -- otherwise Tor
-## users will be told that those destinations are down.
-##
-## For security, by default Tor rejects connections to private (local)
-## networks, including to the configured primary public IPv4 and IPv6 addresses,
-## and any public IPv4 and IPv6 addresses on any interface on the relay.
-## See the man page entry for ExitPolicyRejectPrivate if you want to allow
-## "exit enclaving".
-##
-#ExitPolicy accept *:6660-6667,reject *:* # allow irc ports on IPv4 and IPv6 but no more
-#ExitPolicy accept *:119 # accept nntp ports on IPv4 and IPv6 as well as default exit policy
-#ExitPolicy accept *4:119 # accept nntp ports on IPv4 only as well as default exit policy
-#ExitPolicy accept6 *6:119 # accept nntp ports on IPv6 only as well as default exit policy
-#ExitPolicy reject *:* # no exits allowed
-
-## Bridge relays (or "bridges") are Tor relays that aren't listed in the
-## main directory. Since there is no complete public list of them, even an
-## ISP that filters connections to all the known Tor relays probably
-## won't be able to block all the bridges. Also, websites won't treat you
-## differently because they won't know you're running Tor. If you can
-## be a real relay, please do; but if not, be a bridge!
-##
-## Warning: when running your Tor as a bridge, make sure than MyFamily is
-## NOT configured.
-#BridgeRelay 1
-## By default, Tor will advertise your bridge to users through various
-## mechanisms like https://bridges.torproject.org/. If you want to run
-## a private bridge, for example because you'll give out your bridge
-## address manually to your friends, uncomment this line:
-#PublishServerDescriptor 0
-
-## Configuration options can be imported from files or folders using the %include
-## option with the value being a path. If the path is a file, the options from the
-## file will be parsed as if they were written where the %include option is. If
-## the path is a folder, all files on that folder will be parsed following lexical
-## order. Files starting with a dot are ignored. Files on subfolders are ignored.
-## The %include option can be used recursively.
-#%include /etc/torrc.d/
-#%include /etc/torrc.custom
+ControlPort 9052
+SOCKSPort 0
 ClientUseIPv4 0
 ClientUseIPv6 1
 ClientPreferIPv6ORPort 1
diff --git a/irssi/Dockerfile b/irssi/Dockerfile
index 7b4147a..c71dc17 100644
--- a/irssi/Dockerfile
+++ b/irssi/Dockerfile
@@ -1,6 +1,14 @@
 # https://github.com/jessfraz/irssi
-FROM alpine:3.13
+# For the time being we have build on alpine:edge since perl::Glib::Object::Introspection is only available on edge/testing
+FROM alpine:edge
+# https://georgik.rocks/how-to-start-d-bus-in-docker-container/
+# apk add dbus dbus-x11
+# dbus-uuidgen > /var/lib/dbus/machine-id
+# mkdir -p /var/run/dbus
+# dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address
+# export $(dbus-launch)
 
+RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && apk update
 RUN apk add --no-cache \
     ca-certificates \
     perl-libwww
@@ -75,7 +83,8 @@ RUN set -eux; \
       | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
   )"; \
   apk add --no-network --virtual .irssi-rundeps $runDeps; \
-  apk add --no-cache perl-glib perl-datetime perl-dbi perl-dbd-pg perl-lwp-protocol-https proxychains-ng; \
+  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 libnotify; \
   apk del --no-network .build-deps; \
   \
 # basic smoke test
diff --git a/irssi/build_and_push.sh b/irssi/build_and_push.sh
new file mode 100755
index 0000000..eb12244
--- /dev/null
+++ b/irssi/build_and_push.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+https_proxy=socks5://[::1]:9993 docker buildx build --platform linux/amd64 --push -t bloodstalker/irssi .