# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1404340556 14400
# Node ID 3b143e1db5af33b7d58cfdd7e972a42f6468b2bc
# Parent  b061de38d562274bd34b540b10f9e851e4fc288a# Parent  f3d684572a8fecb3f6ac9483bd312c33173e0313
merge from default

diff --git a/.Xdefaults b/.Xdefaults
diff --git a/.gitconfig b/.gitconfig
diff --git a/.hgrc b/.hgrc
diff --git a/.i3/auto-start b/.i3/auto-start
diff --git a/.i3/config b/.i3/config
--- a/.i3/config
+++ b/.i3/config
@@ -93,7 +93,7 @@ bindsym $mod+minus workspace prev
 bindsym $mod+equal workspace next
 
 # switch to workspace
-bindsym $mod+1 workspace 1
+bindsym $mod+1 workspace 1: Mail
 bindsym $mod+2 workspace 2
 bindsym $mod+3 workspace 3
 bindsym $mod+4 workspace 4
@@ -105,7 +105,7 @@ bindsym $mod+9 workspace 9
 bindsym $mod+0 workspace 10
 
 # move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace 1
+bindsym $mod+Shift+1 move container to workspace 1: Mail
 bindsym $mod+Shift+2 move container to workspace 2
 bindsym $mod+Shift+3 move container to workspace 3
 bindsym $mod+Shift+4 move container to workspace 4
@@ -155,6 +155,20 @@ bar {
         status_command i3status
 }
 
+
+hide_edge_borders vertical
+
+bindsym XF86AudioLowerVolume exec ~/.i3/volume_ctrl down
+bindsym XF86AudioRaiseVolume exec ~/.i3/volume_ctrl up
+bindsym XF86AudioMute        exec ~/.i3/volume_ctrl mute
+
+assign     [class="Icedove"] 1: Mail
+for_window [class="Icedove"] layout tabbed
+
+for_window [class="^Google-chrome"] focus child; layout tabbed; focus
+
+for_window [class="Xfce4-notifyd"] floating enable; border none; focus mode_toggle
+
 exec xsetroot -solid "SteelBlue4"
 
 exec ~/.i3/auto-start
diff --git a/.i3/volume_ctrl b/.i3/volume_ctrl
new file mode 100755
--- /dev/null
+++ b/.i3/volume_ctrl
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+cmd = ARGV.shift
+
+if cmd == 'up'
+  system 'amixer -q set Master 5%+ unmute'
+elsif cmd == 'down'
+  system 'amixer -q set Master 5%- unmute'
+elsif cmd == 'mute'
+  system 'amixer -q set Master toggle'
+end
+
+# nudge i3stats for an update
+system 'killall -USR1 i3status'
diff --git a/.i3status.conf b/.i3status.conf
--- a/.i3status.conf
+++ b/.i3status.conf
@@ -12,8 +12,9 @@ general {
         interval = 10
 }
 
-order += "ethernet eth0"
 order += "load"
+order += "battery 0"
+order += "volume master"
 order += "tztime local"
 
 wireless wlan0 {
@@ -52,7 +53,7 @@ tztime local {
 }
 
 load {
-        format = "%1min"
+        format = "%5min"
 }
 
 disk "/" {
diff --git a/.oh-my-zsh.cust/themes/mhoward.zsh-theme b/.oh-my-zsh.cust/themes/mhoward.zsh-theme
diff --git a/.xsessionrc b/.xsessionrc
old mode 100644
new mode 100755
diff --git a/.xsessionrc.local b/.xsessionrc.local
new file mode 100644
--- /dev/null
+++ b/.xsessionrc.local
@@ -0,0 +1,11 @@
+/usr/bin/xset b off
+
+/usr/bin/syndaemon -i 1 -R -k -d
+
+/usr/bin/xscreensaver -nosplash &>/dev/null </dev/null &
+/usr/bin/xfce4-power-manager
+
+/usr/bin/pulseaudio --daemonize
+
+/usr/bin/nm-applet &>/dev/null </dev/null &
+