Merge branch 'master' of http://zom.bi/git/madmaurice/configfiles

bspwm/.config/scripts/bar.sh

@@ -107,7 +107,7 @@ batterysymbol() {
 
 clock() {
     while true; do
-        info=$(date +"%d.%m. %H:%M")
+        info=$(date +"%d.%m. (%V) %H:%M")
         #Bad hack: convert to int to remove leading 0s
         seconds_to_wait=$[ 61 - $(date +"%S" | awk '{print int($0)}') ];
         if [ "$seconds_to_wait" -gt 10 ]; then

bspwm/.config/scripts/blurlock.sh

@@ -9,4 +9,10 @@
 #convert -brightness-contrast -50x-40 $TMP $TMP
 #scrot $TMP -e 'convert -resize 20% -fill "#282828" -colorize 50% -blur 0x1 -resize 500% $f '"$TMP"
 #convert -gravity Center -composite $TMP ~/.config/lock.png $TMP
+
+if [ -n "$(pgrep i3lock)" ]; then
+    echo "i3lock already running. Aborting" >&2
+    exit 1
+fi
+
 exec i3lock -u -i ~/.config/lockimage.png -c 000000

bspwm/.config/scripts/dmenu_run.sh

@@ -1,4 +1,7 @@
 #!/bin/sh
+
+set -e
+
 cachedir=${XDG_CACHE_HOME:-"$HOME/.cache"}
 if [ -d "$cachedir" ]; then
 	cache=$cachedir/dmenu_run

weechat/.weechat/irc.conf

@@ -1,223 +0,0 @@
-#
-# weechat -- irc.conf
-#
-
-[look]
-buffer_open_before_autojoin = on
-buffer_open_before_join = off
-buffer_switch_autojoin = on
-buffer_switch_join = on
-color_nicks_in_names = off
-color_nicks_in_nicklist = off
-color_nicks_in_server_messages = on
-color_pv_nick_like_channel = on
-ctcp_time_format = "%a, %d %b %Y %T %z"
-display_away = local
-display_ctcp_blocked = on
-display_ctcp_reply = on
-display_ctcp_unknown = on
-display_host_join = off
-display_host_join_local = off
-display_host_quit = off
-display_join_message = ""
-display_old_topic = off
-display_pv_away_once = on
-display_pv_back = on
-highlight_channel = "$nick"
-highlight_pv = "$nick"
-highlight_server = "$nick"
-highlight_tags_restrict = "irc_privmsg,irc_notice"
-item_away_message = on
-item_channel_modes_hide_args = "k"
-item_display_server = buffer_plugin
-item_nick_modes = on
-item_nick_prefix = on
-join_auto_add_chantype = off
-msgbuffer_fallback = current
-new_channel_position = none
-new_pv_position = none
-nick_color_force = ""
-nick_color_hash = sum
-nick_color_stop_chars = "_|["
-nick_completion_smart = speakers
-nick_mode = none
-nick_mode_empty = off
-nicks_hide_password = "nickserv"
-notice_as_pv = auto
-notice_welcome_redirect = on
-notice_welcome_tags = ""
-notify_tags_ison = "notify_message"
-notify_tags_whois = "notify_message"
-part_closes_buffer = off
-pv_buffer = independent
-pv_tags = "notify_private"
-raw_messages = 256
-server_buffer = merge_with_core
-smart_filter = on
-smart_filter_delay = 5
-smart_filter_join = on
-smart_filter_join_unmask = 30
-smart_filter_mode = "ovh"
-smart_filter_nick = on
-smart_filter_quit = on
-temporary_servers = off
-topic_strip_colors = off
-
-[color]
-input_nick = lightcyan
-item_away = yellow
-item_channel_modes = default
-item_lag_counting = default
-item_lag_finished = yellow
-item_nick_modes = default
-message_join = green
-message_quit = red
-mirc_remap = "1,-1:darkgray"
-nick_prefixes = "q:lightred;a:lightcyan;o:lightgreen;h:lightmagenta;v:yellow;*:lightblue"
-notice = green
-reason_quit = default
-topic_current = default
-topic_new = white
-topic_old = darkgray
-
-[network]
-alternate_nick = on
-autoreconnect_delay_growing = 2
-autoreconnect_delay_max = 1800
-ban_mask_default = "*!$user@$host"
-channel_encode = off
-colors_receive = on
-colors_send = on
-lag_check = 60
-lag_max = 1800
-lag_min_show = 500
-lag_reconnect = 0
-lag_refresh_interval = 1
-notify_check_ison = 1
-notify_check_whois = 5
-send_unknown_commands = off
-whois_double_nick = on
-
-[msgbuffer]
-
-[ctcp]
-
-[ignore]
-
-[server_default]
-addresses = ""
-anti_flood_prio_high = 2
-anti_flood_prio_low = 2
-autoconnect = off
-autojoin = ""
-autoreconnect = on
-autoreconnect_delay = 10
-autorejoin = off
-autorejoin_delay = 30
-away_check = 1
-away_check_max_nicks = 25
-capabilities = ""
-command = ""
-command_delay = 0
-connection_timeout = 60
-default_msg_kick = ""
-default_msg_part = "WeeChat %v"
-default_msg_quit = "WeeChat %v"
-ipv6 = on
-local_hostname = ""
-nicks = "madmaurice,madmaurice1,madmaurice2,madmaurice3,madmaurice4"
-notify = ""
-password = ""
-proxy = ""
-realname = ""
-sasl_fail = continue
-sasl_key = ""
-sasl_mechanism = plain
-sasl_password = ""
-sasl_timeout = 15
-sasl_username = ""
-ssl = off
-ssl_cert = ""
-ssl_dhkey_size = 2048
-ssl_fingerprint = ""
-ssl_priorities = "NORMAL"
-ssl_verify = on
-username = "madmaurice"
-
-[server]
-freenode.addresses = "chat.freenode.net/6667"
-freenode.proxy
-freenode.ipv6
-freenode.ssl
-freenode.ssl_cert
-freenode.ssl_priorities
-freenode.ssl_dhkey_size
-freenode.ssl_fingerprint
-freenode.ssl_verify
-freenode.password
-freenode.capabilities
-freenode.sasl_mechanism
-freenode.sasl_username
-freenode.sasl_password
-freenode.sasl_key
-freenode.sasl_timeout
-freenode.sasl_fail
-freenode.autoconnect
-freenode.autoreconnect
-freenode.autoreconnect_delay
-freenode.nicks
-freenode.username
-freenode.realname
-freenode.local_hostname
-freenode.command
-freenode.command_delay
-freenode.autojoin
-freenode.autorejoin
-freenode.autorejoin_delay
-freenode.connection_timeout
-freenode.anti_flood_prio_high
-freenode.anti_flood_prio_low
-freenode.away_check
-freenode.away_check_max_nicks
-freenode.default_msg_kick
-freenode.default_msg_part
-freenode.default_msg_quit
-freenode.notify
-bouncer.addresses = "valentingehrke.de/54444"
-bouncer.proxy
-bouncer.ipv6
-bouncer.ssl = on
-bouncer.ssl_cert
-bouncer.ssl_priorities
-bouncer.ssl_dhkey_size
-bouncer.ssl_fingerprint
-bouncer.ssl_verify = off
-bouncer.password = "madmaurice:telefon"
-bouncer.capabilities
-bouncer.sasl_mechanism
-bouncer.sasl_username
-bouncer.sasl_password
-bouncer.sasl_key
-bouncer.sasl_timeout
-bouncer.sasl_fail
-bouncer.autoconnect = on
-bouncer.autoreconnect
-bouncer.autoreconnect_delay
-bouncer.nicks
-bouncer.username
-bouncer.realname
-bouncer.local_hostname
-bouncer.command
-bouncer.command_delay
-bouncer.autojoin
-bouncer.autorejoin
-bouncer.autorejoin_delay
-bouncer.connection_timeout
-bouncer.anti_flood_prio_high
-bouncer.anti_flood_prio_low
-bouncer.away_check
-bouncer.away_check_max_nicks
-bouncer.default_msg_kick
-bouncer.default_msg_part
-bouncer.default_msg_quit
-bouncer.notify = ""