3 files changed, 33 insertions, 18 deletions
diff --git a/ratpoison/clipboard b/ratpoison/clipboard
index 78a3399..7183902 100755
--- a/ratpoison/clipboard
+++ b/ratpoison/clipboard
@@ -24,7 +24,7 @@ function entries() {
     if [ $command = menu_paste ]; then
         echo -n "\"Paste from slot:\" /bin/true "
     else
-        echo -n "\"Yank from slot:\" /bin/true "
+        echo -n "\"Yank to slot:\" /bin/true "
     fi
 
     for i in $(seq 1 9); do
diff --git a/ratpoison/ratpoisonrc.conf b/ratpoison/ratpoisonrc.conf
index 3b9fd89..2294359 100644
--- a/ratpoison/ratpoisonrc.conf
+++ b/ratpoison/ratpoisonrc.conf
@@ -8,7 +8,8 @@ definekey top Arabic_dammatan meta
 unmanage Desktop
 
 # set font with unicode support
-set font -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
+#set font -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
+set font "DejaVu Sans Mono"
 
 #Style message box
 set bgcolour #fdf6e3
@@ -58,16 +59,10 @@ set bwcolor #839496
 ######################################
 # Panel
 ######################################
-alias rpbar exec sleep 21 && rpbar
 alias rpbarsend exec ~/.ratpoison/rpbarsend
 
 # tell ratpoison to ignore rpbar
 unmanage rpbar
-# leave space for bars
-# start rpbar 
-alias panel exec xfce4-panel --disable-wm-check && rpbar
-panel
-rpbar
 
 # hooks
 addhook switchwin rpbarsend
@@ -98,7 +93,7 @@ bind W workspace_menu
 #Get F-keys to switch windows now in /usr/bin/rpws
 definekey top F1 exec rpws 1 && ratpoison -c bordscript
 definekey top F2 exec rpws 2 && ratpoison -c bordscript
-definekey top F3 exec ratpoison -c "exec rpws 3 && ratpoison -c bordscript" & ratpoison -c "select 0"
+definekey top F3 exec ratpoison -c "exec rpws 3 && ratpoison -c bordscript" 
 definekey top F4 exec rpws 4 && ratpoison -c bordscript
 definekey top F5 exec rpws 5 && ratpoison -c bordscript
 definekey top F6 exec rpws 6 && ratpoison -c bordscript
@@ -194,7 +189,8 @@ bind Escape abort
 
 #Paste goodness
 bind g exec ~/bin/imgur
-bind P exec gist -P -p -t txt | perl -pe chomp | xclip
+bind P exec xclip -o | curl -F 'sprunge=<-' http://sprunge.us | xclip 
+ 
 
 alias bordtoggle exec ~/.ratpoison/bordtoggle
 alias bordscript exec ~/.ratpoison/borderscript
@@ -259,22 +255,41 @@ alias voltoggle exec amixer -D pulse set Master toggle && ratpoison -c "echo Sou
 definekey top XF86AudioMute voltoggle
 definekey top s-Pause voltoggle
 
+#-------------------------------------------------------------
+# Brightness Control
+#-------------------------------------------------------------
+alias brightup exec xbacklight +2
+alias brightdown exec xbacklight -2
+
+definekey top XF86MonBrightnessUp brightup
+definekey top XF86MonBrightnessDown brightdown
 
 #-------------------------------------------------------------
 # Cmus (Music) Control
 #-------------------------------------------------------------
 # Aliases
-alias songinfo exec ratpoison -c "echo Playing:`cmus-remote -Q | awk '/ artist/ {$1=$2=""; print $0}'` - `cmus-remote -Q 2>/dev/null | grep title | awk '{$1=$2=""; print $0}'`"
-alias volinfo exec ratpoison -c "echo `$HOME/.ratpoison/cmusvolind`"
-alias playinfo exec ratpoison -c "echo Music: `cmus-remote -Q | awk '/status/  {print $2}'`"
+alias playinfo exec ratpoison -c "echo Music: `mpc | head -2 | tail -1 | awk '{print $1}'`"
+alias volinfo exec ratpoison -c "echo `$HOME/.ratpoison/mpdvolind`"
+alias songinfo exec ratpoison -c "echo Music: `mpc | head -1`"
+#alias volinfo exec ratpoison -c "echo `$HOME/.ratpoison/cmusvolind`"
+#alias playinfo exec ratpoison -c "echo Music: `cmus-remote -Q | awk '/status/  {print $2}'`"
+#alias songinfo exec ratpoison -c "echo Playing:`cmus-remote -Q | awk '/ artist/ {$1=$2=""; print $0}'` - `cmus-remote -Q 2>/dev/null | grep title | awk '{$1=$2=""; print $0}'`"
 
 
 # Play/Pause and Volume
-definekey top s-space exec cmus-remote -u && ratpoison -c "playinfo"
-definekey top s-Right exec cmus-remote -n && ratpoison -c "songinfo" 
-definekey top s-Left  exec cmus-remote -r && ratpoison -c "songinfo" 
-definekey top s-Up    exec cmus-remote -v +5% && ratpoison -c "volinfo"
-definekey top s-Down  exec cmus-remote -v -5% && ratpoison -c "volinfo"
+definekey top s-space exec mpc toggle && ratpoison -c 'playinfo'
+definekey top s-Right exec mpc next && ratpoison -c "songinfo"
+definekey top s-Left  exec mpc prev && ratpoison -c "songinfo"
+definekey top s-Up    exec mpc volume +5 && ratopison -c "volinfo"
+definekey top s-Up    exec mpc volume +5 && ratpoison -c 'volinfo'
+definekey top s-Down  exec mpc volume -5 && ratpoison -c 'volinfo'
+
+# Old cmus controls
+#definekey top s-space exec cmus-remote -u && ratpoison -c "playinfo"
+#definekey top s-Right exec cmus-remote -n && ratpoison -c "songinfo" 
+#definekey top s-Left  exec cmus-remote -r && ratpoison -c "songinfo" 
+#definekey top s-Up    exec cmus-remote -v +5% && ratpoison -c "volinfo"
+#definekey top s-Down  exec cmus-remote -v -5% && ratpoison -c "volinfo"
 
 # Show song that is playing
 definekey top Print songinfo
diff --git a/ratpoison/rpbar b/ratpoison/rpbar
index 407f142..3b90f35 100755
--- a/ratpoison/rpbar
+++ b/ratpoison/rpbar