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

Conflicts:
	.config/herbstluftwm/autostart
	.xbindkeysrc.scm
	.xinitrc

4 files changed, 53 insertions, 38 deletions

diff --git a/.config/cower/config b/.config/cower/config
index bd53c0a..8a37cf5 100644
--- a/.config/cower/config
+++ b/.config/cower/config
@@ -1,3 +1,4 @@
 # -*- eval: (git-auto-commit-mode 1) -*-
 Color = always
 TargetDir = /home/slash/code/aur/
+IgnoreRepo = pegas
diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index 8567bea..9f6d187 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -32,10 +32,14 @@ hc unrule -F
 hc rule focus=on
 hc rule windowtype=_NET_WM_WINDOW_TYPE_DIALOG focus=on pseudotile=on
 hc rule class=Xephyr pseudotile=on
+hc rule instance=Xine\ Window pseudotile=on
 
 # Panel
 ~/.config/herbstluftwm/panel.sh &
 
+# Prep default
+hc load default "(split horizontal:0.550000:0 (split vertical:0.850000:0 (split horizontal:0.180000:1 (clients max:0) (clients max:0 0x140001a)) (clients max:0)) (clients max:0 0xc00077))"
+
 # Local Variables:
 # eval: (git-auto-commit-mode 1)
 # End:
diff --git a/.config/herbstluftwm/panel.sh b/.config/herbstluftwm/panel.sh
index 1438974..ae5aedd 100755
--- a/.config/herbstluftwm/panel.sh
+++ b/.config/herbstluftwm/panel.sh
@@ -113,8 +113,6 @@ function emacs_running()
     ps ax | awk '{ print $5 " " $6 }' | grep -E "^emacs --daemon"
 }
 
-herbstclient pad $monitor $(expr -5 + $height) -5 -5 -5
-herbstclient pad $monitor2 -5 -5 -5 -5
 {
     childpid=$!
     herbstclient --idle
@@ -122,27 +120,28 @@ herbstclient pad $monitor2 -5 -5 -5 -5
 } 2> /dev/null | {
     TAGS=( $(herbstclient tag_status $monitor) )
     TAGS2=( $(herbstclient tag_status $monitor2) )
-    while true ; do
-        separator="^fg($bgcolor)^ro(1x$height)^fg()"
-        print_tags
-        print_services
-        print_mailboxes
 
-        echo
+    separator="^fg($bgcolor)^ro(1x$height)^fg()"
+    print_tags
+    print_services
+    print_mailboxes
+
+    echo
         # wait for next event
-        read line || break
-        cmd=( $line )
+    read line || break
+    cmd=( $line )
         # find out event origin
-        case "${cmd[0]}" in
-            tag*)
-                TAGS=( $(herbstclient tag_status $monitor) )
-                TAGS2=( $(herbstclient tag_status $monitor2) )
-                ;;
-            quit_panel)
-                exit
-                ;;
-        esac
-    done
+    case "${cmd[0]}" in
+        tag*)
+            TAGS=( $(herbstclient tag_status $monitor) )
+            TAGS2=( $(herbstclient tag_status $monitor2) )
+            ;;
+        quit_panel)
+            exit
+            ;;
+    esac
+
+    sleep 1s
 } 2> /dev/null | dzen2 -w $width -x $x -y $y -fn "$font" -h $height \
     -ta l -bg "$bgcolor"
 
diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 86b1766..54a9464 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -1,8 +1,9 @@
 # -*- mode: conf; eval: (git-auto-commit-mode 1) -*-
-
+http://ryuslash.ninth.su/blog/blog.xml
 #-----[ Followed projects ]-------------------------------------------
 https://github.com/ryuslash.private.atom?token=7362ca0604736cd92b5441949e8c9cd4
 http://gitorious.org/~ryuslash/watchlist.atom
+http://www.reddit.com/new/.rss?feed=e0f54f127ad350b1793609fd9428d4b525818d15&user=ryuslash
 
 #-----[ Blogs ]-------------------------------------------------------
 http://julien.danjou.info/blog/index.xml blogs
@@ -20,25 +21,23 @@ http://irreal.org/blog/?feed=rss2
 http://git.naquadah.org/?p=naquadah-theme.git;a=rss cvs
 #http://git.naquadah.org/?p=rainbow.git;a=rss cvs
 http://code.google.com/feeds/p/autopair/svnchanges/basic cvs
-http://code.google.com/feeds/p/go/hgchanges/basic cvs
 http://git.cs.fau.de/?p=re06huxa/herbstluftwm;a=atom cvs
-https://github.com/diaspora/diaspora/commits/master.atom cvs
 https://github.com/knopwob/dunst/commits/master.atom cvs
 https://github.com/akrennmair/newsbeuter/commits/master.atom
 http://repo.or.cz/w/conkeror.git/atom
 https://github.com/mooz/keysnail/commits/master.atom
 
 #-----[ Programming ]-------------------------------------------------
-http://www.reddit.com/r/cpp/.rss devel
+# http://www.reddit.com/r/cpp/.rss devel
 http://services.devx.com/outgoing/devxfeed.xml devel
 #http://www.dzone.com/feed/frontpage/rss.xml devel
-http://www.reddit.com/r/ExpertProgramming/.rss devel
-http://www.reddit.com/r/programming/.rss devel
+# http://www.reddit.com/r/ExpertProgramming/.rss devel
+# http://www.reddit.com/r/programming/.rss devel
 http://steve-yegge.blogspot.com/feeds/posts/default devel
-http://www.reddit.com/r/systems/.rss devel
-http://www.reddit.com/r/coding/.rss devel
-http://www.reddit.com/r/git/.rss devel
-http://www.reddit.com/r/C_Programming/.rss devel
+# http://www.reddit.com/r/systems/.rss devel
+# http://www.reddit.com/r/coding/.rss devel
+# http://www.reddit.com/r/git/.rss devel
+# http://www.reddit.com/r/C_Programming/.rss devel
 http://feeds.feedburner.com/FalloutTutorials devel
 http://www.devarticles.com/rss.xml devel
 http://www.script-tutorials.com/feed/rss/
@@ -46,7 +45,7 @@ http://news.ycombinator.com/rss
 http://stackoverflow.com/feeds/tag?tagnames=c&sort=newest
 
 #-----[ Linux and FLOSS ]---------------------------------------------
-http://www.reddit.com/r/commandline/.rss linux
+# http://www.reddit.com/r/commandline/.rss linux
 http://www.desktoplinux.com/backend/headlines.rss linux
 http://distrowatch.com/news/dw.xml linux
 http://www.howtoforge.com/node/feed linux
@@ -60,18 +59,18 @@ http://www.linuxinsider.com/perl/syndication/rssfull.pl linux
 http://lwn.net/headlines/newrss linux
 http://blogs.zdnet.com/open-source/wp-rss2.php linux
 http://ostatic.com/blog/feed linux
-http://www.reddit.com/r/linux/.rss linux
+# http://www.reddit.com/r/linux/.rss linux
 http://www.theopenforce.com/atom.xml linux
 http://www.ubuntugeek.com/feed/ linux
 http://www.warpedsystems.sk.ca/backend/index.xml linux
-http://www.reddit.com/r/archlinux/.rss linux
-http://www.reddit.com/r/linuxquestions/.rss linux
+# http://www.reddit.com/r/archlinux/.rss linux
+# http://www.reddit.com/r/linuxquestions/.rss linux
 http://www.echolinux.com/rss
 http://www.tuxradar.com/rss
 
 #-----[ Emacs ]-------------------------------------------------------
 http://wordpress.com/tag/emacs/feed/ emacs
-http://www.reddit.com/r/emacs/.rss emacs
+# http://www.reddit.com/r/emacs/.rss emacs
 http://planet.emacsen.org/atom.xml emacs
 http://emacsblog.org/feed/ emacs
 http://www.emacswiki.org/emacs?action=rss emacs
@@ -82,9 +81,9 @@ http://stackoverflow.com/feeds/tag?tagnames=emacs&sort=newest
 http://stackoverflow.com/feeds/tag?tagnames=elisp&sort=newest
 
 #-----[ N900 ]--------------------------------------------------------
-http://www.reddit.com/r/n900/.rss n900
+# http://www.reddit.com/r/n900/.rss n900
 http://maemo.org/news/planet-maemo/rss.xml n900
-http://www.reddit.com/r/maemo/.rss n900
+# http://www.reddit.com/r/maemo/.rss n900
 
 #-----[ iPhone ]------------------------------------------------------
 http://icodeblog.com/feed/ iphone
@@ -99,6 +98,7 @@ http://sourceforge.net/export/rss2_keepsake.php?group_id=134378 software
 http://valajournal.blogspot.com/feeds/posts/default software
 http://www.gimp.org/news.rdf
 http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
+http://git.savannah.gnu.org/cgit/identica-mode.git/atom/?h=master
 
 #-----[ Games ]-------------------------------------------------------
 http://feeds.feedburner.com/qj/qjnet game
@@ -128,9 +128,20 @@ http://feeds.feedburner.com/maximumble?format=xml comics
 http://feeds.feedburner.com/ProgsLife comics
 http://www.rsspect.com/rss/asw.xml
 http://pbfcomics.com/feed/feed.xml
+http://feeds.feedburner.com/MinionComics
+http://www.savagechickens.com/feed
+http://feeds.feedburner.com/basiccomic
 
 #-----[ Misc ]--------------------------------------------------------
 http://wallbase.cc/rss misc
 http://www.mailinator.com/rss.jsp?email=ryuslash misc
 http://rss.slashdot.org/Slashdot/slashdot misc
-http://www.reddit.com/r/unixporn/.rss misc
+# http://www.reddit.com/r/unixporn/.rss misc
+
+
+#-----[ New ]----------------------------------------------------------
+http://rss.feedsportal.com/c/32569/f/491734/index.rss
+http://feeds.feedburner.com/TheGeekStuff
+http://feeds2.feedburner.com/Command-line-fu
+http://feeds.feedburner.com/GoDjango
+http://identity.mozilla.com/rss