Add lispy mode

lisp/icejam-diminish.el

@@ -11,17 +11,18 @@
 ;;; Code:
 (use-package diminish :straight t)
 
-(eval-after-load "flyspell" '(diminish 'flyspell-mode))
+(eval-after-load 'flyspell '(diminish 'flyspell-mode))
-(eval-after-load "projectile" '(diminish 'projectile-mode))
+(eval-after-load 'projectile '(diminish 'projectile-mode))
-(eval-after-load "flycheck" '(diminish 'flycheck-mode))
+(eval-after-load 'flycheck '(diminish 'flycheck-mode))
-(eval-after-load "rainbow-mode" '(diminish 'rainbow-mode))
+(eval-after-load 'rainbow-mode '(diminish 'rainbow-mode))
-(eval-after-load "undo-tree" '(diminish 'undo-tree-mode))
+(eval-after-load 'undo-tree '(diminish 'undo-tree-mode))
-(eval-after-load "company" '(diminish 'company-mode))
+(eval-after-load 'company '(diminish 'company-mode))
-(eval-after-load "which-key" '(diminish 'which-key-mode))
+(eval-after-load 'which-key '(diminish 'which-key-mode))
-(eval-after-load "eldoc" '(diminish 'eldoc-mode))
+(eval-after-load 'eldoc '(diminish 'eldoc-mode))
-(eval-after-load "yasnippet" '(diminish 'yas-minor-mode))
+(eval-after-load 'yasnippet '(diminish 'yas-minor-mode))
-(eval-after-load "whitespace" '(diminish 'whitespace-mode))
+(eval-after-load 'whitespace '(diminish 'whitespace-mode))
-(eval-after-load "auto-revert-mode" '(diminish 'auto-revert-mode))
+(eval-after-load 'autorevert '(diminish 'auto-revert-mode))
+(eval-after-load 'ivy '(diminish 'ivy-mode))
 
 (provide 'icejam-diminish)
 ;;; icejam-diminish.el ends here

lisp/icejam-themes.el

@@ -58,7 +58,10 @@
 
 (declare-function spaceline-emacs-theme nil)
 
-(spaceline-emacs-theme)
+;; This is spacemacs modeline but I have disabled it for now.
+;; It doesn't seem like I need it for anything.
+;; (spaceline-emacs-theme)
+
 (enable-theme 'icejam-base16-zenburn)
 
 (provide 'icejam-themes)

lisp/langs/icejam-lang-elisp.el

@@ -5,8 +5,9 @@
 (require 'icejam-prog-mode)
 (require 'icejam-transient)
 
-(declare-function column-enforce-n "column-enforce-mode" (number))
+(use-package lispy :straight t :defer t)
 
+(declare-function column-enforce-n "column-enforce-mode" (number))
 (add-to-list 'auto-mode-alist '("/Eask\\'" . emacs-lisp-mode))
 
 (transient-define-prefix icejam/elisp-lang-menu ()
@@ -27,6 +28,7 @@
   "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)
 
   ;; Company list override

lisp/langs/icejam-lang-elixir.el

@@ -16,7 +16,6 @@
 
 (add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-ts-mode))
 (add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-ts-mode))
-(add-to-list 'auto-mode-alist '("\\.heex\\'" . elixir-ts-mode))
 
 (transient-define-prefix icejam/elixir-lang-menu ()
   "Elixir Buffer Commands."
@@ -41,6 +40,7 @@
   (lsp)
   (setq-local flycheck-check-syntax-automatically '(save mode-enabled))
   (setq-local lsp-eldoc-enable-hover nil)
+  (setq-local lsp-completion-enable-additional-text-edit nil)
   (setq-local company-minimum-prefix-length 3)
 
   ;; If needed, switch the one below to false to disable documentation pop-ups
@@ -50,6 +50,7 @@
   (add-to-list (make-local-variable 'company-backends)
                '(company-capf company-yasnippet)))
 
+(add-hook 'heex-ts-mode-hook 'icejam/activate-elixir-ts-mode)
 (add-hook 'elixir-ts-mode-hook 'icejam/activate-elixir-ts-mode)
 
 (provide 'icejam-lang-elixir)

straight/versions/default.el

@@ -8,15 +8,15 @@
  ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470")
  ("caml-mode" . "47defafa2b08fb680e89bfee9cb9ce82bd9e3bcf")
  ("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121")
- ("cider" . "5c1bac297341232d167a6d2beb79c39472597527")
+ ("cider" . "144811a819b469cd797c88ec1f24119cfa8454af")
  ("clj-refactor.el" . "dc1bbc8cdaa723bdbb6669ea7d280625c370755d")
  ("clojure-mode" . "59888c84b61081e9b0085e388f55132925a66e7a")
  ("color-theme-sanityinc-tomorrow" . "ddf2920a8866040e57359d2e1c5517fffcad2e38")
  ("column-enforce-mode" . "14a7622f2268890e33536ccd29510024d51ee96f")
  ("company-box" . "c4f2e243fba03c11e46b1600b124e036f2be7691")
  ("company-mode" . "1321e285a54dfe43cae71f52e58bff4f0c8c161d")
- ("compat" . "3c782506419b937d9e30b01ceb1cd49e7a4e7842")
+ ("compat" . "99d74e635b76c3fa0b8403391e9d2efbd29f9901")
- ("copilot.el" . "f831b2b8375950eb1cc282d15ccc78ed90f30a1a")
+ ("copilot.el" . "535ef61e82f09d744cd5b097b1fc99f08cce175c")
  ("counsel-projectile" . "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b")
  ("cyberpunk-theme.el" . "1fd5350ddfc53c30e6eef82af77c62d7c825df3c")
  ("dap-mode" . "496dd3a60f71a396df7e9a5ff6c500127d00ec03")
@@ -26,19 +26,20 @@
  ("deft" . "b369d7225d86551882568788a23c5497b232509c")
  ("dhall-mode" . "87ab69fe765d87b3bb1604a306a8c44d6887681d")
  ("diminish.el" . "fbd5d846611bad828e336b25d2e131d1bc06b83d")
- ("docker.el" . "d5255a65b7240d0038cc417f301b43df05a27922")
+ ("docker.el" . "f3adbf49e1140d13c934f16e19754c42a97dc91f")
  ("dockerfile-mode" . "39a012a27fcf6fb629c447d13b6974baf906714c")
- ("dune" . "42ed1940d11c9a75766da3c88df020ad772d0e6e")
+ ("dune" . "f895939894a0d948a24d0c973cbca36d6988e86c")
  ("easy-kill" . "de7d66c3c864a4722a973ee9bc228a14be49ba0c")
- ("editorconfig-emacs" . "fbd078ad647888c971abe3508dd0ba27fac97cb9")
+ ("editorconfig-emacs" . "648f0cf9aeb72db77b252832a58367332b7bc055")
  ("el-get" . "c0713e8d8e8ad987fe1283d76b9c637a10f048ef")
  ("eldoc" . "91a8ae2fa66ac09f45337f9eca6c7aa643a063f4")
  ("elisp-refs" . "541a064c3ce27867872cf708354a65d83baf2a6d")
  ("elisp-tree-sitter" . "3cfab8a0e945db9b3df84437f27945746a43cc71")
  ("elixir-ts-mode" . "b08d399e29714fe3d968db925aec0e1dfac54d89")
+ ("emacs" . "177ecee1e5b8bbd05053cba5c93ebfae3b8fee8c")
  ("emacs-aio" . "da93523e235529fa97d6f251319d9e1d6fc24a41")
  ("emacs-ansible" . "eebb2fb49d3c0a0586d1e4ead9ba618c7d003cae")
- ("emacs-dashboard" . "46ad9959899f2e86d03f7850820ad6a6b8aa3ad0")
+ ("emacs-dashboard" . "187699e2d80f6a3b0ec7b2fb2e1d7ece2712208f")
  ("emacs-direnv" . "c0bf3b81c7a97e2a0d06d05495e86848254fcc1f")
  ("emacs-elixir" . "00d6580a040a750e019218f9392cf9a4c2dac23a")
  ("emacs-fish" . "2526b1803b58cf145bc70ff6ce2adb3f6c246f89")
@@ -48,19 +49,18 @@
  ("emacs-reformatter" . "0d29a04d69d47599e2cb7f1a8f8e897a2b592921")
  ("emacs-theme-darktooth" . "2358dd334b5dcb6dc9828422bd7bd1e4da556819")
  ("emacs-which-key" . "38d4308d1143b61e4004b6e7a940686784e51500")
- ("emacsmirror-mirror" . "a0d3dd875203ac777995bde2b3dad32a9a56cedc")
+ ("emacsmirror-mirror" . "8cbbdaa750c897d05ee71980834699a7d7c2d208")
- ("enhanced-ruby-mode" . "69484d6cf0cb2d8bb1f873319bd7c448cb7add33")
  ("exec-path-from-shell" . "72ede29a0e0467b3b433e8edbee3c79bab005884")
  ("f.el" . "1e7020dc0d4c52d3da9bd610d431cab13aa02d8c")
  ("flycheck" . "7a6398ea3538a898eba0276f0f89b2f878325a89")
  ("flycheck-rust" . "158eeb4dc86e095f3fb4668b05b844bb5021110f")
  ("flyspell-correct" . "1e7a5a56362dd875dddf848b9a9e25d1395b9d37")
  ("frame-local" . "7ee1106c3bcd4022f48421f8cb1ef4f995da816e")
- ("git-modes" . "d96fa7a3c7d754812675b37247c6a77e459eec53")
+ ("git-modes" . "f99010bbeb8b6d8a0819fac0195a2ef0159d08f0")
- ("gleam-mode" . "22b893295c713a2fe5e272e00dc6b2cea90b6c1d")
+ ("gleam-mode" . "2d8bbe39437bb79b4496811b4e8ed89a2c5daa14")
- ("gnu-elpa-mirror" . "c7c879e92cb2cfe5af56b8877d24a1d9b2adf14e")
+ ("gnu-elpa-mirror" . "3d0759ef4792b6461f2979a4e70e1c819df7283a")
  ("go-mode.el" . "602d73e22646b1b98b2eb97927fd426c0d1d2f92")
- ("gptel" . "73ec10831bf3ad85384ead962878b2437928def4")
+ ("gptel" . "17f39f6a8144496252eacc012ef7f1d6a2ac883a")
  ("graphql-mode" . "ef4aecaeada77f46d1f0465ab62b9e9f537ec260")
  ("groovy-emacs-modes" . "7b8520b2e2d3ab1d62b35c426e17ac25ed0120bb")
  ("haskell-mode" . "727f72a2a4b8e4fd0a7b62129668baea55a2c3e0")
@@ -80,23 +80,23 @@
  ("lean4-mode" . "da7b63d854d010d621e2c82a53d6ae2d94dd53b0")
  ("let-alist" . "4e05e158612f360f6080b1349d3962b1c8fee902")
  ("lsp-dart" . "1f52e81c9371055ff9188117ace81f009d1c79f2")
- ("lsp-docker" . "42dd54d02d2414fa4450aeaf2b4da44c9b3692d6")
+ ("lsp-docker" . "ce291d0f80533f8eaca120eb745d55669e062636")
- ("lsp-haskell" . "85a82c9cf4a7ed4be339e80a98cf41cbf2c999d3")
+ ("lsp-haskell" . "2586c16275e6504747043c1552a585040861c473")
- ("lsp-mode" . "c8d8bd0f5c40123821bf7c90afa5b6abb05074cb")
+ ("lsp-mode" . "12befaabe4a1bf8a548bc820faa192be8ee89533")
- ("lsp-treemacs" . "1d43e9e0307f84496a4a7ddf9dba481000391dbd")
+ ("lsp-treemacs" . "fb1a07ae0a3d781dea8ac78da2933e0173eb48a4")
  ("lsp-ui" . "072bb29152038518c2478813b82c8d04d07df84c")
  ("lua-mode" . "d074e4134b1beae9ed4c9b512af741ca0d852ba3")
  ("macrostep" . "4939d88779761e8b5461b4cf73f86600172987db")
- ("magit" . "5c364eaad728a2dffe181ee5a8805a20866de35f")
+ ("magit" . "19867456b1cd7e9a11942723d6d62fa80e306fb7")
  ("map" . "cc174d5d2b3f9dacc31e9c55da1c80eb5f49c112")
  ("markdown-mode" . "8a7773f87733866a961ea4c518a4a2f283f21970")
- ("melpa" . "beb0c20ca9de0c948592ee6c28b5cb5c2d98af13")
+ ("melpa" . "4e2138081137b114f3b90f8f2b1da4c2ae3f91d4")
  ("merlin" . "ec6d2fb2ac87d5b8e5333f54f92c3f1cbfc989a5")
- ("modus-themes" . "cb2ce8bedfbe9c6f7cc3009e85ae6756b77c3258")
+ ("modus-themes" . "3002f6fb64e147ece4284880ffa93c6c3baa0e75")
  ("multiple-cursors.el" . "c870c18462461df19382ecd2f9374c8b902cd804")
  ("nginx-mode" . "c4ac5de975d65c84893a130a470af32a48b0b66c")
- ("nongnu-elpa" . "f031337c6ee125455a98e2de899a563388e5de19")
+ ("nongnu-elpa" . "a9a649210a8d8b9295b5a1d0c7b60a77db03c14c")
- ("otp" . "5f14aa2d1a5c5f5fed3537c55039a3079a2e7c21")
+ ("otp" . "0b33c5a4c0a647cf7df6d50c8768b574c48752fd")
  ("paredit" . "037b9b8acbca75151f133b6c0f7f3ff97d9042e5")
  ("parseclj" . "6af22372e0fe14df882dd300b22b12ba2d7e00b0")
  ("parseedn" . "3407e4530a367b6c2b857dae261cdbb67a440aaa")
@@ -105,12 +105,12 @@
  ("php-mode" . "59814bd80c59894022bc5950fb3bdf02420e8a89")
  ("posframe" . "493b17f74ad41104d0c4d648e8c96dc495279ac8")
  ("powerline" . "c35c35bdf5ce2d992882c1f06f0f078058870d4a")
- ("projectile" . "0163b335a18af0f077a474d4dc6b36e22b5e3274")
+ ("projectile" . "01fb6a5ef023bcfc52b209586dcb4fd13db00218")
  ("purescript-mode" . "eacc61aaafe6055b5f278c9843558f220f18b153")
  ("queue" . "8df1334d54d4735d2f821790422a850dfaaa08ef")
  ("rainbow-delimiters" . "f40ece58df8b2f0fb6c8576b527755a552a5e763")
  ("rainbow-mode" . "2e6b18609c2fdd1a2dc513937a64d276fd6cf24c")
- ("rbs-mode" . "69af306a4d2eb14548f10e59cfe7fa7230bf0b92")
+ ("rbs-mode" . "d382032cb276d452fdd512c1f1f1b9f95153b356")
  ("reason-mode" . "d657ff75572a8ea7eda6fe22ada3a2ebf5bc6119")
  ("rspec-mode" . "29df3d081c6a1cbdf840cd13d45ea1c100c5bbaa")
  ("ruby-end.el" . "ba7d7230f9e3ed75c9982d32bb9fdff1dc10935d")
@@ -123,25 +123,26 @@
  ("spaceline" . "086420d16e526c79b67fc1edec4c2ae1e699f372")
  ("speed-type" . "b982ee6081a11837760eeaed73c4f413eefb07b1")
  ("spinner" . "fa117f0893788f3fe24673715a6b83bb34d238dd")
- ("straight.el" . "b3760f5829dba37e855add7323304561eb57a3d4")
+ ("straight.el" . "88e574ae75344e39b436f863ef0344135c7b6517")
  ("swiper" . "2a25a6fb5b081cb141c5eccac8ee58ab1feeb747")
  ("tablist" . "fcd37147121fabdf003a70279cf86fbe08cfac6f")
  ("terraform-mode" . "abfc10f5e313c4bb99de136a14636e9bc6df74f6")
- ("transient" . "6543000d5a509096f0f98eb4b814d7f6f2114ce3")
+ ("transient" . "3d3f8711d4f6a6ff7f53bc22e465ec82587c62ed")
  ("tree-sitter-indent.el" . "4ef246db3e4ff99f672fe5e4b416c890f885c09e")
- ("tree-sitter-langs" . "0c46e6a226a4d342f03c1b63089d4273a1acf0a9")
+ ("tree-sitter-langs" . "ac3aa507a8a5664159613834fe6568aa86cc16f1")
- ("treemacs" . "362bfa50904a27a7a6caaafd3ab254a5c2e5abc4")
+ ("treemacs" . "2377d231bcb4ff6841cbf6a7c1e4b6747e26ddd0")
  ("tuareg" . "1d53723e39f22ab4ab76d31f2b188a2879305092")
  ("typescript.el" . "fc3a4f3b275e8cf6cf41aa0c9ef42e25ef908feb")
  ("use-package" . "a6e856418d2ebd053b34e0ab2fda328abeba731c")
  ("visual-regexp-steroids.el" . "a6420b25ec0fbba43bf57875827092e1196d8a9e")
  ("visual-regexp.el" . "48457d42a5e0fe10fa3a9c15854f1f127ade09b5")
  ("vundo" . "5374125dc0aaf1769bb0965344befb90f809ccfc")
- ("web-mode" . "cbb12727591ba4360ac8e09ae5f9fe666175cc30")
+ ("web-mode" . "0c83581d1e93d1d802c730a1d5e90cd1c740e1b2")
- ("with-editor" . "62dc8ba2184bef074ff0e90eefb70bfa34c21d3c")
+ ("with-editor" . "8c550d9e799a0baedb2164471e7ed19fc15d9196")
  ("yaml-mode" . "7b5ce294fb15c2c8926fa476d7218aa415550a2a")
  ("yaml.el" . "70c4fcead97e9bd6594e418c922ae769818f4245")
  ("yasnippet" . "eb5ba2664c3a68ae4a53bb38b85418dd131b208f")
  ("yasnippet-snippets" . "1bf034887c4048c38266842686b7f9c8384f72e7")
+ ("zenburn-emacs" . "15f48bfc6b52d112f3c3fd98e533bda9138ffdd2")
  ("zig-mode" . "f55e42536a3f34b81198b856595dc3a61867aa3e"))
 :gamma