Merge branch 'master' of gitlab.cs.fau.de:ik15ydit/config

.gitignore

@@ -1,10 +1,14 @@
 *.so
 .pyc
 *_old
-.nfs*
+*.pyc
+*.nfs*
 *.log
 *.swp
 *.cip
+panel_pid_*
+
+tor/
 
 tubus/
 Florian_Hackenberger/

herbstluftwm/panel_pid_atlantislaptop

@@ -1 +0,0 @@
-30403

htop/htoprc

@@ -0,0 +1,26 @@
+# Beware! This file is rewritten by htop when settings are changed in the interface.
+# The parser is also very primitive, and not human-friendly.
+fields=0 48 17 18 38 39 40 2 46 47 49 1 
+sort_key=46
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=1
+shadow_other_users=1
+show_thread_names=0
+show_program_path=1
+highlight_base_name=0
+highlight_megabytes=1
+highlight_threads=1
+tree_view=1
+header_margin=1
+detailed_cpu_time=0
+cpu_count_from_zero=0
+update_process_names=0
+account_guest_in_cpu_meter=0
+color_scheme=0
+delay=15
+left_meters=AllCPUs Memory Swap 
+left_meter_modes=1 1 1 
+right_meters=Tasks LoadAverage Uptime 
+right_meter_modes=2 2 2 

torbrowser/settings.json

@@ -1 +0,0 @@
-{"force_en-US": false, "modem_sound": false, "tor_socks_address": "tcp:127.0.0.1:9050", "installed": false, "download_over_tor": false, "mirror": "https://www.torproject.org/dist/", "tbl_version": "0.2.8"}

zshrc

@@ -284,13 +284,13 @@ alias pcolor='for i in {0..255} ; do printf "\x1b[38;5;${i}mcolour${i} "; if [[
 alias 'vpn?'='ps -ef | grep  openvpn | grep -v grep'
 alias telegram='\ssh telegram-sheppy@atlantishq.de -i ~/.ssh/telegram -t "~/tg/bin/telegram-cli"'
 alias x='exec startx'
+alias clear_swap="echo 'This can take serveral minutes if swap was full' &&sudo swapoff -a && sudo swapon -a"
 whateverprovides(){
     apt-file search --regexp "bin/$1""$"
 }
-export whateverprovide
+export whateverprovides
 
 ### COLOR SSH ###
-alias unfuck="printf '\033]708;black\007'"
 ssh_func(){
     printf '\033]708;red\007';
     /usr/bin/ssh $@;
@@ -298,9 +298,13 @@ ssh_func(){
 }
 alias ssh="ssh_func"
 
-### EXPERIMENTAL ###
+### Terminal Border-Colors ###
+alias mark_green="printf '\033]708;green\007';"
+alias mark_blue="printf '\033]708;blue\007';"
+alias mark_none="printf '\033]708;black\007'"
+
 ## kill all cip sessions except this pc ##
-genocide(){
+logout_all(){
     TMP=$(wget -q -O- --user cip --password $(cat $HOME/.config/herbstluftwm/password.cip) "https://atlantishq.de/cipactive/active_logins")
     echo $TMP | while read line; do
             if [[ $line != $HOST ]]; then
@@ -308,9 +312,7 @@ genocide(){
             fi
     done
 }
-export genocide
+export logout_all
 
+### EXPERIMENTAL ###
 alias insurgency_status="ssh insurgency@atlantishq.de -t /usr/local/bin/insurgency_rcon status"
-alias clear_swap="echo 'This can take serveral minutes if swap was full' &&sudo swapoff -a && sudo swapon -a"
-alias mark_green="printf '\033]708;green\007';"
-alias mark_blue="printf '\033]708;blue\007';"