diff --git a/init.el b/init.el index 4aa09d9..6200f06 100644 --- a/init.el +++ b/init.el @@ -58,12 +58,10 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(package-selected-packages - (quote - (racer racer-mode flycheck-rust rust-mode dante haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode dash-at-point rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package))) + '(dante dash-at-point racer racer-mode flycheck-rust rust-mode haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package)) '(safe-local-variable-values - (quote - ((haskell-process-use-ghci . t) - (haskell-indent-spaces . 4))))) + '((haskell-process-use-ghci . t) + (haskell-indent-spaces . 4)))) ;; Improve font settings in Markdown code (custom-set-faces diff --git a/languages/haskell.el b/languages/haskell.el index 44a238b..472b5a0 100644 --- a/languages/haskell.el +++ b/languages/haskell.el @@ -6,7 +6,7 @@ ;;; Commentary: -;; haskell does a thing. +;;; Provides configuration for haskell files ;;; Code: @@ -27,12 +27,12 @@ "Run this in haskell-mode." (set-indent 2) (column-enforce-n 80) + (dante-mode) ;; Company list override (add-to-list (make-local-variable 'company-backends) '(dante-company company-yasnippet))) -(add-hook 'haskell-mode-hook 'dante-mode) (add-hook 'haskell-mode-hook 'activate-haskell-mode) (provide 'languages/haskell)