       (define-key shm-map (kbd "C-j") nil)
       (define-key shm-map (kbd "C-k") nil))))
 
-(when (configuration-layer/layer-usedp 'auto-completion)
-  (defun haskell/post-init-company ()
-    (spacemacs|add-company-hook haskell-mode)
-    (spacemacs|add-company-hook haskell-cabal-mode))
-
-  (defun haskell/init-company-ghc ()
-    (use-package company-ghc
-      :if (configuration-layer/package-usedp 'company)
-      :defer t
-      :init
-      (push (if haskell-enable-ghc-mod-support
-                '(company-ghc company-dabbrev-code company-yasnippet)
-              '(company-ghci company-dabbrev-code company-yasnippet))
-              company-backends-haskell-mode)))
-
-  (defun haskell/init-company-cabal ()
-    (use-package company-cabal
-      :if (configuration-layer/package-usedp 'company)
-      :defer t
-      :init
-      (push '(company-cabal)
-            company-backends-haskell-cabal-mode))))

        (kbd "P") 'shm/yank
        (kbd "RET") 'shm/newline-indent
        (kbd "RET") 'shm/newline-indent
        (kbd "M-RET") 'evil-ret
        )

      (evil-define-key 'operator shm-map
        (kbd ")") 'shm/forward-node

  '(
    cmm-mode
    company
    (company-cabal :toggle (configuration-layer/package-usedp 'company))
    (company-ghc :toggle (and (configuration-layer/package-usedp 'company)
                              haskell-enable-ghc-mod-support))
    (company-ghci :toggle (and (configuration-layer/package-usedp 'company)
                               (not haskell-enable-ghc-mod-support)))
    flycheck
    flycheck-haskell
    ghc
