about summary refs log tree commit diff
path: root/emacs.d/init-custom.el
diff options
context:
space:
mode:
authorVincent Ambo <vincent@spotify.com>2013-07-28T22·53+0200
committerVincent Ambo <vincent@spotify.com>2013-07-28T22·53+0200
commitcdffc846bbc81a8bbf976a46321898fdd7073c17 (patch)
tree64eda420b3528da1f605bfb241be968c423960d6 /emacs.d/init-custom.el
parent488a5c4956ea5789528b48d5a8dd97c9c8f3e701 (diff)
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
Diffstat (limited to 'emacs.d/init-custom.el')
-rw-r--r--emacs.d/init-custom.el12
1 files changed, 4 insertions, 8 deletions
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.