merge ocaml mode changes + other haskell local changes

diff --git a/init.el b/init.el
index 2f8f57d81097a2589ca84c987b20db99f1851e71..1d969f192b87b51a69a5275ba81ee02c15cb8654 100644 (file)
--- a/init.el
+++ b/init.el
@@ -16,10 +16,12 @@
 (custom-set-variables
  '(initial-frame-alist (quote ((fullscreen . maximized)))))
 ;; Who use the bar to scroll?
-(scroll-bar-mode 0)
+(when (display-graphic-p)
+  (progn
+    (scroll-bar-mode 0)
 
-(tool-bar-mode 0)
-(menu-bar-mode 0)
+    (tool-bar-mode 0)
+    (menu-bar-mode 0)))
 
 ; my-packages.el
 (require 'package)
@@ -34,7 +36,7 @@
   (package-refresh-contents))
 
 ;; make sure my list of packages are installed
-(setq package-list '(rust-mode haskell-mode monokai-theme racket-mode clojure-mode cider paredit go-mode))
+(setq package-list '(rust-mode haskell-mode monokai-theme ghc))
 
 ; install the missing packages
 (dolist (package package-list)
@@ -71,6 +73,8 @@
 (global-set-key (kbd "C-c e") 'start-erc) ;; ERC
 
 ;; haskell mode
+(setenv "PATH" (concat "~/.cabal/bin:" (getenv "PATH")))
+(add-to-list 'exec-path "~/.cabal/bin")
 (add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
 
 ;; ocaml
@@ -93,3 +97,9 @@
 ;; ocp-indent
 ;; (add-to-list 'load-path "/Users/ramakrishnanm/.opam/4.02.1/share/emacs/site-lisp")
 ;; (require 'ocp-indent)
+
+;; ghc-mod
+(autoload 'ghc-init "ghc" nil t)
+(autoload 'ghc-debug "ghc" nil t)
+(add-hook 'haskell-mode-hook (lambda () (ghc-init)))
+