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

.gitignore

@@ -2,7 +2,9 @@
 *_old
 .nfs*
 *.log
+*.swp
 
+tubus/
 Florian_Hackenberger/
 Luminance/
 QtProject.conf
@@ -48,7 +50,24 @@ roxterm.sourceforge.net/
 SEGGER/
 sonata/
 spring
-tubus/
+agent_socket
+akonadi-firstrunrc
+akonadi_akonotes_resource_0rc
+akonadi_contacts_resource_0rc
+akonadi_davgroupware_resource_1rc
+akonadi_ical_resource_0rc
+akonadi_maildir_resource_0rc
+akonadi_newmailnotifier_agentrc
+dunst/
+emaildefaults
+emailidentities
+eventviewsrc
+herbstluftwm/__pycache__/
+korgacrc
+korganizerrc
+nohup.out
+specialmailcollectionsrc
+unity3d/tubus/
 user-dirs.dirs
 user-dirs.locale
 VirtualBox/

herbstluftwm/autostart

@@ -15,11 +15,16 @@ hc keyunbind --all
 pkill dunst
 pkill xautolock
 pkill -s 15 hl_pracct   #send SIGTERM for correct termination during write
+pkill ssh-agent         #correctly terminate the current agent
 
 #variables
 Mod=Mod4     # Use the super key as the main modifier
 
 ######### MACHINE SPECIFIC SETUP #########
+### All Machines ####
+if [ -f $HOME/.config/agent_socket ]; then
+    eval `ssh-agent -a /tmp/ssh-$(cat $HOME/.config/agent_socket)`
+fi
 ### Atlantis PC-specific setup ###
 if [[ "$HOST" == "atlantispc" ]]; then
     hc detect_monitors

radicale/config

@@ -0,0 +1,192 @@
+# -*- mode: conf -*-
+# vim:ft=cfg
+
+# Config file for Radicale - A simple calendar server
+#
+# Place it into /etc/radicale/config (global)
+# or ~/.config/radicale/config (user)
+#
+# The current values are the default ones
+
+
+[server]
+
+# CalDAV server hostnames separated by a comma
+# IPv4 syntax: address:port
+# IPv6 syntax: [address]:port
+# For example: 0.0.0.0:9999, [::]:9999
+# IPv6 adresses are configured to only allow IPv6 connections
+#hosts = 0.0.0.0:5232
+hosts = squarez.fauiwg.de:7000
+
+# Daemon flag
+#daemon = False
+
+# File storing the PID in daemon mode
+#pid =
+
+# SSL flag, enable HTTPS protocol
+ssl = False
+
+# SSL certificate path
+certificate = /home/sheppy/radicale/ssl/fauiwg_radicale.cert
+
+# SSL private key
+key = /home/sheppy/radicale/ssl/fauiwg_radicale.key
+
+# SSL Protocol used. See python's ssl module for available values
+protocol = TLSv1.2
+
+# Ciphers available. See python's ssl module for available ciphers
+#ciphers =
+
+# Reverse DNS to resolve client address in logs
+#dns_lookup = True
+
+# Root URL of Radicale (starting and ending with a slash)
+# base_prefix = /
+
+# Possibility to allow URLs cleaned by a HTTP server, without the base_prefix
+#can_skip_base_prefix = False
+
+# Message displayed in the client when a password is needed
+realm = fauiwg-caldav - Password Required
+
+
+[encoding]
+
+# Encoding for responding requests
+request = utf-8
+
+# Encoding for storing local collections
+stock = utf-8
+
+
+[well-known]
+
+# Path where /.well-known/caldav/ is redirected
+#caldav = ../../%(user)s/caldav/
+
+# Path where /.well-known/carddav/ is redirected
+#carddav = ../../%(user)s/carddav/
+
+
+[auth]
+
+# Authentication method
+# Value: None | htpasswd | IMAP | LDAP | PAM | courier | http | remote_user | custom
+type = htpasswd
+
+# Custom authentication handler
+#custom_handler =
+
+# Htpasswd filename
+htpasswd_filename = ~/radicale/htpasswd_users
+
+# Htpasswd encryption method
+# Value: plain | sha1 | ssha | crypt | bcrypt | md5
+htpasswd_encryption = bcrypt
+
+# LDAP server URL, with protocol and port
+#ldap_url = ldap://localhost:389/
+
+# LDAP base path
+#ldap_base = ou=users,dc=example,dc=com
+
+# LDAP login attribute
+#ldap_attribute = uid
+
+# LDAP filter string
+# placed as X in a query of the form (&(...)X)
+# example: (objectCategory=Person)(objectClass=User)(memberOf=cn=calenderusers,ou=users,dc=example,dc=org)
+# leave empty if no additional filter is needed
+#ldap_filter =
+
+# LDAP dn for initial login, used if LDAP server does not allow anonymous searches
+# Leave empty if searches are anonymous
+#ldap_binddn =
+
+# LDAP password for initial login, used with ldap_binddn
+#ldap_password =
+
+# LDAP scope of the search
+#ldap_scope = OneLevel
+
+# IMAP Configuration
+#imap_hostname = localhost
+#imap_port = 143
+#imap_ssl = False
+
+# PAM group user should be member of
+#pam_group_membership =
+
+# Path to the Courier Authdaemon socket
+#courier_socket =
+
+# HTTP authentication request URL endpoint
+#http_url =
+# POST parameter to use for username
+#http_user_parameter =
+# POST parameter to use for password
+#http_password_parameter =
+
+
+[git]
+
+# Git default options
+#committer = Radicale <radicale@example.com>
+
+
+[rights]
+
+# Rights backend
+# Value: None | authenticated | owner_only | owner_write | from_file | custom
+type = owner_only
+
+# Custom rights handler
+#custom_handler =
+
+# File for rights management from_file
+file = ~/radicale/user_rights
+
+
+[storage]
+
+# Storage backend
+# -------
+# WARNING: ONLY "filesystem" IS DOCUMENTED AND TESTED,
+#          OTHER BACKENDS ARE NOT READY FOR PRODUCTION.
+# -------
+# Value: filesystem | multifilesystem | database | custom
+type = filesystem
+
+# Custom storage handler
+#custom_handler =
+
+# Folder for storing local collections, created if not present
+filesystem_folder = ~/radicale/collections/
+
+# Database URL for SQLAlchemy
+# dialect+driver://user:password@host/dbname[?key=value..]
+# For example: sqlite:///var/db/radicale.db, postgresql://user:password@localhost/radicale
+# See http://docs.sqlalchemy.org/en/rel_0_8/core/engines.html#sqlalchemy.create_engine
+#database_url =
+
+
+[logging]
+
+# Logging configuration file
+# If no config is given, simple information is printed on the standard output
+# For more information about the syntax of the configuration file, see:
+# http://docs.python.org/library/logging.config.html
+config = ~/radicale/logging
+# Set the default logging level to debug
+debug = True
+# Store all environment variables (including those set in the shell)
+#full_environment = False
+
+
+[headers]
+
+# Additional HTTP headers
+# Access-Control-Allow-Origin = *

xconf/Xresources

@@ -2,3 +2,5 @@ URxvt.*.background: #000000
 URxvt.*.foreground: #EEEEEE
 URxvt.*.scrollBar: off
 URxvt.print-pipe: true
+
+URxvt.perl-ext-common: selection-to-clipboard

zshrc

@@ -1,3 +1,9 @@
+#### SET CONDITIONALS ####
+NO_LDPRELOAD=false
+if [[ $HOST == "squarez" ]]; then
+    NO_LDPRELOAD=true
+fi
+
 #### ZSH-INTERNAL ####
 ### HISTORY ###
 STSIZE=2000
@@ -6,13 +12,18 @@ HISTFILE=~/.config/zshhistory.log
 
 ### COLOR STDERR ###
 #legacy, this causes problems in output odering exec 2>>( while IFS='' read X; do print "\e[91m${X}\e[0m" > /dev/tty; done & )
-LD_PRELOAD="$HOME/.config/libcoloredstderr.so"
+if [[ $NO_LDPRELOAD == false ]]; then
-COLORED_STDERR_FDS=2,
+    LD_PRELOAD="$HOME/.config/libcoloredstderr.so"
-export LD_PRELOAD COLORED_STDERR_FDS
+    COLORED_STDERR_FDS=2,
+    export LD_PRELOAD COLORED_STDERR_FDS
+fi
 
 ### PROMT ###
 MAIN_PROMT_COLOR="green"
 USER_COLOR="yellow"
+if [[ $HOST == "squarez" ]]; then
+    USER_COLOR="cyan"
+fi
 if [[ $USER == "root" ]]; then
     USER_COLOR="red"
     MAIN_PROMT_COLOR="red"
@@ -48,6 +59,11 @@ bindkey '^R' history-incremental-pattern-search-backward
 zmodload zsh/complist #bessere listen
 autoload -Uz compinit; compinit #completioni
 
+### SSH-AGENT ###
+if [ -f $HOME/.config/agent_socket ]; then
+    export SSH_AUTH_SOCK=/tmp/ssh-$(cat $HOME/.config/agent_socket)
+fi
+
 ### UMASK ###
 umask 077
 
@@ -82,6 +98,7 @@ alias gadd="git add"
 if [[ $HOST =~ atlantis* ]]; then
     alias i3lock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png"
     alias hlock="i3lock --image=/home/ik15ydit/.config/i3lock/bg.png -t"
+    alias -g sq="sheppy@squarez.fauiwg.de"
 else
     alias transparent_xlock="xlock -mode blank -geometry 1x1"
 fi
@@ -96,7 +113,7 @@ if [[ $HOST =~ atlantis* ]]; then
     alias telegram='ssh uni -t "/proj/ciptmp/ik15ydit/Zeug/Telegram/tg/bin/telegram-cli -k tg-server.pub"'
     alias telegram-plain='ssh uni -t "/proj/ciptmp/ik15ydit/Zeug/Telegram/tg/bin/telegram-cli --disable-colors --disable-readline -k tg-server.pub"'
 
-    alias x='startx'
+    alias x='exec startx'
 else
     alias telegram='/proj/ciptmp/ik15ydit/Zeug/Telegram/tg/bin/telegram-cli -k tg-server.pub'
     alias burp=/home/cip/2013/ik15ydit/ciptmp/reps/WebScan/burpsuite/BurpSuiteFree
@@ -156,8 +173,8 @@ if [[ $HOST =~ faui* ]]; then
     alias mpstubs="cd /proj/ciptmp/ik15ydit/reps/mpstubs/"
     alias reps="cd /proj/ciptmp/ik15ydit/reps/"
     alias rudipub='cd /home/cip/2010/he29heri/pub/'
-    alias sudo="echo THIS IS THE CIP NOT YOUT COMPUTER!!!!! >&2"
+    alias sudo="echo THIS IS THE CIP NOT YOUR COMPUTER!!!!! >&2"
-    alias su="echo THIS IS THE CIP NOT YOUT COMPUTER!!!!! >&2"
+    alias su="echo THIS IS THE CIP NOT YOUR COMPUTER!!!!! >&2"
 fi
 ## MOUNTABLE CIP-SHORTCUTS ##
 if [[ $HOST =~ atlantis* ]]; then
@@ -198,12 +215,7 @@ alias l="ls -lh --color=auto"
 
 ## SSH-KEYS ##
 gitssh=~/.ssh/gitrsa
-function key(){
+alias gitkey="ssh-add $gitssh"
-        if [[ -z $SSH_AUTH_SOCK ]]; then 
-                eval `ssh-agent`
-        fi
-        ssh-add $gitssh
-}
 
 ## ROOT ##
 alias udev_reload="udevadm control --reload-rules && udevadm trigger" #reload all udevrules on the fly