From d4a71024c7bd4e3b090a5d0e526554a66421efe3 Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Sat, 16 Mar 2013 10:42:25 -0700
Subject: Adding a missing config and making mailcap global.

---
 base/conkyrc-json                   | 39 +++++++++++++++++++++++++++++++++++++
 base/mailcap                        |  4 ++++
 host-overrides/jesterpm.net/mailcap |  2 --
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 base/conkyrc-json
 create mode 100644 base/mailcap
 delete mode 100644 host-overrides/jesterpm.net/mailcap

diff --git a/base/conkyrc-json b/base/conkyrc-json
new file mode 100644
index 0000000..dc33e59
--- /dev/null
+++ b/base/conkyrc-json
@@ -0,0 +1,39 @@
+out_to_x no
+own_window no
+out_to_console yes
+background no
+max_text_width 0
+use_spacer left
+
+update_interval 2.0
+cpu_avg_samples 2
+net_avg_samples 2
+
+#${if_xmms2_connected}
+#{ "full_text":"${xmms2_title} - ${xmms2_artist}" },
+#${endif}
+
+TEXT
+[
+
+{ "full_text": "✉ ${new_mails $HOME/.maildir/INBOX/}/${mails $HOME/.maildir/INBOX}",
+  "color": ${if_match ${new_mails $HOME/.maildir/INBOX/}>0}"\#00ff00"${else}"\#ffffff"${endif} },
+ 
+{ "full_text":"/home ${fs_free /home}",
+  "color": ${if_match ${fs_free_perc /home}<5}"\#ff0000"${else}"\#ffffff"${endif} },
+
+{ "full_text":"RAM ${memperc}%",
+  "color":${if_match ${memperc}<90}"\#ffffff"${else}"\#ff0000"${endif} },
+
+{ "full_text":"BATT ${battery BAT0}" }, 
+
+{ "full_text":"${execi 300 weatherbar.sh}" },
+
+{ "full_text":"${loadavg 1}" },
+
+{ "full_text":"♪ ${exec pactl list sinks | awk '/Volume: 0:/ {print substr($3, 1, index($3, "%") - 1)}'|head -n 1}" },
+
+{ "full_text":"${time %a %d %b %Y} ${time %H:%M:%S}",
+  "short_text":"${time %H:%M:%S}" }
+
+],
diff --git a/base/mailcap b/base/mailcap
new file mode 100644
index 0000000..720c93b
--- /dev/null
+++ b/base/mailcap
@@ -0,0 +1,4 @@
+text/calendar; mutt-ical.py -i -e "jesse@jesterpm.net" %s
+application/ics; mutt-ical.py -i -e "jesse@jesterpm.net" %s
+
+text/html; pandoc -f html -t markdown --reference-links; copiousoutput; compose=vim %s
diff --git a/host-overrides/jesterpm.net/mailcap b/host-overrides/jesterpm.net/mailcap
deleted file mode 100644
index 8e6539e..0000000
--- a/host-overrides/jesterpm.net/mailcap
+++ /dev/null
@@ -1,2 +0,0 @@
-text/calendar; mutt-ical.py -i -e "jesse@jesterpm.net" %s
-application/ics; mutt-ical.py -i -e "jesse@jesterpm.net" %s
-- 
cgit v1.2.3