# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1472595303 14400
# Node ID e13ba40f45333f5c4c66922ac0ac24dceaa5ba81
# Parent  7190350f2ab34fa650e5586487a7178503ef098f
Break i3 and i3status configs into component files, to make local mods easier maybe

diff --git a/.i3/Makefile b/.i3/Makefile
new file mode 100644
--- /dev/null
+++ b/.i3/Makefile
@@ -0,0 +1,12 @@
+all: config status
+
+config: config.d/*
+	cat config.d/* > $@
+
+status: status.d/*
+	cat status.d/* > $@
+
+clean:
+	rm -f config status
+
+.PHONY: clean
diff --git a/.i3/config b/.i3/config
deleted file mode 100644
--- a/.i3/config
+++ /dev/null
@@ -1,163 +0,0 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout somewhen, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
-set $mod Mod4
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below. ISO 10646 = Unicode
-font pango:DejaVu Sans Condensed 10
-#~font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, if you need a lot of unicode glyphs or
-# right-to-left text rendering, you should instead use pango for rendering and
-# chose a FreeType font, such as:
-# font pango:DejaVu Sans Mono 10
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# start a terminal
-bindsym $mod+Return exec urxvtc || urxvt
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# start dmenu (a program launcher)
-#~bindsym $mod+d exec dmenu_run
-# 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"
-
-# change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+semicolon focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+semicolon move right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-bindsym $mod+b workspace back_and_forth
-bindsym $mod+minus workspace prev
-bindsym $mod+equal workspace next
-
-# switch to workspace
-bindsym $mod+1 workspace 1
-bindsym $mod+2 workspace 2
-bindsym $mod+3 workspace 3
-bindsym $mod+4 workspace 4
-bindsym $mod+5 workspace 5
-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
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace 1
-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
-bindsym $mod+Shift+5 move container to workspace 5
-bindsym $mod+Shift+6 move container to workspace 6
-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
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -f 'pango:DejaVu Sans 10' -t warning -m 'Do you really want to exit i3?' -b 'Yes, exit i3' 'i3-msg exit'"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym semicolon resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-        status_command i3status
-}
-
-exec xsetroot -solid "SteelBlue4"
-
-for_window [class="xfreerdp"] floating disable
-
-exec ~/.i3/auto-start
-
diff --git a/.i3/config.d/01-base b/.i3/config.d/01-base
new file mode 100644
--- /dev/null
+++ b/.i3/config.d/01-base
@@ -0,0 +1,3 @@
+# i3 config file (v4)
+#
+# Please see http://i3wm.org/docs/userguide.html for a complete reference!
diff --git a/.i3/config.d/20-binds b/.i3/config.d/20-binds
new file mode 100644
--- /dev/null
+++ b/.i3/config.d/20-binds
@@ -0,0 +1,134 @@
+set $mod Mod4
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# start a terminal
+bindsym $mod+Return exec urxvtc || urxvt
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+#bindsym $mod+d exec dmenu_run
+
+# 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"
+
+# change focus
+bindsym $mod+j focus left
+bindsym $mod+k focus down
+bindsym $mod+l focus up
+bindsym $mod+semicolon focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+j move left
+bindsym $mod+Shift+k move down
+bindsym $mod+Shift+l move up
+bindsym $mod+Shift+semicolon move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+bindsym $mod+b workspace back_and_forth
+bindsym $mod+minus workspace prev
+bindsym $mod+equal workspace next
+
+# switch to workspace
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+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
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace 1
+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
+bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+6 move container to workspace 6
+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
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+e exec "i3-nagbar -f 'pango:DejaVu Sans 10' -t warning -m 'Do you really want to exit i3?' -b 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+  # These bindings trigger as soon as you enter the resize mode
+
+  # Pressing left will shrink the window’s width.
+  # Pressing right will grow the window’s width.
+  # Pressing up will shrink the window’s height.
+  # Pressing down will grow the window’s height.
+  bindsym j resize shrink width 10 px or 10 ppt
+  bindsym k resize grow height 10 px or 10 ppt
+  bindsym l resize shrink height 10 px or 10 ppt
+  bindsym semicolon resize grow width 10 px or 10 ppt
+
+  # same bindings, but for the arrow keys
+  bindsym Left resize shrink width 10 px or 10 ppt
+  bindsym Down resize grow height 10 px or 10 ppt
+  bindsym Up resize shrink height 10 px or 10 ppt
+  bindsym Right resize grow width 10 px or 10 ppt
+
+  # back to normal: Enter or Escape
+  bindsym Return mode "default"
+  bindsym Escape mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
diff --git a/.i3/config.d/40-font b/.i3/config.d/40-font
new file mode 100644
--- /dev/null
+++ b/.i3/config.d/40-font
@@ -0,0 +1,11 @@
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below. ISO 10646 = Unicode
+#font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# The font above is very space-efficient, that is, it looks good, sharp and
+# clear in small sizes. However, if you need a lot of unicode glyphs or
+# right-to-left text rendering, you should instead use pango for rendering and
+# chose a FreeType font, such as:
+#font pango:DejaVu Sans Mono 10
+
+font pango:DejaVu Sans Condensed 10
+
diff --git a/.i3/config.d/50-colors b/.i3/config.d/50-colors
new file mode 100644
--- /dev/null
+++ b/.i3/config.d/50-colors
@@ -0,0 +1,7 @@
+# Colors -- make them like vim's jellybeans
+#
+client.focused            #457ee0   #345fa8   #deebfe   #8fbfdc
+client.focused_inactive   #444444   #333333   #c7c7c7   #333333
+client.unfocused          #444444   #333333   #777777   #333333
+client.urgent             #c02a2a   #902020   #ffffff   #902020
+
diff --git a/.i3/config.d/60-bar b/.i3/config.d/60-bar
new file mode 100644
--- /dev/null
+++ b/.i3/config.d/60-bar
@@ -0,0 +1,16 @@
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+  status_command "exec i3status -c $HOME/.i3/status"
+  colors {
+    background           #000000
+    statusline           #c7c7c7
+    separator            #777777
+
+    focused_workspace    #457ee0   #345fa8   #deebfe
+    active_workspace     #444444   #333333   #c7c7c7
+    inactive_workspace   #444444   #333333   #777777
+    urgent_workspace     #c02a2a   #902020   #ffffff
+  }
+}
+
diff --git a/.i3/config.d/80-for-window b/.i3/config.d/80-for-window
new file mode 100644
--- /dev/null
+++ b/.i3/config.d/80-for-window
@@ -0,0 +1,2 @@
+for_window [class="xfreerdp"] floating disable
+
diff --git a/.i3/config.d/90-auto-start b/.i3/config.d/90-auto-start
new file mode 100644
--- /dev/null
+++ b/.i3/config.d/90-auto-start
@@ -0,0 +1,3 @@
+exec xsetroot -solid "SteelBlue4"
+
+exec ~/.i3/auto-start
diff --git a/.i3/status.d/10-general b/.i3/status.d/10-general
new file mode 100644
--- /dev/null
+++ b/.i3/status.d/10-general
@@ -0,0 +1,17 @@
+# i3status configuration file.
+# see "man i3status" for documentation.
+
+# It is important that this file is edited as UTF-8.
+# The following line should contain a sharp s:
+# ß
+# If the above line is not correctly displayed, fix your editor first!
+
+general {
+        output_format = i3bar
+        colors = true
+        interval = 10
+        color_good = "#65c254"
+        color_degraded = "#ffb964"
+        color_bad = "#c02a2a"
+}
+
diff --git a/.i3/status.d/25-order b/.i3/status.d/25-order
new file mode 100644
--- /dev/null
+++ b/.i3/status.d/25-order
@@ -0,0 +1,4 @@
+order += "ethernet eth0"
+order += "load"
+order += "tztime local"
+
diff --git a/.i3/status.d/50-defs b/.i3/status.d/50-defs
new file mode 100644
--- /dev/null
+++ b/.i3/status.d/50-defs
@@ -0,0 +1,42 @@
+wireless wlan0 {
+        format_up = "W: (%quality at %essid) %ip"
+        format_down = "W: down"
+}
+
+ethernet eth0 {
+        # if you use %speed, i3status requires root privileges
+        format_up = "E: %ip"
+        format_down = "E: down"
+}
+
+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"
+}
+
+run_watch VPN {
+        pidfile = "/var/run/vpnc/pid"
+}
+
+tztime local {
+        format = "%m-%d %H:%M"
+}
+
+load {
+        format = "%1min"
+}
+
+disk "/" {
+        format = "%avail"
+}
diff --git a/.i3status.conf b/.i3status.conf
deleted file mode 100644
--- a/.i3status.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-        colors = true
-        interval = 10
-}
-
-order += "ethernet eth0"
-order += "load"
-order += "tztime local"
-
-wireless wlan0 {
-        format_up = "W: (%quality at %essid) %ip"
-        format_down = "W: down"
-}
-
-ethernet eth0 {
-        # if you use %speed, i3status requires root privileges
-        format_up = "E: %ip"
-        format_down = "E: down"
-}
-
-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"
-}
-
-run_watch VPN {
-        pidfile = "/var/run/vpnc/pid"
-}
-
-tztime local {
-        format = "%m-%d %H:%M"
-}
-
-load {
-        format = "%1min"
-}
-
-disk "/" {
-        format = "%avail"
-}
diff --git a/.xsessionrc b/.xsessionrc
--- a/.xsessionrc
+++ b/.xsessionrc
@@ -14,6 +14,8 @@ fi
 
 urxvtd -q -o -f
 
+make -C ~/.i3
+
 if [ -r ~/.xsessionrc.local ]; then
   . ~/.xsessionrc.local
 fi