Merge remote-tracking branch 'origin/master' into phoenix

Conflicts:
	.emacs.d/site-lisp/oni.el
	.xinitrc
	.zprofile

4 files changed, 174 insertions, 2 deletions

diff --git a/.emacs.d/site-lisp/mu4e-init.el b/.emacs.d/site-lisp/mu4e-init.el
new file mode 100644
index 0000000..258a6ef
--- /dev/null
+++ b/.emacs.d/site-lisp/mu4e-init.el
@@ -0,0 +1,54 @@
+;;; mu4e-init.el --- mu4e initialization
+
+;; Copyright (C) 2012  Tom Willemsen
+
+;; Author: Tom Willemsen <slash@drd>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(require 'oni)
+
+(oni:define-mailbox "aethon"
+                    (oni:email thomas at aethon dot nl)
+ (expand-file-name "~/documents/work/aethon/signature.txt"))
+(oni:define-mailbox "gmail" (oni:email ryuslash at gmail dot com))
+(oni:define-mailbox "ninthfloor"
+                    (oni:email ryuslash at ninthfloor dot org))
+(oni:define-mailbox "ryuslash" (oni:email tom at ryuslash dot org)
+                    nil "ryuslash.org")
+
+(setq mu4e-headers-date-format "%d-%m %H:%M")
+(setq mu4e-headers-fields '((:date . 11)
+                            (:flags . 6)
+                            (:to . 22)
+                            (:from . 22)
+                            (:subject)))
+(setq mu4e-headers-show-threads nil)
+(setq mu4e-headers-sort-revert nil)
+(setq mu4e-html2text-command "w3m -dump -T text/HTML -cols 72")
+(setq mu4e-my-email-addresses (list
+                               (oni:email tom at ryuslash dot org)
+                               (oni:email ryuslash at gmail dot com)
+                               (oni:email ryuslash at ninthfloor dot org)
+                               (oni:email thomas at aethon dot nl)))
+
+(provide 'mu4e-init)
+;;; mu4e-init.el ends here
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el
index 2f60c63..35e85dc 100644
--- a/.emacs.d/site-lisp/oni.el
+++ b/.emacs.d/site-lisp/oni.el
@@ -361,7 +361,8 @@ PLIST contains all the pertinent information."
            (episode (match-string 2 str))
            (name (match-string 3 str))
            (date (oni:mini-fix-timestamp-string (match-string 4 str))))
-      (format "* ACQUIRE %s %s - %s <%s>" title episode name date))))
+      (format "* ACQUIRE %s %s - %s \n  SCHEDULED: <%s>"
+              title episode name date))))
 
 (defun oni:newline-and-indent ()
   "`newline-and-indent', but with a twist.
@@ -393,7 +394,8 @@ When dealing with braces, add another line and indent that too."
   "Function for `prog-mode-hook'."
   (rainbow-delimiters-mode)
   (fci-mode)
-  (pretty-symbols-mode))
+  (pretty-symbols-mode)
+  (auto-fill-mode))
 
 (defun oni:python-mode-func ()
   "Function for `python-mode-hook'."
diff --git a/.emacs.d/site-lisp/org-init.el b/.emacs.d/site-lisp/org-init.el
new file mode 100644
index 0000000..7345f91
--- /dev/null
+++ b/.emacs.d/site-lisp/org-init.el
@@ -0,0 +1,113 @@
+;;; org-init.el --- Org initialization
+
+;; Copyright (C) 2012  Tom Willemsen
+
+;; Author: Tom Willemsen <slash@drd>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(require 'appt)
+(require 'oni)
+(require 'org-contacts)
+(require 'org-habit)
+(require 'org-protocol)
+
+(eval-after-load "org-crypt"
+  '(org-crypt-use-before-save-magic))
+
+(setq org-agenda-custom-commands
+      '(("wt" "Work todo."
+         tags-todo "CATEGORY=\"Work\"")
+        ("wm" "Myaethon2 todo."
+         tags-todo "CATEGORY=\"myaethon2\"")))
+(setq org-agenda-sorting-strategy
+      '((agenda habit-down time-up priority-down category-keep)
+        (todo priority-down tag-up category-up)
+        (tags priority-down category-keep)
+        (search category-keep)))
+(setq org-agenda-tags-column -101)
+(setq org-capture-templates
+      '(("t" "Task" entry (file "~/documents/org/tasks")
+         "* TODO %?")
+        ("h" "Habit" entry (file "")
+         (concat "* TODO %^{Description}\n"
+                 "  SCHEDULED: %^T\n"
+                 "  :PROPERTIES:\n"
+                 "  :STYLE:    habit\n"
+                 "  :END:")
+         :immediate-finish t)
+        ("l" "Log" entry (file+headline "" "notes")
+         (concat "* %n %<%d-%m-%Y %H:%M:%S>\n"
+                 "  %a\n\n"
+                 "  %?")
+         :prepend t :empty-lines 1)
+        ("a" "Appointment" entry (file+headline "" "appointments")
+         "* %^{Description} %^T" :immediate-finish t)
+        ("b" "Bookmark" entry (file "~/documents/org/misc/bookmarks.org")
+         "* %c\n\n  %:initial")))
+(setq org-contacts-files '("~/documents/org/misc/contacts.org"))
+(setq org-directory (expand-file-name "~/documents/org"))
+(setq org-agenda-files
+      (append
+       `(,(concat org-directory "/tasks")
+         ,(concat org-directory "/misc/contacts.org")
+         ,(concat org-directory "/misc/bookmarks.org"))
+       org-agenda-files))
+(setq org-agenda-todo-ignore-deadlines 'far)
+(setq org-agenda-todo-ignore-scheduled t)
+(setq org-default-notes-file (concat org-directory "/org"))
+(setq org-export-htmlize-output-type 'css)
+(setq org-feed-alist
+      '(("MyEpisodes"
+         "http://www.myepisodes.com/rss.php?feed=mylist&uid=Slash&pwdmd5=04028968e1f0b7ee678b748a4320ac17"
+         "~/documents/org/tasks" "MyEpisodes"
+         :formatter oni:myepisodes-formatter)))
+(setq org-hide-emphasis-markers t)
+(setq org-outline-path-complete-in-steps t)
+(setq org-refile-allow-creating-parent-nodes t)
+(setq org-refile-targets '((nil . (:maxlevel . 6))))
+(setq org-refile-use-outline-path 'file)
+(setq org-return-follows-link t)
+(setq org-src-fontify-natively t)
+(setq org-tags-column -101)
+(setq org-tags-exclude-from-inheritance '("crypt"))
+(setq org-todo-keyword-faces
+      '(("TODO"        :background "red")
+        ("DONE"        :background "forest green")
+        ("SUCCEEDED"   :background "forest green")
+        ("WAITING"     :background "orange" :foreground "black")
+        ("CANCELLED"   :background "orange red")
+        ("FAILED"      :background "orange red")
+        ("WIP"         :background "#ff9800" :foreground "black")
+        ("HOLD"        :background "orange" :foreground "black")
+        ("ACQUIRE"     :background "red")
+        ("IGNORED"     :background "#555555")))
+(setq org-use-fast-todo-selection t)
+
+(add-to-list 'org-modules 'habit)
+
+(org-indent-mode t)
+
+(org-agenda-to-appt)
+(ad-activate 'org-agenda-redo)
+
+(provide 'org-init)
+;;; org-init.el ends here
diff --git a/.emacs.d/site-lisp/wm-init.el b/.emacs.d/site-lisp/wm-init.el
new file mode 100644
index 0000000..1ff0501
--- /dev/null
+++ b/.emacs.d/site-lisp/wm-init.el
@@ -0,0 +1,3 @@
+(async-shell-command "herbstluftwm" " herbstluftwm")
+(async-shell-command "dunst" " dunst")
+(async-shell-command "xbindkeys -n" " xbindkeys")