Merge remote-tracking branch 'github/master' into phoenix

.config/cower/config

@@ -1,3 +1,3 @@
 # -*- eval: (git-auto-commit-mode 1) -*-
 Color = always
-TargetDir = /home/slash/var/aur/
+TargetDir = /home/slash/code/aur/

.config/herbstluftwm/panel.sh

@@ -31,31 +31,24 @@ function print_tags() {
     for i in "${TAGS[@]}" ; do
         if [[ "${TAGS2[@]}" == *"#${i:1}"* ]]; then
             echo -n "^bg($selcolor)^fg(#000000) ${i:1} ^fg()^bg()"
-#                echo -n "^fg($selcolor)^ro(${tag_width}x$height)^fg()"
         elif [[ "${TAGS2[@]}" == *"+${i:1}"* ]]; then
             echo -n "^bg($locolor)^fg(#000000) ${i:1} ^fg()^bg()"
-#                echo -n "^fg($locolor)^ro(${tag_width}x$height)^fg()"
         else
             case ${i:0:1} in
                 '#')
                     echo -n "^bg($selcolor)^fg(#000000) ${i:1} ^fg()^bg()"
-#                    echo -n "^fg($selcolor)^ro(${tag_width}x$height)^fg()"
                     ;;
                 '+')
                     echo -n "^bg($locolor)^fg(#000000) ${i:1} ^fg()^bg()"
-#                    echo -n "^fg($locolor)^ro(${tag_width}x$height)^fg()"
                     ;;
                 ':')
                     echo -n "^bg($hicolor)^fg(#000000) ${i:1} ^fg()^bg()"
-#                    echo -n "^fg($hicolor)^ro(${tag_width}x$height)^fg()"
                     ;;
                 '!')
                     echo -n "^bg($urcolor)^fg(#000000) ${i:1} ^fg()^bg()"
-#                    echo -n "^fg($urcolor)^ro(${tag_width}x$height)^fg()"
                     ;;
                 *)
                     echo -n "^bg($bgcolor)^fg(#ffffff) ${i:1} ^fg()^bg()"
-#                    echo -n "^bg()^fg($bgcolor)^ro(${tag_width}x$height)^fg()"
                     ;;
             esac
         fi
@@ -65,8 +58,12 @@ function print_tags() {
 
 function print_mailboxes() {
     declare -A mailnames
-    mailboxes=(ninthfloor gmail arch aethon ryuslash.org)
-    mailnames=([ninthfloor]="9f" [gmail]="gm" [aethon]="aet" [ryuslash.org]="ryu")
+    mailboxes=(ninthfloor gmail aethon ryuslash.org)
+    mailnames=(
+        [ninthfloor]="9f"
+        [gmail]="gm"
+        [aethon]="aet"
+        [ryuslash.org]="ryu")
     mailtxt=""
     for j in "${mailboxes[@]}"; do
         mailfile="$HOME/documents/mail/$j/inbox/new/"
@@ -80,10 +77,9 @@ function print_mailboxes() {
         fi
 
         mailtxt="$mailtxt${separator}^bg($mailcolor)^fg(#ffffff) ${mailnames[$j]} ^fg()^bg()"
-#        echo -n "^fg($mailcolor)^ro(${tag_width}x$height)^fg()$separator"
     done
     mailtxt_only=$(echo -n "$mailtxt" | sed 's.\^[^(]*([^)]*)..g')
-    let mailtxt_width=$(textwidth "$font" "$mailtxt_only")+20
+    let mailtxt_width=$(textwidth "$font" "$mailtxt_only")+10
     echo -n "^p(_RIGHT)^p(-$mailtxt_width)$mailtxt"
 }
 
@@ -139,7 +135,6 @@ herbstclient pad $monitor2 -5 -5 -5 -5
         # find out event origin
         case "${cmd[0]}" in
             tag*)
-                #echo "reseting tags" >&2
                 TAGS=( $(herbstclient tag_status $monitor) )
                 TAGS2=( $(herbstclient tag_status $monitor2) )
                 ;;

.config/htop/htoprc

@@ -0,0 +1,23 @@
+# 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=38 0 48 17 18 38 39 40 2 46 47 49 1 
+sort_key=47
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=0
+shadow_other_users=1
+show_thread_names=0
+highlight_base_name=1
+highlight_megabytes=1
+highlight_threads=1
+tree_view=1
+header_margin=1
+detailed_cpu_time=0
+cpu_count_from_zero=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 

.config/newsbeuter/config

@@ -18,8 +18,8 @@ html-renderer             "w3m -dump -T text/HTML -cols 80"
 text-width                80
 
 # colors
-#color listfocus black green bold
-#color info      white red
+color listfocus default color0 bold
+color info      color0  white
 
 # highlight
 highlight article "^(Feed|Title|Author|Link|Date):.*" green default bold

.config/newsbeuter/urls

@@ -76,6 +76,7 @@ http://emacsblog.org/feed/ emacs
 http://www.emacswiki.org/emacs?action=rss emacs
 http://feeds.feedburner.com/XahsEmacsBlog
 http://www.masteringemacs.org/feed/
+http://wikemacs.org/wiki/index.php?title=Special:RecentChanges&feed=atom
 
 #-----[ N900 ]--------------------------------------------------------
 http://www.reddit.com/r/n900/.rss n900

.gitignore

@@ -84,7 +84,7 @@
 News/
 auto-save-list
 bin/
-development/
+code/
 documents/
 downloads/
 feeds
@@ -111,3 +111,6 @@ xhtml-loader.rnc
 .profile
 .xsession_errors
 Mail/
+.diaspora/
+.mu/
+.org-timestamps/

.moc/config

@@ -1 +0,0 @@
-Theme = custom

.xinitrc

@@ -2,6 +2,7 @@
 xmodmap ~/.Xmodmap
 xrandr --output VGA1 --mode 1920x1080
 #_ Start some programs
+xsetroot -solid "#002b36"
 numlockx &
 emacs --daemon &
 xbindkeys &

.zshenv

@@ -13,7 +13,6 @@ export PAGER=$LESSCMD
 
 # Aliases
 alias alpine="alpine -p ""{imap.gmail.com/ssl/user=tom.willemsen@archlinux.us}remote_pinerc"""
-alias cower="cower --color=always --target=$HOME/var/aur"
 alias evolus-pencil="/usr/lib/evolus-pencil-svn/evolus-pencil.sh"
 alias grep="grep --color=always"
 alias less=$LESSCMD