.emacs.d/init.el

1 files changed, 25 insertions, 81 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 42ba442..d25a0f9 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -46,6 +46,21 @@
 (defalias 'yes-or-no-p 'y-or-n-p)
 (defalias 'list-buffers 'ibuffer)
 
+(defface git-commit-summary-face
+  '((t (:inherit org-level-1)))
+  "Face for the git title line."
+  :group 'local)
+
+(defface git-commit-overlong-summary-face
+  '((t (:background "#873732")))
+  "Face for commit titles that are too long."
+  :group 'local)
+
+(defface git-commit-nonempty-second-line-face
+  '((t (:inherit git-commit-overlong-summary-face)))
+  "Face for the supposedly empty line in commit messages."
+  :group 'local)
+
 (eval-after-load "ebuff-menu"
   '(define-key electric-buffer-menu-mode-map
      (kbd "C-s") 'isearch-forward))
@@ -96,21 +111,7 @@
   '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo))
 
 (eval-after-load "org"
-  '(progn
-     (require 'appt)
-     (require 'org-protocol)
-     (require 'org-habit)
-     (require 'org-contacts)
-
-     (add-to-list 'org-modules 'habit)
-
-     (org-indent-mode t)
-
-     (org-agenda-to-appt)
-     (ad-activate 'org-agenda-redo)))
-
-(eval-after-load "org-crypt"
-  '(org-crypt-use-before-save-magic))
+  '(require 'org-init))
 
 (eval-after-load "sauron"
   '(setq sauron-modules (append '(sauron-identica sauron-jabber)
@@ -154,6 +155,7 @@
       `((".*" . ,temporary-file-directory)))
 (setq browse-url-browser-function 'browse-url-generic)
 (setq browse-url-generic-program (getenv "BROWSER"))
+(setq comment-auto-fill-only-comments t)
 (setq custom-file "~/.emacs.d/custom.el")
 (setq custom-theme-directory "~/.emacs.d/themes")
 (setq default-frame-alist
@@ -186,6 +188,7 @@
            "Empty docstring"
            "multiple imports on one line"
            "expected 2 blank lines, found 1"
+           "expected 2 blank lines, found 0"
            "TODO:"
            "whitespace after '{'"
            "whitespace before '}'"
@@ -201,7 +204,8 @@
            "missing whitespace after ','"
            "line too long"
            "at least two spaces before inline comment"
-           "trailing whitespace"))))
+           "trailing whitespace"
+           "too many blank lines"))))
 (setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log"))
 (setq flymake-log-level 0)
 (setq flymake-warn-line-regexp
@@ -262,68 +266,6 @@
                                (oni:email ryuslash at gmail dot com)
                                (oni:email ryuslash at ninthfloor dot org)
                                (oni:email thomas at aethon dot nl)))
-(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 category-up)
-        (tags priority-down category-keep)
-        (search category-keep)))
-(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
-      `(,(concat org-directory "/org")
-        ,(concat org-directory "/misc/contacts.org")
-        ,(concat org-directory "/misc/bookmarks.org")))
-(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-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)
 (setq package-archives
       '(("melpa" . "http://melpa.milkbox.net/packages/")
         ("ELPA" . "http://tromey.com/elpa/")
@@ -393,7 +335,6 @@
 (add-hook 'term-mode-hook 'oni:term-mode-func)
 (add-hook 'texinfo-mode-hook 'oni:texinfo-mode-func)
 (add-hook 'write-file-hooks 'oni:write-file-func)
-(add-hook 'yas-minor-mode-hook 'oni:yas-minor-mode-func)
 
 (global-set-key (kbd "'") 'oni:self-insert-dwim)
 (global-set-key (kbd "<XF86AudioNext>") 'emms-next)
@@ -408,8 +349,8 @@
 (global-set-key (kbd "<f6>") 'jabber-switch-to-roster-buffer)
 (global-set-key (kbd "<f7>") 'magit-status)
 (global-set-key (kbd "<f8>") 'oni:raise-eshell)
-(global-set-key (kbd "C-<") 'indent-shift-left)
-(global-set-key (kbd "C->") 'indent-shift-right)
+(global-set-key (kbd "C-<") 'oni:indent-shift-left)
+(global-set-key (kbd "C->") 'oni:indent-shift-right)
 (global-set-key (kbd "C-M-4") 'split-window-vertically)
 (global-set-key (kbd "C-M-SPC") 'er/expand-region)
 (global-set-key (kbd "C-M-d") 'kill-word)
@@ -496,6 +437,9 @@
 (load "quick-edit-mode")
 (global-set-key (kbd "C-z") 'quick-edit-mode)
 
+(unless (server-running-p)
+  (load "wm-init"))
+
 (provide 'init)
 
 ;;; init.el ends here