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

Conflicts:
	.config/herbstluftwm/autostart
	.xbindkeysrc.scm
	.xinitrc
This commit is contained in:
Tom Willemsen 2012-05-22 14:36:52 +00:00
commit 90cccbae8a
8 changed files with 66 additions and 50 deletions

View file

@ -15,9 +15,9 @@ add Control = Control_L
! !
! Swap Shift_L and Super_L ! Swap Shift_L and Super_L
! !
remove Shift = Shift_L ! remove Shift = Shift_L
remove Mod4 = Super_L ! remove Mod4 = Super_L
keysym Super_L = Shift_L ! keysym Super_L = Shift_L
keysym Shift_L = Super_L ! keysym Shift_L = Super_L
add Shift = Shift_L ! add Shift = Shift_L
add Mod4 = Super_L ! add Mod4 = Super_L

View file

@ -2,4 +2,4 @@
export BROWSER=firefox export BROWSER=firefox
export EDITOR="emacsclient -c -a emacs" export EDITOR="emacsclient -c -a emacs"
export INFOPATH="${HOME}/documents/info:${INFOPATH}" export INFOPATH="${HOME}/documents/info:${INFOPATH}"
export PATH="${HOME}/bin:${PATH}:/usr/local/bin" export PATH="${HOME}/bin:${PATH}:/usr/local/bin:/usr/local/stumpwm/bin"

View file

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

View file

@ -32,10 +32,14 @@ hc unrule -F
hc rule focus=on hc rule focus=on
hc rule windowtype=_NET_WM_WINDOW_TYPE_DIALOG focus=on pseudotile=on hc rule windowtype=_NET_WM_WINDOW_TYPE_DIALOG focus=on pseudotile=on
hc rule class=Xephyr pseudotile=on hc rule class=Xephyr pseudotile=on
hc rule instance=Xine\ Window pseudotile=on
# Panel # Panel
~/.config/herbstluftwm/panel.sh & ~/.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: # Local Variables:
# eval: (git-auto-commit-mode 1) # eval: (git-auto-commit-mode 1)
# End: # End:

View file

@ -113,8 +113,6 @@ function emacs_running()
ps ax | awk '{ print $5 " " $6 }' | grep -E "^emacs --daemon" 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=$! childpid=$!
herbstclient --idle herbstclient --idle
@ -122,7 +120,7 @@ herbstclient pad $monitor2 -5 -5 -5 -5
} 2> /dev/null | { } 2> /dev/null | {
TAGS=( $(herbstclient tag_status $monitor) ) TAGS=( $(herbstclient tag_status $monitor) )
TAGS2=( $(herbstclient tag_status $monitor2) ) TAGS2=( $(herbstclient tag_status $monitor2) )
while true ; do
separator="^fg($bgcolor)^ro(1x$height)^fg()" separator="^fg($bgcolor)^ro(1x$height)^fg()"
print_tags print_tags
print_services print_services
@ -142,7 +140,8 @@ herbstclient pad $monitor2 -5 -5 -5 -5
exit exit
;; ;;
esac esac
done
sleep 1s
} 2> /dev/null | dzen2 -w $width -x $x -y $y -fn "$font" -h $height \ } 2> /dev/null | dzen2 -w $width -x $x -y $y -fn "$font" -h $height \
-ta l -bg "$bgcolor" -ta l -bg "$bgcolor"

View file

@ -1,8 +1,9 @@
# -*- mode: conf; eval: (git-auto-commit-mode 1) -*- # -*- mode: conf; eval: (git-auto-commit-mode 1) -*-
http://ryuslash.ninth.su/blog/blog.xml
#-----[ Followed projects ]------------------------------------------- #-----[ Followed projects ]-------------------------------------------
https://github.com/ryuslash.private.atom?token=7362ca0604736cd92b5441949e8c9cd4 https://github.com/ryuslash.private.atom?token=7362ca0604736cd92b5441949e8c9cd4
http://gitorious.org/~ryuslash/watchlist.atom http://gitorious.org/~ryuslash/watchlist.atom
http://www.reddit.com/new/.rss?feed=e0f54f127ad350b1793609fd9428d4b525818d15&user=ryuslash
#-----[ Blogs ]------------------------------------------------------- #-----[ Blogs ]-------------------------------------------------------
http://julien.danjou.info/blog/index.xml 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=naquadah-theme.git;a=rss cvs
#http://git.naquadah.org/?p=rainbow.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/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 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/knopwob/dunst/commits/master.atom cvs
https://github.com/akrennmair/newsbeuter/commits/master.atom https://github.com/akrennmair/newsbeuter/commits/master.atom
http://repo.or.cz/w/conkeror.git/atom http://repo.or.cz/w/conkeror.git/atom
https://github.com/mooz/keysnail/commits/master.atom https://github.com/mooz/keysnail/commits/master.atom
#-----[ Programming ]------------------------------------------------- #-----[ 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://services.devx.com/outgoing/devxfeed.xml devel
#http://www.dzone.com/feed/frontpage/rss.xml devel #http://www.dzone.com/feed/frontpage/rss.xml devel
http://www.reddit.com/r/ExpertProgramming/.rss devel # http://www.reddit.com/r/ExpertProgramming/.rss devel
http://www.reddit.com/r/programming/.rss devel # http://www.reddit.com/r/programming/.rss devel
http://steve-yegge.blogspot.com/feeds/posts/default devel http://steve-yegge.blogspot.com/feeds/posts/default devel
http://www.reddit.com/r/systems/.rss devel # http://www.reddit.com/r/systems/.rss devel
http://www.reddit.com/r/coding/.rss devel # http://www.reddit.com/r/coding/.rss devel
http://www.reddit.com/r/git/.rss devel # http://www.reddit.com/r/git/.rss devel
http://www.reddit.com/r/C_Programming/.rss devel # http://www.reddit.com/r/C_Programming/.rss devel
http://feeds.feedburner.com/FalloutTutorials devel http://feeds.feedburner.com/FalloutTutorials devel
http://www.devarticles.com/rss.xml devel http://www.devarticles.com/rss.xml devel
http://www.script-tutorials.com/feed/rss/ 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 http://stackoverflow.com/feeds/tag?tagnames=c&sort=newest
#-----[ Linux and FLOSS ]--------------------------------------------- #-----[ 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://www.desktoplinux.com/backend/headlines.rss linux
http://distrowatch.com/news/dw.xml linux http://distrowatch.com/news/dw.xml linux
http://www.howtoforge.com/node/feed 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://lwn.net/headlines/newrss linux
http://blogs.zdnet.com/open-source/wp-rss2.php linux http://blogs.zdnet.com/open-source/wp-rss2.php linux
http://ostatic.com/blog/feed 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.theopenforce.com/atom.xml linux
http://www.ubuntugeek.com/feed/ linux http://www.ubuntugeek.com/feed/ linux
http://www.warpedsystems.sk.ca/backend/index.xml linux http://www.warpedsystems.sk.ca/backend/index.xml linux
http://www.reddit.com/r/archlinux/.rss linux # http://www.reddit.com/r/archlinux/.rss linux
http://www.reddit.com/r/linuxquestions/.rss linux # http://www.reddit.com/r/linuxquestions/.rss linux
http://www.echolinux.com/rss http://www.echolinux.com/rss
http://www.tuxradar.com/rss http://www.tuxradar.com/rss
#-----[ Emacs ]------------------------------------------------------- #-----[ Emacs ]-------------------------------------------------------
http://wordpress.com/tag/emacs/feed/ 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://planet.emacsen.org/atom.xml emacs
http://emacsblog.org/feed/ emacs http://emacsblog.org/feed/ emacs
http://www.emacswiki.org/emacs?action=rss 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 http://stackoverflow.com/feeds/tag?tagnames=elisp&sort=newest
#-----[ N900 ]-------------------------------------------------------- #-----[ 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://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 ]------------------------------------------------------ #-----[ iPhone ]------------------------------------------------------
http://icodeblog.com/feed/ 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://valajournal.blogspot.com/feeds/posts/default software
http://www.gimp.org/news.rdf http://www.gimp.org/news.rdf
http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest http://stackoverflow.com/feeds/tag?tagnames=git&sort=newest
http://git.savannah.gnu.org/cgit/identica-mode.git/atom/?h=master
#-----[ Games ]------------------------------------------------------- #-----[ Games ]-------------------------------------------------------
http://feeds.feedburner.com/qj/qjnet game 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://feeds.feedburner.com/ProgsLife comics
http://www.rsspect.com/rss/asw.xml http://www.rsspect.com/rss/asw.xml
http://pbfcomics.com/feed/feed.xml http://pbfcomics.com/feed/feed.xml
http://feeds.feedburner.com/MinionComics
http://www.savagechickens.com/feed
http://feeds.feedburner.com/basiccomic
#-----[ Misc ]-------------------------------------------------------- #-----[ Misc ]--------------------------------------------------------
http://wallbase.cc/rss misc http://wallbase.cc/rss misc
http://www.mailinator.com/rss.jsp?email=ryuslash misc http://www.mailinator.com/rss.jsp?email=ryuslash misc
http://rss.slashdot.org/Slashdot/slashdot 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

View file

@ -13,7 +13,7 @@ remoterepository = arch-remote
[Account gmail] [Account gmail]
localrepository = gmail-local localrepository = gmail-local
remoterepository = gmail-remote remoterepository = gmail-remote
postsynchook = mu index --muhome=~/.mu/gmail --maildir=~/documents/mail/gmail postsynchook = mu index --muhome=~/.mu/gmail --maildir=~/documents/mail/gmail; ~/bin/emacs-send-mail gmail
[Account iactor] [Account iactor]
localrepository = iactor-local localrepository = iactor-local
@ -22,17 +22,17 @@ remoterepository = iactor-remote
[Account aethon] [Account aethon]
localrepository = aethon-local localrepository = aethon-local
remoterepository = aethon-remote remoterepository = aethon-remote
postsynchook = mu index --muhome=~/.mu/aethon --maildir=~/documents/mail/aethon postsynchook = mu index --muhome=~/.mu/aethon --maildir=~/documents/mail/aethon; ~/bin/emacs-send-mail aethon
[Account ninthfloor] [Account ninthfloor]
localrepository = ninthfloor-local localrepository = ninthfloor-local
remoterepository = ninthfloor-remote remoterepository = ninthfloor-remote
postsynchook = mu index --muhome=~/.mu/ninthfloor --maildir=~/documents/mail/ninthfloor postsynchook = mu index --muhome=~/.mu/ninthfloor --maildir=~/documents/mail/ninthfloor; ~/bin/emacs-send-mail ninthfloor
[Account ryuslash.org] [Account ryuslash.org]
localrepository = ryuslash.org-local localrepository = ryuslash.org-local
remoterepository = ryuslash.org-remote remoterepository = ryuslash.org-remote
postsynchook = mu index --muhome=~/.mu/ryuslash --maildir=~/documents/mail/ryuslash.org postsynchook = mu index --muhome=~/.mu/ryuslash --maildir=~/documents/mail/ryuslash.org; ~/bin/emacs-send-mail ryuslash.org
[Repository arch-local] [Repository arch-local]
type = Maildir type = Maildir

View file

@ -205,7 +205,8 @@
(xbindkey '(XF86AudioNext) "mpc next") (xbindkey '(XF86AudioNext) "mpc next")
(xbindkey-function '(XF86TouchpadOff) kill-mouse) (xbindkey-function '(XF86TouchpadOff) kill-mouse)
(xbindkey-function '(XF86TouchpadOn) revive-mouse) (xbindkey-function '(XF86TouchpadOn) revive-mouse)
(xbindkey `(,modkey k) "herbstclient close")) (xbindkey `(,modkey k) "herbstclient close")
(xbindkey `(,modkey Escape) "~/.config/herbstluftwm/panel.sh"))
(define (second-binding) (define (second-binding)
"Second binding" "Second binding"