# HG changeset patch # User Luke Hoersten # Date 1465229509 18000 # Node ID 8f7bb9aba71aa78cdb847383470120cc1cf84de1 # Parent 229ef2f4149dc171f5934c577329729c4ddeb2fe Moved to haskell intero. diff -r 229ef2f4149d -r 8f7bb9aba71a elisp/haskell-init.el --- a/elisp/haskell-init.el Tue Feb 09 17:51:50 2016 -0600 +++ b/elisp/haskell-init.el Mon Jun 06 11:11:49 2016 -0500 @@ -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 -r 229ef2f4149d -r 8f7bb9aba71a elisp/haskell-intero-init.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/elisp/haskell-intero-init.el Mon Jun 06 11:11:49 2016 -0500 @@ -0,0 +1,34 @@ +;; ~/.emacs.d/elisp/haskell-intero-init.el +;; Luke Hoersten + +;;; 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 -r 229ef2f4149d -r 8f7bb9aba71a init.el --- a/init.el Tue Feb 09 17:51:50 2016 -0600 +++ b/init.el Mon Jun 06 11:11:49 2016 -0500 @@ -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