merge

herbstluftwm/hl_panel_content.py

@@ -77,7 +77,7 @@ def bcw():
 def countdown():
         delta = datetime(year=2018,month=7,day=22,hour=20) - datetime.now()
         if delta.days > 1:
-            tmp = "{} von 180 Tagen bis Abgabe verbleibend".format(delta.days)
+            tmp = "{} von 150 Tagen bis Abgabe verbleibend".format(delta.days)
         else:
             tmp = "{}h bis BC Abgabe".format(delta.hours)
         tmp = hl_utils.color_panel(tmp,hl_utils.get_color(delta.days,0,180))

herbstluftwm/hl_status_deamon.py

@@ -219,7 +219,7 @@ def save():
             pr_acct_status()
             battery_status()
             ip_status()
-            cip_logins()
+            #cip_logins()
             trace_login()
             bc_words()
 

other/android.ovpn

@@ -0,0 +1,63 @@
+client
+dev athq_tun
+proto tcp
+remote atlantishq.de 7012
+resolv-retry infinite
+nobind
+
+dev-type tun
+
+user nobody
+group nogroup
+
+persist-key
+persist-tun
+
+redirect-gateway def1 ipv6
+
+<ca>
+-----BEGIN CERTIFICATE-----
+MIIE3zCCA8egAwIBAgIJAM8vSNpq9xgEMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD
+VQQGEwJERTEQMA4GA1UECBMHQmF2YXJpYTERMA8GA1UEBxMIRXJsYW5nZW4xEzAR
+BgNVBAoTCkF0bGFudGlzSFExDzANBgNVBAsTBlNoZXBweTEWMBQGA1UEAxMNQXRs
+YW50aXNIUSBDQTEQMA4GA1UEKRMHRWFzeVJTQTEhMB8GCSqGSIb3DQEJARYScm9v
+dEBhdGxhbnRpc2hxLmRlMB4XDTE4MDIwMjE2MjU0N1oXDTI4MDEzMTE2MjU0N1ow
+gaUxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdCYXZhcmlhMREwDwYDVQQHEwhFcmxh
+bmdlbjETMBEGA1UEChMKQXRsYW50aXNIUTEPMA0GA1UECxMGU2hlcHB5MRYwFAYD
+VQQDEw1BdGxhbnRpc0hRIENBMRAwDgYDVQQpEwdFYXN5UlNBMSEwHwYJKoZIhvcN
+AQkBFhJyb290QGF0bGFudGlzaHEuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDU79L+QNI//JK554RhXBeggwlMET5NWtrS1esbrWmJkO45XeSJkFXg
+ErxRYhYwaWIyyDTofuUTe7VqPEn4ggPsmyr699Qb+kNjsZxR6rsfloKK9InpbxP/
+PRY7fLrXxxy7WVvEpfQCD3+YcPP2o8zuxAezVHlBv0LnKyiiNe4orz66fozjMIEi
+X0TpB2RUvhJ/rLgPpMAi14BbSmJ6QUZfVxfxPqYZnoYJNc8mqIgxcDBWNvLeks7d
+l7ApIIyPrj15zuzRzMG04NraGpTyvylIsot50rqD9V0q9nwYwcgk63Ce/LPVlMfX
+PakfhqnDuATfnJSI7cLrFuENZWIxIeI5AgMBAAGjggEOMIIBCjAdBgNVHQ4EFgQU
+Fep/RRUuvVHekT6B7UeZ2JNu6YkwgdoGA1UdIwSB0jCBz4AUFep/RRUuvVHekT6B
+7UeZ2JNu6YmhgaukgagwgaUxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdCYXZhcmlh
+MREwDwYDVQQHEwhFcmxhbmdlbjETMBEGA1UEChMKQXRsYW50aXNIUTEPMA0GA1UE
+CxMGU2hlcHB5MRYwFAYDVQQDEw1BdGxhbnRpc0hRIENBMRAwDgYDVQQpEwdFYXN5
+UlNBMSEwHwYJKoZIhvcNAQkBFhJyb290QGF0bGFudGlzaHEuZGWCCQDPL0jaavcY
+BDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQChm0ZUUuU/kN5WscP7
+AhxkWSA/gMHSuv1NBpBw0hprflza5TweegKtYXqqHMevGivtUABaXdOPd+7tTXLb
+7dTJbCuN4hOjIi4rIikMNe1yyuYfLQ+boqSGASUqqqqrE+KL7l+pr++GlLFJeBzo
+t9JIRgwFqrlUdA2iz0DNBqDIiPjHT6+4Qiqkmc0H6JPVoMnZpCMwB/n4mXlcbHrE
+KJxWaoz93WxHizLbbwf8IQZPlh2AY3h91QsJk5X0tJig2+DSP+qr0QVqB5UA+r7M
+iv8uiEZQQDfcKaNd6pFmId27uY4rU24qpefqRSY0w7saQcegSDQ8y476YV+/Tc0E
+YqhM
+-----END CERTIFICATE-----
+</ca>
+
+# client cert
+<cert>
+</cert>
+
+# clientkey
+<key>
+</key>
+
+# require correct Extended Key Ussage
+remote-cert-tls server
+#route 10.0.0.0/8 metric 2
+
+cipher AES-256-CBC
+auth SHA512

zshrc

@@ -325,3 +325,5 @@ export PYTHONPATH=/home/cip/2013/ik15ydit/python-local
 alias -g atip="echo 93.104.211.59"
 alias atp="~/.config/playercount.py"
 alias mongo="LD_PRELOAD=/home/cip/2013/ik15ydit/libyaml-cpp.so.0.5 ~/mongo github"
+alias players='~/trash/test/test.py'
+alias cleanhistory="awk '{if (a[$0] < NR || a[$0] == 0){a[$0]=NR}}END{for (i in a){print a[i] " " i}}' file | sort -n | cut 1"