From b6d2c0fddf9fe4abac9964b4afb08e0e9d82ee45 Mon Sep 17 00:00:00 2001
From: Vladan Popovic <vladanovic@gmail.com>
Date: Sun, 8 Dec 2019 15:17:31 +0100
Subject: [PATCH] Use lsp-elm and remove customizations

---
 custom.el            | 23 -----------------------
 init.el              |  5 -----
 modules/jenga-elm.el | 13 +++++++++++--
 3 files changed, 11 insertions(+), 30 deletions(-)
 delete mode 100644 custom.el

diff --git a/custom.el b/custom.el
deleted file mode 100644
index 462bc57..0000000
--- a/custom.el
+++ /dev/null
@@ -1,23 +0,0 @@
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(elm-compile-arguments '("--output=elm-couchapp/_attachments/index.html"))
- '(elm-compile-command '("elm make"))
- '(elm-format-on-save t)
- '(elm-interactive-command '("elm" "repl"))
- '(elm-package-command '("elm" "package"))
- '(elm-package-json "elm.json")
- '(elm-reactor-command '("elm" "reactor"))
- '(elm-tags-exclude-elm-stuff nil)
- '(elm-tags-on-save 1)
- '(package-selected-packages
-   '(material-theme racer evil-mode helm rust-mode highlight-parentheses-mode merlin forge magit yaml-mode neotree lsp-rust hindent hi2 flycheck-haskell ac-haskell-process lsp-haskell haste haskell-snippets haskell-mode rainbow-identifiers elm-test-runner flycheck-elm elm-mode company ztree ac-etags sqlformat cargo evil)))
-;;
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
diff --git a/init.el b/init.el
index a598938..316ea6c 100644
--- a/init.el
+++ b/init.el
@@ -1,8 +1,3 @@
-;; Load emacs customizations.
-;; The customization file shouldn't should be only
-(setq custom-file "~/.emacs.d/custom.el")
-(load custom-file)
-
 ;; Configure emacs packages.
 (setq should-install-packages t) ;; Define this before everything to speed up startup.
 (require 'package)
diff --git a/modules/jenga-elm.el b/modules/jenga-elm.el
index f866e43..a609c3c 100644
--- a/modules/jenga-elm.el
+++ b/modules/jenga-elm.el
@@ -1,14 +1,23 @@
 ;;;; Elm mode configuration.
 (require 'jenga-functions)
 (instl 'elm-mode)
+(instl 'lsp-mode)
+(instl 'lsp-ui)
+(instl 'yasnippet)
 
 (add-hook 'elm-mode-hook #'company-mode)
-(add-hook 'elm-mode-hook #'rainbow-delimiters-mode)
+(add-hook 'elm-mode-hook #'lsp)
 (add-hook 'elm-mode-hook (lambda () (setq evil-auto-indent nil)))
 
+(add-hook 'after-init-hook #'global-flycheck-mode)
+(with-eval-after-load 'flycheck
+      '(add-hook 'flycheck-mode-hook #'flycheck-elm-setup))
+
+(add-to-list 'company-backends 'company-elm)
+(define-key elm-mode-map (kbd "TAB") #'company-indent-or-complete-common)
+
 ;; Turn on Elm mode with *.elm files.
 (add-to-list 'auto-mode-alist '("\\.elm\\'" . elm-mode))
-(add-to-list 'company-backends 'company-elm)
 
 (setq elm-format-on-save t
       elm-tags-on-save t