submodulized .emacs.d setup

[.emacs.d.git] / init.el

diff --git a/init.el b/init.el
index 3c620b7ebc2ac8d11bfa712eaff71cc9e1d32581..f27270d0bf7f84d4c967a3881d362391c33fceb4 100644 (file)
--- a/init.el
+++ b/init.el
@@ -15,6 +15,8 @@
 (load "my-slime.el")
 (load "my-twitter.el")
 (load "my-python.el")
+(load "my-haskell.el")
+(load "my-swank-js.el")
 
 ;; setup font
 (if (>= emacs-major-version 23)
@@ -245,36 +247,10 @@
 ;;; displays "\" at the end of lines that wrap
 (setq longlines-show-hard-newlines t)
 
-;;; haskell mode
-(setq auto-mode-alist
-      (append auto-mode-alist
-              '(("\\.[hg]s$"  . haskell-mode)
-                ("\\.hic?$"   . haskell-mode)
-                ("\\.hsc$"    . haskell-mode)
-                ("\\.chs$"    . haskell-mode)
-                ("\\.l[hg]s$" . literate-haskell-mode))))
-(autoload 'haskell-mode "haskell-mode"
-  "Major mode for editing Haskell scripts." t)
-(autoload 'literate-haskell-mode "haskell-mode"
-  "Major mode for editing literate Haskell scripts." t)
-
-;adding the following lines according to which modules you want to use:
-(require 'inf-haskell)
-
-(add-hook 'haskell-mode-hook 'turn-on-font-lock)
-(add-hook 'haskell-mode-hook 'turn-on-haskell-ghci)
-(add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
-(add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
-(set-variable 'haskell-program-name "ghci")
-
 ;; javascript mode
 (autoload 'js2-mode "js2-mode" nil t)
 (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
 
-;; swank-js
-(add-to-list 'load-path "~/src/swank-js/")
-(require 'slime-js)
-
 ;; geiser for Scheme programming
 ;(load-file "~/src/geiser/elisp/geiser.el")
 
@@ -312,8 +288,6 @@
 (autoload 'sml-mode "sml-mode" "Major mode for editing SML." t)
 (autoload 'run-sml "sml-proc" "Run an inferior SML process." t)
 
-;; notmuch for email/searching
-(require 'notmuch)
 (require 'gnus-art)
 
 ;; sending email
@@ -327,6 +301,7 @@
 
 (setq message-kill-buffer-on-exit t) ; kill buffer after sending mail)
 
-(setq notmuch-fcc-dirs "Gmail/Sent") ; stores sent mail to the specified directory
-(setq message-directory "Gmail/Drafts") ; stores postponed messages to the specified directory
 
+;; cursor
+(setq-default cursor-type '(bar . 2))
+(set-cursor-color "#ff0000")