# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1413489669 14400
# Node ID a006fee06b803b63cd5d05a8db0bf210791c3592
# Parent  a8216c3221afd505db2a3fb8650eaf887dfc86c7# Parent  69896d410e89ca9bbb6098126de3ac90c0bbe8fc
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
@@ -102,7 +102,7 @@ bindsym $mod+6 workspace 6
 bindsym $mod+7 workspace 7
 bindsym $mod+8 workspace 8
 bindsym $mod+9 workspace 9
-bindsym $mod+0 workspace 10
+bindsym $mod+0 workspace 10: Mail
 
 # move focused container to workspace
 bindsym $mod+Shift+1 move container to workspace 1
@@ -114,7 +114,7 @@ bindsym $mod+Shift+6 move container to w
 bindsym $mod+Shift+7 move container to workspace 7
 bindsym $mod+Shift+8 move container to workspace 8
 bindsym $mod+Shift+9 move container to workspace 9
-bindsym $mod+Shift+0 move container to workspace 10
+bindsym $mod+Shift+0 move container to workspace 10: Mail
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
@@ -155,7 +155,19 @@ bar {
         status_command i3status
 }
 
-exec xsetroot -solid "SteelBlue4"
+
+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"] 10: 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
 
 for_window [class="xfreerdp"] floating disable
 
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,12 +12,15 @@ general {
         interval = 10
 }
 
-order += "ethernet eth0"
 order += "load"
+order += "volume master"
+order += "disk /"
+order += "cpu_temperature 0"
+order += "battery 0"
 order += "tztime local"
 
 wireless wlan0 {
-        format_up = "W: (%quality at %essid) %ip"
+        format_up = "W: %essid"
         format_down = "W: down"
 }
 
@@ -52,9 +55,14 @@ tztime local {
 }
 
 load {
-        format = "%1min"
+        format = "%1min %5min"
 }
 
 disk "/" {
         format = "%avail"
 }
+
+cpu_temperature 0 {
+	format = "%degrees °C"
+        path = "/sys/devices/platform/coretemp.0/temp2_input"
+}
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 &
+