Moved to haskell intero.

3 files changed, 41 insertions, 9 deletions

diff --git a/elisp/haskell-init.el b/elisp/haskell-init.el
index de0e0d4..5cc296c 100644
--- a/elisp/haskell-init.el
+++ b/elisp/haskell-init.el
@@ -5,7 +5,7 @@
 
 ;; Require packages
 (require 'package-require)
-(package-require '(haskell-mode ghc yasnippet haskell-snippets flycheck company company-ghc))
+(package-require '(haskell-mode yasnippet haskell-snippets flycheck company))
 
 (require 'haskell)
 (require 'haskell-mode)
@@ -13,8 +13,6 @@
 (require 'haskell-snippets)
 (require 'company)
 
-(add-to-list 'company-backends 'company-ghc)
-
 (defun haskell-who-calls (&optional prompt)
   "Grep the codebase to see who uses the symbol at point."
   (interactive "P")
diff --git a/elisp/haskell-intero-init.el b/elisp/haskell-intero-init.el
new file mode 100644
index 0000000..c6f6b90
--- /dev/null
+++ b/elisp/haskell-intero-init.el
@@ -0,0 +1,34 @@
+;; ~/.emacs.d/elisp/haskell-intero-init.el
+;; Luke Hoersten <[email protected]>
+
+;;; Code:
+
+;; Require packages
+(require 'package-require)
+(package-require '(haskell-mode intero yasnippet haskell-snippets flycheck company))
+
+(require 'haskell)
+(require 'haskell-mode)
+(require 'haskell-interactive-mode)
+(require 'haskell-snippets)
+(require 'company)
+
+(add-hook 'haskell-mode-hook 'intero-mode)
+
+(setq
+ haskell-stylish-on-save t
+ haskell-indentation-layout-offset 4
+ haskell-indentation-left-offset 4
+
+ haskell-notify-p t
+ haskell-align-imports-pad-after-name t
+ haskell-ask-also-kill-buffers nil
+ haskell-import-mapping t
+
+ haskell-interactive-mode-eval-pretty t
+ haskell-interactive-mode-scroll-to-bottom t
+ haskell-interactive-mode-eval-mode 'haskell-mode
+ haskell-interactive-popup-errors nil)
+
+(message "Loading haskell-init...done")
+(provide 'haskell-intero-init)
diff --git a/init.el b/init.el
index 2f1e1cb..6a073a6 100644
--- a/init.el
+++ b/init.el
@@ -63,14 +63,14 @@
 
 (require 'package-require)
 (package-require '(company exec-path-from-shell expand-region flx-ido
- smex markdown-mode markdown-mode+ ix hgignore-mode move-text paredit
+ smex markdown-mode markdown-mode+ hgignore-mode move-text paredit
  rainbow-delimiters rainbow-mode json-mode json-reformat flycheck
  solarized-theme terraform-mode visual-regexp yasnippet yaml-mode
  zencoding-mode))
 
 
 ;;; custom requires
-(require 'haskell-init)
+(require 'haskell-intero-init)
 (require 'javascript-init)
 (require 'c-init)
 (require 'ansible-init)
@@ -196,10 +196,10 @@
 
 
 ;;; yasnippets
-;; (with-eval-after-load 'yasnippet
-;;   (setq yas-snippet-dirs (remq 'yas-installed-snippets-dir yas-snippet-dirs)))
-;; (setq-default yas-prompt-functions '(yas-ido-prompt yas-dropdown-prompt)) ; use ido for multiple snippets
-;; (yas-global-mode t)
+(with-eval-after-load 'yasnippet
+  (setq yas-snippet-dirs (remq 'yas-installed-snippets-dir yas-snippet-dirs)))
+(setq-default yas-prompt-functions '(yas-ido-prompt yas-dropdown-prompt)) ; use ido for multiple snippets
+(yas-global-mode t)
 
 
 ;;; markdown-mode