# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1402128003 14400
# Node ID 05694efc29da3302075aa2f6df80b5d031fa577a
# Parent  42986c867b4d504e70bb647486e2a5cf303dfbbb# Parent  c945635e1f3465cfa123161ed52f16eb9708ae72
Merge from default

diff --git a/.i3/auto-start b/.i3/auto-start
--- a/.i3/auto-start
+++ b/.i3/auto-start
@@ -87,16 +87,17 @@ StartProgName()
 # i3-msg resize shrink up 32 px or 32 ppt
 #
 
+
 StartProg xfce4-terminal
 
 i3-msg 'split h'
 
 StartProgName gvim
 
-i3-msg 'focus left; split v'
-
-StartProg xfce4-terminal
-
-i3-msg 'resize shrink height 20 px or 20 ppt'
+# i3-msg 'focus left; split v'
+#
+# StartProg xfce4-terminal
+#
+# i3-msg 'resize shrink height 20 px or 20 ppt'
 
 exit 0
diff --git a/.i3/config b/.i3/config
--- a/.i3/config
+++ b/.i3/config
@@ -35,8 +35,8 @@ bindsym $mod+Shift+q kill
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
-bindsym $mod+d exec --no-startup-id ~/.i3/i3-dmenu-desktop
-# bindsym $mod+d exec --no-startup-id ~/.i3/j4-dmenu-desktop --dmenu="dmenu -i -b -p ] -nf \#CCC -nb \#555"
+# bindsym $mod+d exec --no-startup-id ~/.i3/i3-dmenu-desktop
+bindsym $mod+d exec --no-startup-id ~/.i3/j4-dmenu-desktop --dmenu="dmenu -i -b -p ] -nf \#CCC -nb \#555"
 
 # change focus
 bindsym $mod+j focus left
@@ -155,8 +155,14 @@ bar {
         status_command i3status
 }
 
+
+bindsym XF86AudioLowerVolume exec ~/.i3/volume_ctrl down
+bindsym XF86AudioRaiseVolume exec ~/.i3/volume_ctrl up
+bindsym XF86AudioMute        exec ~/.i3/volume_ctrl mute
+
+for_window [class="Xfce4-notifyd"] floating enable; border none; focus mode_toggle
+
 exec xsetroot -solid "SteelBlue4"
 
-exec xset -dpms s off
 exec ~/.i3/auto-start
 
diff --git a/.i3status.conf b/.i3status.conf
--- a/.i3status.conf
+++ b/.i3status.conf
@@ -9,12 +9,13 @@
 
 general {
         colors = true
-        interval = 5
+        interval = 10
 }
 
-order += "ethernet eth0"
+order += "battery 0"
 order += "load"
 order += "tztime local"
+order += "volume master"
 
 wireless wlan0 {
         format_up = "W: (%quality at %essid) %ip"
@@ -29,8 +30,16 @@ ethernet eth0 {
 
 battery 0 {
         format = "%status %percentage %remaining"
+        integer_battery_capacity = true
 }
 
+volume master {
+        format = "♪ %volume"
+        format_muted = "♪̶ %volume"
+        device = "default"
+        mixer = "Master"
+        mixer_idx = 0
+}
 run_watch DHCP {
         pidfile = "/var/run/dhclient*.pid"
 }
@@ -40,7 +49,7 @@ run_watch VPN {
 }
 
 tztime local {
-        format = "%Y-%m-%d %H:%M:%S"
+        format = "%Y-%m-%d %H:%M"
 }
 
 load {
diff --git a/.xsession b/.xsession
new file mode 100755
--- /dev/null
+++ b/.xsession
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+export PATH="$HOME/.plenv/bin:$PATH"
+eval "$(plenv init -)"
+
+export PATH="$HOME/.rbenv/bin:$PATH"
+eval "$(rbenv init -)"
+
+
+/usr/bin/xset b off
+
+/usr/bin/syndaemon -i 1 -d
+/usr/bin/synclient TapButton1=1
+
+/usr/bin/xcompmgr -n &>/dev/null </dev/null &
+/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 &
+
+
+exec i3
+