emacs: Redo again

1 files changed, 47 insertions, 19 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b4b6b73..dddef30 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -8,6 +8,23 @@
 
 (load (concat user-emacs-directory "init2"))
 
+(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 "eldoc" '(diminish 'eldoc-mode))
+(eval-after-load "em-term" '(add-to-list 'eshell-visual-commands "unison"))
 (eval-after-load "emms-source-file" '(oni:emms-init))
 (eval-after-load "flymake" '(oni:flymake-init))
 (eval-after-load "ido" '(oni:ido-init))
@@ -18,6 +35,24 @@
 (eval-after-load "smex" '(oni:smex-init))
 (eval-after-load "yasnippet" '(oni:yasnippet-init))
 
+(autoload 'define-slime-contrib "slime")
+(autoload 'gtags-mode "gtags" nil t)
+(autoload 'jabber-connect "jabber" nil t)
+(autoload 'php-mode "php-mode" nil t)
+(autoload 'po-mode "po-mode" nil t)
+(autoload 'pony-mode "pony-mode" nil t)
+(autoload 'sawfish-mode "sawfish" nil t)
+(autoload 'server-running-p "server")
+(autoload 'slime-js-minor-mode "slime-js" nil t)
+(autoload 'xmodmap-mode "xmodmap-mode" nil t)
+(autoload 'w3m-bookmark-view "w3m" nil t)
+(autoload 'w3m-goto-url "w3m" nil t)
+
+(require 'geiser-install)
+(require 'uniquify)
+(require 'ext)
+(require 'oni)
+
 (put 'upcase-region 'disabled nil)
 (put 'downcase-region 'disabled nil)
 (put 'narrow-to-region 'disabled nil)
@@ -36,11 +71,9 @@
 (setq appt-disp-window-function #'oni:appt-display-window-and-jabber)
 (setq appt-display-diary nil)
 (setq auto-mode-case-fold nil)
-(setq auto-save-file-name-transforms
-      `((".*" ,temporary-file-directory t)))
+(setq auto-save-file-name-transforms oni:auto-save-name-transforms)
 (setq avandu-article-render-function #'avandu-view-w3m)
-(setq backup-directory-alist
-      `((".*" . ,temporary-file-directory)))
+(setq backup-directory-alist oni:backup-directory-alist)
 (setq browse-url-browser-function 'browse-url-generic)
 (setq browse-url-generic-program (getenv "BROWSER"))
 (setq c-offsets-alist '((statement-block-intro . +)
@@ -66,6 +99,7 @@
         (menu-bar-lines . nil)
         (tool-bar-lines . nil)
         (font . "Monaco-12")))
+(setq elnode-do-init nil)
 (setq emms-source-file-default-directory "/mnt/music/")
 (setq erc-autojoin-channels-alist
       '(("freenode.net" "#ninthfloor" "#emacs")))
@@ -153,6 +187,7 @@
 (setq jabber-chat-local-prompt-format "%t >\n")
 (setq jabber-chatstates-confirm nil)
 (setq jabber-history-dir "~/.emacs.d/jabber")
+(setq jabber-muc-autojoin '("aethon@muc.ryuslash.org"))
 (setq jabber-roster-show-bindings nil)
 (setq jit-lock-defer-time 0.2)
 (setq magit-repo-dirs '("~/projects/" "~/var/src/"))
@@ -226,6 +261,9 @@
 (add-hook 'write-file-hooks 'oni:write-file-func)
 (add-hook 'yas-minor-mode-hook 'oni:yas-minor-mode-func)
 
+(define-key key-translation-map (kbd "C-j") (kbd "C-l"))
+(define-key key-translation-map (kbd "C-l") (kbd "C-j"))
+
 (global-set-key (kbd "'") 'oni:self-insert-dwim)
 (global-set-key (kbd "<XF86AudioNext>") 'emms-next)
 (global-set-key (kbd "<XF86AudioPlay>") 'oni:emms-toggle-playing)
@@ -293,24 +331,15 @@
  'display-buffer-alist
  '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil))))
 
-(unless (oni:required-packages-installed-p)
-  (message "%s" "Refreshing package database...")
-  (package-refresh-contents)
-  (message "%s" " done.")
-  (mapc #'(lambda (package)
-            (when (not (package-installed-p package))
-              (package-install package)))
-        oni:required-packages))
-
 (blink-cursor-mode -1)
 (column-number-mode -1)
 (line-number-mode -1)
-(menu-bar-mode -1)
-(scroll-bar-mode -1)
-(tool-bar-mode -1)
 (tooltip-mode -1)
 
+(package-initialize)
+
 (auto-insert-mode)
+(cua-selection-mode t)
 (electric-indent-mode)
 (electric-pair-mode)
 (ido-mode)
@@ -321,8 +350,8 @@
 
 (smex-initialize)
 (help-at-pt-set-timer)
-
-(load-theme 'yoshi t)
+(windmove-default-keybindings)
+(global-diff-hl-mode)
 
 (load custom-file)
 ;; (load "rudel-loaddefs.el")
@@ -335,7 +364,6 @@
   (server-start))
 
 (diminish 'auto-fill-function "_")
-(ac-config-default)
 
 (provide 'init)