4 files changed, 67 insertions, 6 deletions
diff --git a/.i3/i3status.conf b/.i3/i3status.conf
new file mode 100644
index 0000000..7052e23
--- /dev/null
+++ b/.i3/i3status.conf
@@ -0,0 +1,57 @@
+# 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 = 5
+}
+
+order += "ipv6"
+order += "disk /"
+order += "run_watch DHCP"
+order += "run_watch VPN"
+order += "wireless _first_"
+order += "ethernet _first_"
+order += "battery 0"
+order += "load"
+order += "tztime local"
+
+wireless _first_ {
+        format_up = "W: (%quality at %essid) %ip"
+        format_down = "W: down"
+}
+
+ethernet _first_ {
+        # if you use %speed, i3status requires root privileges
+        format_up = "E: %ip (%speed)"
+        format_down = "E: down"
+}
+
+battery 0 {
+        format = "%status %percentage %remaining"
+}
+
+run_watch DHCP {
+        pidfile = "/var/run/dhclient*.pid"
+}
+
+run_watch VPN {
+        pidfile = "/var/run/vpnc/pid"
+}
+
+tztime local {
+        format = "%Y-%m-%d %H:%M:%S"
+}
+
+load {
+        format = "%1min"
+}
+
+disk "/" {
+        format = "%avail"
+}
diff --git a/.mutt/mailcap b/.mutt/mailcap
index 5961957..c4f43e8 100644
--- a/.mutt/mailcap
+++ b/.mutt/mailcap
@@ -1,4 +1,5 @@
+text/html; uzbl-browser %s;
 text/html; w3m -dump %s; nametemplate=%s.html; copiousoutput
-text/html; uzbl-browser %s ;
+text/plain; more %s;
 image/*; feh %s
 application/pdf; zathura %s
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 8b48345..1894f87 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -56,12 +56,14 @@ set editor="vim"
 set include=yes
 
 # Macros
-macro index,pager gm "<change-folder> +Main/Main<enter>" 
-macro index,pager gp "<change-folder> +Personal/Personal<enter>" 
-macro index,pager gi "<change-folder> +Informal/Informal<enter>" 
-macro index,pager gw "<change-folder> +Work/Work<enter>" 
+macro index,pager gm "<change-folder> +Main/Main<enter>"
+macro index,pager gp "<change-folder> +Personal/Personal<enter>"
+macro index,pager gi "<change-folder> +Informal/Informal<enter>"
+macro index,pager gw "<change-folder> +Work/Work<enter>"
 
 # Key bindings
+bind attach <return> view-mailcap
+
 bind index,pager \Cf next-page
 bind index,pager \Cb previous-page
 bind index,pager \Cu next-unread-mailbox
diff --git a/install.yaml b/install.yaml
index 21f2982..d29820c 100644
--- a/install.yaml
+++ b/install.yaml
@@ -23,7 +23,8 @@ default:
 
 # Special targets
 special:
-    .i3: ~/.config/i3
+    .i3/config: ~/.config/i3/config
+    .i3/i3status.conf: ~/.config/i3status/config
     .mr/mrconfig: ~/.mrconfig
     .mr/mrtrust: ~/.mrtrust
     .msmtprc: ~/.msmptprc