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

This commit is contained in:
Tom Willemsen 2012-03-16 22:07:11 +01:00
commit 251077982f
5 changed files with 15 additions and 4 deletions

View file

@ -61,8 +61,9 @@ urxvt*urlLauncher: firefox
urxvt*matcher.button: 1 urxvt*matcher.button: 1
! Appearance ! Appearance
urxvt.font: xft:DejaVu Sans Mono:weight=medium:pixelsize=15 urxvt.font: xft:DejaVu Sans Mono:weight=medium:pixelsize=16
urxvt.boldFont: xft:DejaVu Sans Mono:weight=black:pixelsize=15 urxvt.boldFont: xft:DejaVu Sans Mono:weight=black:pixelsize=16
urxvt.italicFont: xft:DejaVu Sans Mono:slant=italic:pixelsize=16
urxvt.transparent: true urxvt.transparent: true
xterm*faceName: -misc-tamsyn-medium-r-normal-*-17-*-*-*-*-*-iso8859-* xterm*faceName: -misc-tamsyn-medium-r-normal-*-17-*-*-*-*-*-iso8859-*

View file

@ -1,8 +1,14 @@
# -*- mode: conf-colon; eval: (git-auto-commit-mode 1); -*-
[beets] [beets]
library: ~/.local/share/beets/library.blb library: ~/.local/share/beets/library.blb
directory: /mnt/music/mp3/ directory: /mnt/music/mp3/
plugins: mpdupdate embedart
[paths] [paths]
default: $albumartist/$year - $album/$track - $title default: $albumartist/$year - $album/$track - $title
singleton: Non-Album/$artist - $title singleton: Non-Album/$artist - $title
comp: Compilations/$year - $album/$track - $artist - $title comp: Compilations/$year - $album/$track - $artist - $title
[mpdupdate]
host: localhost
port: 6600

View file

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

View file

@ -93,6 +93,7 @@ http://gitlog.wordpress.com/feed/ software
http://rollingrelease.com/?feed=rss software http://rollingrelease.com/?feed=rss software
http://sourceforge.net/export/rss2_keepsake.php?group_id=134378 software 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
#-----[ Games ]------------------------------------------------------- #-----[ Games ]-------------------------------------------------------
http://feeds.feedburner.com/qj/qjnet game http://feeds.feedburner.com/qj/qjnet game

View file

@ -150,6 +150,9 @@ the command."
(define (main-binding) (define (main-binding)
"First binding" "First binding"
(xbindkey `(,modkey shift "1") (string-append "dmenu_run -p 'Run:' " dmenu-args)) (xbindkey `(,modkey shift "1") (string-append "dmenu_run -p 'Run:' " dmenu-args))
(xbindkey `(,modkey "0") "herbstclient remove")
(xbindkey `(,modkey "2") "herbstclient split vertical 0.5")
(xbindkey `(,modkey "3") "herbstclient split horizontal 0.5")
(xbindkey-function `(,modkey x) X-function-map) (xbindkey-function `(,modkey x) X-function-map)
(xbindkey-function `(,modkey w) W-function-map) (xbindkey-function `(,modkey w) W-function-map)
(xbindkey-function `(,modkey s) S-function-map) (xbindkey-function `(,modkey s) S-function-map)