Use elpaca for longer

lisp/langs/icejam-lang-elisp.el

@@ -5,7 +5,7 @@
 (require 'icejam-prog-mode)
 (require 'icejam-transient)
 
-(use-package lispy :ensure (:wait t) :defer t)
+(use-package lispy :ensure t)
 
 (declare-function column-enforce-n "column-enforce-mode" (number))
 (add-to-list 'auto-mode-alist '("/Eask\\'" . emacs-lisp-mode))
@@ -24,18 +24,21 @@
 (add-to-list
  'icejam-language-transient-alist '(emacs-lisp-mode . icejam-elisp-lang-menu))
 
-(defun icejam-activate-emacs-lisp-mode ()
-  "Goodies for editing Emacs files."
-  (icejam-set-indent 2) ;; Default indentation of 2 characters
-  (column-enforce-n 80)
-  (lispy-mode)
-  (setq-default indent-tabs-mode nil)
+(with-eval-after-load 'lispy
+  (declare-function lispy-mode "lispy")
+  (defun icejam-activate-emacs-lisp-mode ()
+    "Goodies for editing Emacs files."
+    (icejam-set-indent 2) ;; Default indentation of 2 characters
+    (column-enforce-n 80)
 
-  ;; Company list override
-  (add-to-list (make-local-variable 'company-backends)
-               '(company-yasnippet company-capf)))
+    (lispy-mode t)
+    (setq-default indent-tabs-mode nil)
 
-(add-hook 'emacs-lisp-mode-hook 'icejam-activate-emacs-lisp-mode)
+    ;; Company list override
+    (add-to-list (make-local-variable 'company-backends)
+                 '(company-yasnippet company-capf)))
+
+  (add-hook 'emacs-lisp-mode-hook 'icejam-activate-emacs-lisp-mode))
 
 (provide 'icejam-lang-elisp)
 ;;; icejam-lang-elisp.el ends here

lisp/langs/icejam-lang-elixir.el

@@ -9,13 +9,12 @@
 (declare-function lsp "lsp-mode" nil)
 (declare-function column-enforce-n "column-enforce-mode" (number))
 
-(use-package elixir-mode :defer t :ensure t)
+(use-package elixir-mode :ensure t)
+(use-package elixir-ts-mode :ensure t :requires (elixir-mode lsp-mode lsp-ui))
 
-(use-package elixir-ts-mode :ensure t
-  :requires (elixir-mode lsp-mode lsp-ui)
-  :mode
-  ("\\.exs\\'" . elixir-ts-mode)
-  ("\\.ex\\'" . elixir-ts-mode))
+(with-eval-after-load 'elixir-ts-mode
+  (add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-ts-mode))
+  (add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-ts-mode)))
 
 (transient-define-prefix icejam-elixir-lang-menu ()
   "Elixir Buffer Commands."

lisp/langs/icejam-lang-erlang.el

@@ -11,7 +11,7 @@
 (use-package erlang
   :defer t
   :ensure (:depth 1)
-  :requires (lsp-mode lsp-ui))
+  :after (lsp lsp-ui))
 
 (cl-defun icejam-erlang-emacs-path (erlang-version)
   "Find path to Emacs tooling for ERLANG-VERSION."
@@ -54,17 +54,6 @@
   "Create plist from current Erlang version."
   (seq-find 'icejam-erlang-current-version--plistp icejam-erlang-available-versions))
 
-;; Flycheck checker for Erlang
-(flycheck-define-checker erlang-otp
-  "An Erlang syntax checker using the Erlang interpreter."
-  :command ("erlc" "-o" temporary-directory "-Wall"
-            "-I" "../include" "-I" "../../include"
-            "-I" "../../../include" source)
-  :error-patterns
-  ((warning line-start (file-name) ":" line ": Warning:" (message) line-end)
-   (error line-start (file-name) ":" line ": " (message) line-end))
-  :modes (my-erlang-mode))
-
 (defun icejam-activate-erlang-mode ()
   "All things for all Erlang, including header files."
   (when (featurep 'erlang-start) (unload-feature 'erlang-start))
@@ -86,25 +75,12 @@
   (icejam-set-indent 4)
   (column-enforce-n 80)
 
-  ;; Add include path so that Erlang does not complain about
-  ;; missing header files.
-  (setq-local flycheck-erlang-include-path
-              (list (format "%sdeps" (project-root (project-current)))
-                    (format "%s_build/default/lib" (project-root (project-current)))
-                    (format "%sinclude" (project-root (project-current)))
-                    (format "%sapps" (project-root (project-current)))))
-
-  (setq-local flycheck-erlang-library-path
-              (list (format "%sdeps" (project-root (project-current)))
-                    (format "%s_build/default/lib" (project-root (project-current)))
-                    (format "%sapps" (project-root (project-current)))))
+  ;; Start LSP
+  (lsp)
 
   ;; Company list override
   (add-to-list (make-local-variable 'company-backends)
-               '(company-capf company-yasnippet))
-
-  ;; Start LSP server
-  (lsp))
+               '(company-capf company-yasnippet)))
 
 (add-hook 'erlang-mode-hook 'icejam-activate-erlang-mode)
 

lisp/langs/icejam-lang-markdown.el

@@ -3,12 +3,12 @@
 ;;; Code:
 
 (require 'icejam-prog-mode)
-
+(declare-function elpaca-installed-p "elpacs")
 (unless (elpaca-installed-p 'markdown-mode)
-  (use-package markdown-mode
-    :ensure t
-    :defer t
-    :init (setq-default markdown-command "pandoc")))
+  (use-package markdown-mode :ensure t))
+
+(with-eval-after-load 'markdown-mode
+  (setq-default markdown-command "pandoc"))
 
 (defun icejam-lang-activate-markdown-mode ()
   "Reconfigure markdown mode for your own purposes."

lisp/langs/icejam-lang-ocaml.el

@@ -7,12 +7,12 @@
 (declare-function lsp "lsp-mode" nil)
 
 (use-package merlin :defer t :ensure t)
-(use-package opam-switch-mode :ensure t :defer t)
+(use-package opam-switch-mode :defer t :ensure t)
 (use-package dune :defer t :ensure t)
-(use-package tuareg
-  :defer t
-  :ensure t
-  :config (add-hook 'tuareg-mode-hook 'merlin-mode))
+(use-package tuareg :defer t :ensure t)
+
+(with-eval-after-load 'tuareg
+  (add-hook 'tuareg-mode-hook 'merlin-mode))
 
 (transient-define-prefix icejam-ocaml-lang-menu ()
   "Ocaml Actions."

lisp/langs/icejam-lang-other.el

@@ -31,17 +31,12 @@
   (defun icejam-lang-activate-yaml-mode ()
     "Activate yaml-mode."
     (lsp))
-
   (add-hook 'yaml-mode-hook 'icejam-lang-activate-yaml-mode))
 
-
 ;; Other text files
 (use-package json-mode :ensure t :defer t)
-(use-package git-modes
-  :ensure t
-  :defer t
-  :hook ((gitignore-mode . whitespace-mode)
-         (before-save . whitespace-cleanup)))
+(use-package git-modes :ensure t :defer t
+  :hook (gitignore . whitespace-mode-hook))
 
 (provide 'icejam-lang-other)
 ;;; icejam-lang-other.el ends here