diff --git a/conf.org b/conf.org index 0112880..45667b3 100644 --- a/conf.org +++ b/conf.org @@ -282,6 +282,7 @@ event of an error or nonlocal exit." #+BEGIN_SRC emacs-lisp (use-package company :ensure t + :delight " ©" :config (setq company-idle-delay 0 company-minimum-prefix-length 3)) @@ -367,9 +368,19 @@ NOTES: #+BEGIN_SRC emacs-lisp (use-package haskell-mode :ensure t + :hook + (haskell-mode . company-mode) :config (setq haskell-compile-command "ghc -dynamic -Wall -ferror-spans -fforce-recomp -c %s" haskell-interactive-popup-errors nil)) + +(use-package company-ghc + :ensure t + :after + (company-mode haskell-mode) + :hook + (haskell-mode . (lambda () (setq-local company-backends + '((company-ghc)))))) #+END_SRC * magit #+BEGIN_SRC emacs-lisp diff --git a/init.el b/init.el index 21dbedf..c8b00ab 100644 --- a/init.el +++ b/init.el @@ -21,7 +21,7 @@ ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (calf-org evil-magit magit yasnippet-snippets flycheck rainbow-delimiters-mode helm evil-collection haskell-mode fill-column-indicator gtklp delight browse-kill-ring evil-org-agenda evil-org evil calfw calfw-org yaml-mode which-key use-package systemd sudo-edit spaceline rainbow-mode rainbow-delimiters pkgbuild-mode pdf-tools org-bullets lua-mode ess elpy diff-hl beacon ace-window)))) + (company-ghc calf-org evil-magit magit yasnippet-snippets flycheck rainbow-delimiters-mode helm evil-collection haskell-mode fill-column-indicator gtklp delight browse-kill-ring evil-org-agenda evil-org evil calfw calfw-org yaml-mode which-key use-package systemd sudo-edit spaceline rainbow-mode rainbow-delimiters pkgbuild-mode pdf-tools org-bullets lua-mode ess elpy diff-hl beacon ace-window)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful.