From cdffc846bbc81a8bbf976a46321898fdd7073c17 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <vincent@spotify.com>
Date: Mon, 29 Jul 2013 00:53:08 +0200
Subject: Emacs: Various changes:

- Moved Haskell-mode configuration to customize
- Disabled Paredit in non-lisp buffers (or more explicitly: Enabled it
  in Elisp and Clojure buffers)
- Removed some custom items that I don't use anymore (e.g. Jabber-mode
  because I switched to bitlbee with rcirc)
- New packages: hi2 (Haskell indent mode revamped), browse-kill-ring
- Always enable undo-tree-mode and recentf-mode
- Keep all auto-save files in /tmp
---
 emacs.d/init-custom.el   | 12 ++++--------
 emacs.d/init-modes.el    | 15 +++++++++++----
 emacs.d/init-settings.el |  7 +++++++
 emacs.d/init.el          | 41 +++++++++++++++++++++--------------------
 4 files changed, 43 insertions(+), 32 deletions(-)

(limited to 'emacs.d')

diff --git a/emacs.d/init-custom.el b/emacs.d/init-custom.el
index dad8de7454d4..f3859ba1dd91 100644
--- a/emacs.d/init-custom.el
+++ b/emacs.d/init-custom.el
@@ -9,15 +9,11 @@
  '(erc-modules
    (quote
     (autojoin button completion dcc irccontrols list log match menu move-to-prompt netsplit networks noncommands notifications readonly ring scrolltobottom stamp track)))
- '(haskell-mode-hook (quote (font-lock-mode)))
- '(jabber-account-list (quote (("im@tazj.in"))))
- '(jabber-history-enabled t)
- '(jabber-mode-line-compact t)
- '(jabber-mode-line-mode t)
+ '(haskell-mode-hook
+   (quote
+    (capitalized-words-mode turn-on-haskell-decl-scan turn-on-haskell-doc turn-on-hi2)))
  '(ns-alternate-modifier (quote none))
- '(ns-command-modifier (quote meta))
- '(yapm-file-path "~/.pass.gpg")
- '(yapm-user (quote hej@tazj\.in)))
+ '(ns-command-modifier (quote meta)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/emacs.d/init-modes.el b/emacs.d/init-modes.el
index 74178b1e8463..39dcfd74bc38 100644
--- a/emacs.d/init-modes.el
+++ b/emacs.d/init-modes.el
@@ -14,8 +14,9 @@
 
 ;; Configure haskell-mode
 ;; Enable semi-automatic indentation and font-locking
-(add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
-(add-hook 'haskell-mode-hook 'font-lock-mode)
+(require 'hi2)
+;;(add-hook 'haskell-mode-hook 'turn-on-hi2)
+;;(add-hook 'haskell-mode-hook 'font-lock-mode)
 
 ;; Add keybindings to move nested blocks with C-, rsp. C-.
 (define-key haskell-mode-map (kbd "C-,") 'haskell-move-nested-left)
@@ -40,11 +41,17 @@
 ;; Enable rainbow-delimiters for all things programming
 (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
 
-;; Enable paredit in all programming buffers
-(add-hook 'prog-mode-hook 'paredit-mode)
+;; Enable Paredit in Emacs Lisp mode
+(add-hook 'emacs-lisp-mode-hook 'paredit-mode)
 
 ;; Always highlight matching brackets
 (show-paren-mode 1)
 
+;; Undo-Tree at all times!
+(undo-tree-mode)
+
+;; Keep track of recent files
+(recentf-mode)
+
 ;; Enable Nyan mode
 (nyan-mode 1)
diff --git a/emacs.d/init-settings.el b/emacs.d/init-settings.el
index 2d1f3c4bcc98..aa702bf8bc11 100644
--- a/emacs.d/init-settings.el
+++ b/emacs.d/init-settings.el
@@ -9,6 +9,7 @@
 (add-to-list 'exec-path (expand-file-name "~/bin"))
 (add-to-list 'exec-path "/Applications/Racket/bin")
 
+
 (when window-system
   (setq frame-title-format '(buffer-file-name "%f" ("%b")))
   (tooltip-mode -1)
@@ -172,6 +173,12 @@ comment as a filename."
   '(ace-jump-mode-enable-mark-sync))
 (define-key global-map (kbd "C-x ö") 'ace-jump-mode-pop-mark)
 
+;; Keep your backup files in tmp, emacs!
+(setq backup-directory-alist
+      `((".*" . ,temporary-file-directory)))
+(setq auto-save-file-name-transforms
+      `((".*" ,temporary-file-directory t)))
+
 ;; Eshell
 ;; Start/join
 (global-set-key (kbd "C-x m") 'eshell)
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 3710b6380b69..35d5fda16bb8 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -13,26 +13,27 @@
 (when (not package-archive-contents)
   (package-refresh-contents))
 
-;; Important defvar
-(defvar my-pkgs '(haskell-mode
-		  idle-highlight-mode
-		  ido-ubiquitous
-		  magit
-		  paredit
-		  smex
-		  ace-jump-mode
-		  clojure-mode
-		  leuven-theme
-		  magit
-		  markdown-mode
-		  nrepl
-		  projectile
-		  rainbow-delimiters
-                  geiser
-                  quack
-		  rainbow-mode
-		  )
-
+(defvar my-pkgs
+  '(ace-jump-mode
+    browse-kill-ring
+    clojure-mode
+    flycheck
+    haskell-mode
+    hi2
+    idle-highlight-mode
+    ido-ubiquitous
+    leuven-theme
+    magit
+    magit
+    markdown-mode
+    nrepl
+    paredit
+    projectile
+    rainbow-delimiters
+    rainbow-mode
+    smex
+    geiser
+    quack)
   "A list of packages to install at launch.")
 
 (dolist (p my-pkgs)
-- 
cgit 1.4.1