             (turn-on-haskell-doc-mode)
             (define-key haskell-mode-map (kbd "C-c >") 'haskell-move-nested-right)
             (define-key haskell-mode-map (kbd "C-c <") 'haskell-move-nested-left)
-            (setq hi2-show-indentations nil)
-            (turn-on-hi2)
-            (set-up-haskell-hippie-expand)))
+            (turn-on-haskell-indentation)))
 
 ;;; js-mode
 (add-hook 'js-mode-hook

(global-smart-tab-mode 1)
(add-to-list 'smart-tab-disabled-major-modes 'haskell-mode)

;;; replace yes-or-no-p with y-or-n-p
(defalias 'yes-or-no-p 'y-or-n-p)

;;; flycheck
(add-hook 'after-init-hook #'global-flycheck-mode)

;;; smex
(global-set-key (kbd "M-x") 'smex)
(global-set-key (kbd "M-X") 'smex-major-mode-commands)

;;; tramp
(if (string-equal system-type "windows-nt")
    (setq tramp-encoding-shell "/bin/sh")
  (setq tramp-encoding-shell "cmd\\.exe"))

;;; don't show the emacs start screen
(setq inhibit-startup-message t)
