--- a/elisp/haskell-init.el	Mon Sep 21 13:35:54 2015 -0500
+++ b/elisp/haskell-init.el	Thu Sep 24 11:04:22 2015 -0500
@@ -3,7 +3,7 @@
 
 ;; Require packages
 (require 'package-require)
-(package-require '(haskell-mode yasnippet haskell-snippets flycheck shm))
+(package-require '(haskell-mode yasnippet haskell-snippets flycheck))
 
 (add-to-list 'load-path "~/.emacs.d/elisp/stack-mode")
 
@@ -11,12 +11,17 @@
 ;; (add-to-list 'load-path "~/Code/elisp/haskell-mode/")
 ;; (require 'haskell-mode-autoloads)
 
+;; company-mode stack-ide integration
+(add-to-list 'load-path "~/Code/elisp/company-stack-ide/")
+(require 'company-stack-ide)
+(add-to-list 'company-backends 'company-stack-ide)
+(add-hook 'stack-mode 'company-mode)
+
 (require 'haskell)
 (require 'haskell-mode)
 (require 'stack-mode)
 (require 'haskell-interactive-mode)
 (require 'haskell-snippets)
-(require 'shm)
 
 (defun haskell-who-calls (&optional prompt)
   "Grep the codebase to see who uses the symbol at point."
@@ -43,14 +48,12 @@
    (flycheck-disable-checker 'haskell-ghc)
    (flycheck-disable-checker 'haskell-stack-ghc)
    (flycheck-clear t)
-   ;; (imenu-add-menubar-index)
-   ;; (haskell-indentation-mode t)
+   (imenu-add-menubar-index)
+   (haskell-indentation-mode t)
+   (haskell-indentation-enable-show-indentations)
    (stack-mode t)
    (subword-mode t)
    (capitalized-words-mode t)
-   (electric-indent-mode nil)
-   (structured-haskell-mode t)
-   (set-face-background 'shm-quarantine-face "lemonchiffon")
    (interactive-haskell-mode t)
 
    (setq
@@ -63,10 +66,6 @@
     haskell-ask-also-kill-buffers nil
     haskell-import-mapping t
 
-    shm-use-presentation-mode t
-    shm-auto-insert-skeletons t
-    shm-auto-insert-bangs t
-
     haskell-interactive-mode-eval-pretty t
     haskell-interactive-mode-scroll-to-bottom t
     haskell-interactive-mode-eval-mode 'haskell-mode
@@ -79,16 +78,11 @@
 (define-key haskell-mode-map (kbd "M-,") 'haskell-who-calls)
 (define-key haskell-mode-map (kbd "C-c i") 'haskell-navigate-imports)
 (define-key haskell-mode-map (kbd "C-c C-d") 'haskell-describe)
-(define-key haskell-mode-map (kbd "C-c C-c") 'haskell-process-load-or-reload)
+(define-key haskell-mode-map (kbd "C-c C-r") 'haskell-process-load-or-reload)
 (define-key haskell-mode-map (kbd "C-`") 'haskell-interactive-bring)
 (define-key haskell-cabal-mode-map (kbd "C-`") 'haskell-interactive-bring)
 (define-key haskell-interactive-mode-map (kbd "C-c C-i") 'haskell-process-do-info)
 (define-key haskell-interactive-mode-map (kbd "C-c C-t") 'haskell-process-do-type)
 
-;; keys shm
-(define-key shm-map (kbd "C-c C-p") 'shm/expand-pattern)
-(define-key shm-map (kbd "C-c C-s") 'shm/case-split)
-(define-key shm-map (kbd "C-\\") 'shm/goto-last-point)
-
 (message "Loading haskell-init...done")
 (provide 'haskell-init)

--- a/init.el	Mon Sep 21 13:35:54 2015 -0500
+++ b/init.el	Thu Sep 24 11:04:22 2015 -0500
@@ -27,7 +27,7 @@
 
 
 ;;; Coding
-(which-func-mode t)                           ; show current function
+(which-function-mode t)                       ; show current function
 (transient-mark-mode t)                       ; show highlighting
 (global-font-lock-mode t)                     ; syntax highlighting
 (global-set-key (kbd "C-c c") 'compile)       ; compile
@@ -53,7 +53,7 @@
   (scroll-bar-mode -1)                        ; remove scroll bar
   (unless is-mac (menu-bar-mode -1))          ; remove menu bar
   (visual-line-mode t)                        ; word wrap break on whitespace
-  (set-default-font (if is-mac "Ubuntu Mono-12" "Ubuntu Mono-10.5")))
+  (set-frame-font (if is-mac "Ubuntu Mono-12" "Ubuntu Mono-10.5")))
 
 
 ;;;; Packages ;;;;
@@ -61,7 +61,7 @@
 (require 'package-require)
 (package-require '(company exec-path-from-shell expand-region
  smex markdown-mode markdown-mode+ ix hgignore-mode move-text paredit
- rainbow-delimiters rainbow-mode json-mode json-reformat
+ rainbow-delimiters rainbow-mode json-mode json-reformat flycheck
  solarized-theme terraform-mode visual-regexp yasnippet yaml-mode
  zencoding-mode))
 
@@ -145,6 +145,7 @@
 (add-hook
  'emacs-lisp-mode-hook
  (lambda ()
+   (flycheck-mode)
    (rainbow-mode)
    (enable-paredit-mode)))