Use elpaca instead of straight

Some big changes related to that, and to use-package

lisp/langs/icejam-lang-clojure.el

@@ -7,19 +7,19 @@
 
 (declare-function column-enforce-n "column-enforce-mode" (number))
 
-(use-package clojure-mode :defer t :straight t)
+(use-package clojure-mode :defer t :ensure t)
 
 (use-package cider
   :requires clojure-mode
   :commands cider-jack-in
   :defer t
-  :straight t
+  :ensure t
   :config (setq cider-annotate-completion-function t))
 
 (use-package clj-refactor
 	:requires (cider clojure-mode)
 	:defer t
-	:straight t)
+	:ensure t)
 
 ;; Transient
 (transient-define-prefix icejam-lang-cider-context-menu ()

lisp/langs/icejam-lang-common-lisp.el

@@ -11,8 +11,8 @@
 (require 'icejam-prog-mode)
 (require 'icejam-company-yasnippet)
 
-(use-package slime :straight t)
-(use-package slime-company :straight t
+(use-package slime :ensure t)
+(use-package slime-company :ensure t
   :requires (slime company))
 
 (setq inferior-lisp-program "sbcl")

lisp/langs/icejam-lang-dart.el

@@ -4,8 +4,8 @@
 
 (require 'icejam-prog-mode)
 
-(use-package dart-mode :straight t :defer t)
-(use-package lsp-dart :defer t :straight t :requires (dart-mode lsp))
+(use-package dart-mode :ensure t :defer t)
+(use-package lsp-dart :defer t :ensure t :requires (dart-mode lsp))
 
 (defun icejam-lang-activate-dart-mode ()
   "Reconfigure dart mode for your own purposes."

lisp/langs/icejam-lang-dhall.el

@@ -5,7 +5,7 @@
 (require 'icejam-prog-mode)
 (require 'icejam-lsp)
 
-(use-package dhall-mode :straight t :defer t :requires (lsp))
+(use-package dhall-mode :ensure t :defer t :requires (lsp))
 
 (defun icejam-lang-activate-dhall-mode ()
   "Reconfigure dhall mode for your own purposes."

lisp/langs/icejam-lang-elisp.el

@@ -5,7 +5,7 @@
 (require 'icejam-prog-mode)
 (require 'icejam-transient)
 
-(use-package lispy :straight t :defer t)
+(use-package lispy :ensure (:wait t) :defer t)
 
 (declare-function column-enforce-n "column-enforce-mode" (number))
 (add-to-list 'auto-mode-alist '("/Eask\\'" . emacs-lisp-mode))

lisp/langs/icejam-lang-elixir.el

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

lisp/langs/icejam-lang-erlang.el

@@ -10,7 +10,7 @@
 
 (use-package erlang
   :defer t
-  :straight t
+  :ensure (:depth 1)
   :requires (lsp-mode lsp-ui))
 
 (cl-defun icejam-erlang-emacs-path (erlang-version)

lisp/langs/icejam-lang-fsharp.el

@@ -15,7 +15,7 @@
 
 (use-package fsharp-mode
   :requires (lsp-mode lsp-ui)
-  :straight t
+  :ensure t
   :defer t)
 
 (defun icejam-activate-fsharp-mode ()

lisp/langs/icejam-lang-gleam.el

@@ -13,10 +13,10 @@
 (require 'icejam-prog-mode)
 
 (use-package gleam-ts-mode
-  :straight '(:type git
-              :host github
-              :repo "gleam-lang/gleam-mode"
-              :files ("gleam-ts-mode.el")))
+  :ensure (:type git
+                 :host github
+                 :repo "gleam-lang/gleam-mode"
+                 :files ("gleam-ts-mode.el")))
 
 (add-to-list 'auto-mode-alist '("\\.gleam\\'" . gleam-ts-mode))
 

lisp/langs/icejam-lang-golang.el

@@ -15,7 +15,7 @@
 (use-package go-mode
   :requires (lsp-mode lsp-ui)
   :defer t
-  :straight t)
+  :ensure t)
 
 (defun icejam-activate-golang-mode ()
   "Activate my own Golang mode settings."

lisp/langs/icejam-lang-haskell.el

@@ -13,11 +13,11 @@
 (require 'icejam-prog-mode)
 
 (use-package haskell-mode
-  :straight t
+  :ensure t
   :defer t)
 
 (use-package lsp-haskell
-  :straight t
+  :ensure t
   :defer t
   :requires (lsp-mode lsp-ui haskell-mode))
 

lisp/langs/icejam-lang-javascript.el

@@ -8,12 +8,12 @@
 
 (use-package js2-mode
   :requires (web-mode company-web lsp-mode lsp-ui)
-  :straight t)
+  :ensure t)
 
-(use-package typescript-mode :straight t)
+(use-package typescript-mode :ensure t)
 
 ;; (use-package vue-mode
-;;   :straight t
+;;   :ensure t
 ;;   :defer t)
 
 ;; Use js2-mode for javascript editing

lisp/langs/icejam-lang-kotlin.el

@@ -12,11 +12,11 @@
 
 (use-package kotlin-mode
 	:defer t
-	:straight t)
+	:ensure t)
 
 (use-package gradle-mode
 	:defer t
-	:straight t)
+	:ensure t)
 
 (defun icejam-activate-kotlin-mode ()
   "All things Kotlin."

lisp/langs/icejam-lang-lean.el

@@ -6,11 +6,11 @@
 (require 'icejam-lsp)
 
 (use-package lean4-mode
-  :straight (lean4-mode
-	           :type git
-	           :host github
-	           :repo "leanprover/lean4-mode"
-	           :files ("*.el" "data"))
+  :ensure (lean4-mode
+	   :type git
+	   :host github
+	   :repo "leanprover/lean4-mode"
+	   :files ("*.el" "data"))
   :requires (lsp)
   :defer t)
 

lisp/langs/icejam-lang-markdown.el

@@ -4,10 +4,11 @@
 
 (require 'icejam-prog-mode)
 
-(use-package markdown-mode
-  :straight t
-  :defer t
-  :init (setq-default markdown-command "pandoc"))
+(unless (elpaca-installed-p 'markdown-mode)
+  (use-package markdown-mode
+    :ensure t
+    :defer t
+    :init (setq-default markdown-command "pandoc")))
 
 (defun icejam-lang-activate-markdown-mode ()
   "Reconfigure markdown mode for your own purposes."

lisp/langs/icejam-lang-ocaml.el

@@ -6,12 +6,12 @@
 (require 'icejam-prog-mode)
 (declare-function lsp "lsp-mode" nil)
 
-(use-package merlin :defer t :straight t)
-(use-package opam-switch-mode :straight t :defer t)
-(use-package dune :defer t :straight t)
+(use-package merlin :defer t :ensure t)
+(use-package opam-switch-mode :ensure t :defer t)
+(use-package dune :defer t :ensure t)
 (use-package tuareg
   :defer t
-  :straight t
+  :ensure t
   :config (add-hook 'tuareg-mode-hook 'merlin-mode))
 
 (transient-define-prefix icejam-ocaml-lang-menu ()

lisp/langs/icejam-lang-other.el

@@ -11,29 +11,34 @@
 ;;; Code:
 
 ;; Infrastructure files
-(use-package dockerfile-mode :straight t :defer t)
-(use-package docker :straight t :defer t :ensure t)
-(use-package terraform-mode :straight t :defer t)
-(use-package ansible :straight t :defer t)
-(use-package nginx-mode :straight t :defer t)
-(use-package jenkinsfile-mode :straight t :defer t)
-(use-package lua-mode :straight t :defer t)
-(use-package graphql-mode :straight t :defer t)
-(add-to-list 'auto-mode-alist '("\\.graphqls\\'" . graphql-mode))
+(use-package dockerfile-mode :ensure t :defer t)
+(use-package docker :ensure t :defer t)
+(use-package terraform-mode :ensure t :defer t)
+(use-package ansible :ensure t :defer t)
+(use-package nginx-mode :ensure t :defer t)
+(use-package jenkinsfile-mode :ensure t :defer t)
+(use-package lua-mode :ensure t :defer t)
+
+;; Graphql schema definition files.
+(use-package graphql-mode :ensure t :defer t
+  :mode ("\\.graphqls\\'" . graphql-mode))
 
 ;; Yaml
-(use-package yaml-mode :straight t :defer t :requires (lsp))
+(declare-function lsp "lsp-mode" nil)
+(use-package yaml-mode :ensure t :defer t :requires (lsp))
 
-(defun icejam-lang-activate-yaml-mode ()
-  "Activate yaml-mode."
-  (lsp))
+(with-eval-after-load 'yaml-mode
+  (defun icejam-lang-activate-yaml-mode ()
+    "Activate yaml-mode."
+    (lsp))
+
+  (add-hook 'yaml-mode-hook 'icejam-lang-activate-yaml-mode))
 
-(add-hook 'yaml-mode-hook 'icejam-lang-activate-yaml-mode)
 
 ;; Other text files
-(use-package json-mode :straight t :defer t)
+(use-package json-mode :ensure t :defer t)
 (use-package git-modes
-  :straight t
+  :ensure t
   :defer t
   :hook ((gitignore-mode . whitespace-mode)
          (before-save . whitespace-cleanup)))

lisp/langs/icejam-lang-php.el

@@ -16,7 +16,7 @@
 
 (use-package php-mode
   :requires (lsp-mode lsp-ui)
-  :straight t)
+  :ensure t)
 
 (transient-define-prefix icejam-lang-php/context-menu ()
   "PHP Buffer Commands."

lisp/langs/icejam-lang-purescript.el

@@ -11,7 +11,7 @@
 ;;; Code:
 (use-package purescript-mode
   :requires (lsp-mode lsp-ui)
-  :straight t)
+  :ensure t)
 
 (defun icejam-activate-purescript-mode ()
   "All things Purescript."

lisp/langs/icejam-lang-ruby.el

@@ -4,9 +4,9 @@
 
 (require 'icejam-prog-mode)
 
-(use-package rspec-mode :straight t :defer t)
-(use-package ruby-end :straight t :defer t)
-(use-package rbs-mode :straight t :defer t)
+(use-package rspec-mode :ensure t :defer t)
+(use-package ruby-end :ensure t :defer t)
+(use-package rbs-mode :ensure t :defer t)
 
 (add-to-list 'auto-mode-alist '("\\.rb\\'" . ruby-ts-mode))
 

lisp/langs/icejam-lang-rust.el

@@ -5,13 +5,13 @@
 (require 'icejam-prog-mode)
 
 (use-package rust-mode
-  :straight t
+  :ensure t
   :defer t
   :config
   (setq rust-mode-treesitter-derive t))
 
 (use-package flycheck-rust
-  :straight t
+  :ensure t
   :defer t
   :requires (rust-mode lsp))
 

lisp/langs/icejam-lang-sh.el

@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(use-package fish-mode :straight t :defer t)
+(use-package fish-mode :ensure t :defer t)
 
 (add-to-list 'auto-mode-alist '("\\.zsh\\'" . sh-mode))
 (add-to-list 'auto-mode-alist '("\\zshrc\\'" . sh-mode))

lisp/langs/icejam-lang-web.el

@@ -7,7 +7,7 @@
 
 (use-package web-mode
   :requires (lsp-mode flycheck)
-  :straight t)
+  :ensure t)
 
 ;; Eex Web mode
 (add-to-list 'auto-mode-alist '("\\.eex\\'" . web-mode))

lisp/langs/icejam-lang-ziglang.el

@@ -11,7 +11,7 @@
 ;;; Code:
 (require 'icejam-prog-mode)
 
-(use-package zig-mode :straight t :defer t :requires (lsp))
+(use-package zig-mode :ensure t :defer t :requires (lsp))
 
 (defun icejam-activate-zig-mode ()
   "Goodies for editing zig files."