From 835c3325ef96c68053420431d1f93cf02418c1a5 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Thu, 16 Mar 2023 15:28:56 +0200 Subject: [PATCH] Fix elixir HEEx --- lang/elixir.el | 6 +-- lang/erlang.el | 18 --------- straight/versions/default.el | 71 ++++++++++++++++++------------------ 3 files changed, 39 insertions(+), 56 deletions(-) diff --git a/lang/elixir.el b/lang/elixir.el index 8b7416e..6ef4435 100644 --- a/lang/elixir.el +++ b/lang/elixir.el @@ -6,9 +6,9 @@ (require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el") (require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el") -(use-package elixir-mode - :requires (lsp-mode lsp-ui) - :straight t) +(use-package elixir-mode :requires (lsp-mode lsp-ui) :straight t) + +(add-to-list 'auto-mode-alist '("\\.heex\\'" . elixir-mode)) (defhydra my-elixir/context-hydra (:color teal :hint nil) " diff --git a/lang/erlang.el b/lang/erlang.el index 84b805c..389f766 100644 --- a/lang/erlang.el +++ b/lang/erlang.el @@ -10,22 +10,6 @@ :straight t :requires (lsp-mode lsp-ui)) -(defhydra my-erlang/context-hydra (:color teal :hint nil) - " -^ -^ LSP ^^Buffer -^──────────────────────────────────────────────────────────────────────────────── -^ _m_: iMenu _r_: Reload -^^^ _i_: Indent -^^^ _e_: Show Errors -^ -" - ("q" nil "cancel" :color blue) - ("r" revert-buffer-no-confirm) - ("i" mark-and-indent-whole-buffer) - ("e" flycheck-list-errors) - ("m" lsp-ui-imenu)) - (cl-defun erlang/emacs-path (erlang-version) (car (split-string (shell-command-to-string @@ -120,8 +104,6 @@ (add-to-list (make-local-variable 'company-backends) '(company-capf company-yasnippet)) - (define-key erlang-mode-map (kbd "C-c l") 'my-erlang/context-hydra/body) - ;; Start LSP server (lsp)) diff --git a/straight/versions/default.el b/straight/versions/default.el index 1a3937b..5dfa78e 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -7,55 +7,55 @@ ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470") ("caml-mode" . "959a5a27bfdbaa43a9ff99be136d62e0798f5e01") ("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121") - ("cider" . "f695986d97d3df5cbaa2ee45e49a58d9e8de9212") + ("cider" . "b33e18260aa3d6c79451a4c2bbace072c8256869") ("clj-refactor.el" . "b5abe655e572a6ecfed02bb8164b64716ef76b8e") ("clojure-mode" . "3453cd229b412227aaffd1dc2870fa8fa213c5b1") ("column-enforce-mode" . "14a7622f2268890e33536ccd29510024d51ee96f") ("company-box" . "766546b2668b5ef4eb4abbde632c9acd370c7788") - ("company-mode" . "2ca3e29abf87392714bc2b26e50e1c0f4b9f4e2c") - ("compat" . "240799cf4f03ba0d9e8e277de1e920f8b077d725") + ("company-mode" . "b3b9fa37ef9fd02471779130a0b53d87fa726ac1") + ("compat" . "9d2a293dca90e70a8bcd963682e8b7122371595b") ("counsel-projectile" . "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b") - ("dap-mode" . "39bfaf1a3400b3ca4e9755f4d15e33abb0dda2c4") + ("dap-mode" . "2cff309019de6b49e8508b2b07e1a6c043d3df5f") ("dash-at-point" . "fba1a6f42ea51d05110e12c62bdced664059eb55") - ("dash.el" . "3df46d7d9fe74f52a661565888e4d31fd760f0df") + ("dash.el" . "c30c6bea49b79d966c92ce606fea53dea647b959") ("deft" . "28be94d89bff2e1c7edef7244d7c5ba0636b1296") ("diminish.el" . "fbd5d846611bad828e336b25d2e131d1bc06b83d") ("dockerfile-mode" . "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c") - ("dune" . "ec583d27d2904b7d837cde30c9497f1d6a7ff3d6") + ("dune" . "d5582c7d677b0d8afcc92f5c390d014cdac1a97f") ("easy-kill" . "de7d66c3c864a4722a973ee9bc228a14be49ba0c") ("edit-indirect" . "f80f63822ffae78de38dbe72cacaeb1aaa96c732") ("el-get" . "bc4299031e634b514eceb472b6b02432c2bb86ba") - ("eldoc" . "5b9fd6faa9a65409064207c29954edd8ad45dcda") - ("elisp-refs" . "af73739084637c8ebadad337a8fe58ff4f1d2ec1") + ("eldoc" . "4672f7d02a5d7cc18ab44d56448c67903f5dd5d0") + ("elisp-refs" . "6973912994ade71a3e13a24425f1cc648d8b94bb") ("elisp-tree-sitter" . "3cfab8a0e945db9b3df84437f27945746a43cc71") ("emacs-ansible" . "d89ac0ee57742cca0f0e0a3453d9dcc521575690") - ("emacs-dashboard" . "5aaddd389e594b400d20062bf9cf3d7f236657ca") + ("emacs-dashboard" . "19db15c31a29a9696251e26b90ed67066a375c5d") ("emacs-direnv" . "268536f564b7eba99264a89a9149268eb4bc67ac") ("emacs-elixir" . "7641373f0563cab67cc5459c34534a8176b5e676") - ("emacs-fsharp-mode" . "cfd3f8827e8ec9cbf4d23653c4b05db4c01a5947") + ("emacs-fsharp-mode" . "09fec6c91f9c18173f145e28c55d6f21be678231") ("emacs-gradle-mode" . "e4d665d5784ecda7ddfba015f07c69be3cfc45f2") - ("emacs-hcl-mode" . "e4d9eef631e8a386341ae8f94f7c2579586e65b5") + ("emacs-hcl-mode" . "751b79247f326ab52e00032e805775c37ad9f080") ("emacs-racer" . "1e63e98626737ea9b662d4a9b1ffd6842b1c648c") ("emacs-reformatter" . "f454b179ab7d39dc8783b9f2a046cab353b272f5") ("emacs-which-key" . "8093644032854b1cdf3245ce4e3c7b6673f741bf") - ("emacsmirror-mirror" . "3ccd7136ad4baea952341b21e9c0d56f538e7561") + ("emacsmirror-mirror" . "ce2c90383462452078ba93b3e8eca731ddc8553c") ("enhanced-ruby-mode" . "7e76d754e1632b4fc9a024fa393c3fc837bcc86b") ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") ("exec-path-from-shell" . "ddd24dc823de9a94435b4d8ea7569161657f31e2") ("f.el" . "af7d37c619010b576fd22b50c62c71ff33093f3c") - ("flycheck" . "9db727590b8f038b91cd1360ead1706f50043d2a") + ("flycheck" . "5f2ef177cb21ae8b73714575802beef04abd0f5e") ("flycheck-rust" . "a139cd53c5062697e9ed94ad80b803c37d999600") ("flyspell-correct" . "7d7b6b01188bd28e20a13736ac9f36c3367bd16e") ("frame-local" . "7ee1106c3bcd4022f48421f8cb1ef4f995da816e") ("git-modes" . "f0a0154bf48dd1c0c587596cf4cfd3c90f673a05") ("gleam-mode" . "6e5366682ba23153e011239493b9332cac244284") - ("gnu-elpa-mirror" . "3350028f721bec8076b332a7d50ae8fa488834a6") + ("gnu-elpa-mirror" . "131ad9e029ad6073d7ef1c197a43b49dace397d9") ("go-mode.el" . "166dfb1e090233c4609a50c2ec9f57f113c1da72") ("graphql-mode" . "1437b790060f6ce4a8dc57df2023443645b899e5") ("groovy-emacs-modes" . "c612ac1e9f742856914ad6e8eb9e9dc169f489ab") - ("haskell-mode" . "a34ccdc54be15043ff0d253c3c20087524255491") - ("helpful" . "94c25337b2de2f9da60914a7c0c6cca9584c0231") - ("ht.el" . "d90969eec9263ee818cbfbe29bf6596a0657ab11") + ("haskell-mode" . "20d4e2300302a9af673e82d0185d3f489bfb0f59") + ("helpful" . "1c98f6f06a85def5d34c735f8cd407f20cebddf9") + ("ht.el" . "3c1677f1bf2ded2ab07edffb7d17def5d2b5b6f6") ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b") ("jenkinsfile-mode" . "1d90c1ff8edc7ea88844af92a206e7c5f083b568") ("js2-mode" . "a297ec2c2d9aa50ddc6c06959bb5a054e17b692a") @@ -67,30 +67,31 @@ ("let-alist" . "021fc10df2e44faba4728d849ee767cf890aa51a") ("lsp-docker" . "81ddb3fc68e1930352b6ca006d0ea609760be7d1") ("lsp-haskell" . "3249cde75fb411f95fe173c222b848182fd0b752") - ("lsp-mode" . "03e1818acae6de9a6ed89c54573f8050e4d4e463") + ("lsp-mode" . "b489dae1f2f83a1e7b0410622d2b04354448d6c4") ("lsp-treemacs" . "a48763ba5d1c024426e237ce65926db849d3ae6f") ("lsp-ui" . "295d8984da06a745b0a36c56e28ce915bc389adb") ("macrostep" . "75ecd041219239f0dceab4883594ea2fe366b484") - ("magit" . "0f597804786272d2a3b21552f1cbe29e365de72f") + ("magit" . "fb640a8df53902f46ce8824fa5849b46ff12e762") ("map" . "a0e501aede34f183a8baa5d3d41610a3ffa1728e") - ("markdown-mode" . "c765b73b370f0fcaaa3cee28b2be69652e2d2c39") - ("melpa" . "b96e8296708e27ec51b5a084a924bdb86d07ae5d") - ("merlin" . "945e5e10373640b622c47a54b84f4c2a0252c477") + ("markdown-mode" . "ece1dd845904b08ab78598dc7e1a2eaf7875d1c4") + ("melpa" . "9eaf67fb6cdbf24273fa167a9c5e035b9e6efda1") + ("merlin" . "85ad3a6b09edbf54685eb8e962e82c209f409951") ("mmm-mode" . "171bf6395b8a95a2d08d41fa38cc1799025d3916") - ("multiple-cursors.el" . "16223efc2d6dece2d43bbccc189d7a4bab6de571") + ("modus-themes" . "d4e70e069b993ec56f60cf75d8c147c0df539b8a") + ("multiple-cursors.el" . "6956e8e12ee191d7c80d042ae8ff495286fcbe38") ("nginx-mode" . "6e9d96f58eddd69f62f7fd443d9b9753e16e0e96") - ("nongnu-elpa" . "85c7a060c6174bf544f0ff8fe2480aaa1f70ed46") - ("otp" . "a108f991c0489675938eb0958f69a98d18a4460f") + ("nongnu-elpa" . "9e236b82a2da24bb9983e2f63061323354d6ecfe") + ("otp" . "8f4e4cd18ed2c272c5eacf0f3d73957cd439c38d") ("paredit" . "9a2c4b37fc8c1c7bdbb1f86fdec874c0d0652e64") ("parseclj" . "4d0e780e00f1828b00c43099e6eebc6582998f72") ("parseedn" . "a09686fbb9113b8b1b4f20c9e1dc0d6fea01a64f") ("pfuture" . "19b53aebbc0f2da31de6326c495038901bffb73c") - ("php-mode" . "fb11df8268b7099766264cd53836ef159746adbd") + ("php-mode" . "8e874a8fd8fbcf05fa7e6ddce2208514e90e7e81") ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61") ("pos-tip" . "bfe74204d1201a33ace81898e7c485382817510a") - ("posframe" . "06b939cfb06168782fc378043ff35bd7fec203b8") - ("projectile" . "e18ad4d6111eb9e975ccce028baf5e4bb786bfcf") - ("purescript-mode" . "cf113871f98da672bd2e9ae58da9c852236f3934") + ("posframe" . "dace2dcf105e9685b4085836645b3392dc7e2211") + ("projectile" . "76475745fb408fa716b2b43c436ba07a56836f89") + ("purescript-mode" . "eacc61aaafe6055b5f278c9843558f220f18b153") ("queue" . "130c2d656cd5d7376552272fab9e50a7c37d0c4a") ("rainbow-delimiters" . "a32b39bdfe6c61c322c37226d66e1b6d4f107ed0") ("rainbow-mode" . "8e96388fb4d616a9dde23e712bad0d9cd048fbf0") @@ -102,7 +103,7 @@ ("rust-mode" . "22fff6a049402584e7120146c3db141c6f530bf6") ("s.el" . "e957dcb0677da18b2bb60ad867db5df5c35b5616") ("sesman" . "e0f555f963c9f02f8e4a50e06fc353eb4c15ee77") - ("slime" . "7d39285af4d529c38832ebe6dc7185c7d3a95015") + ("slime" . "e193bc5f3431a2f71f1d7a0e3f28e6dc4dd5de2d") ("slime-company" . "f20ecc4104d4c35052696e7e760109fb02060e72") ("smart-mode-line" . "abcb0ab6f7110a03d6c7428bae67cf8731496433") ("speed-type" . "4f8553632d71e827b4da6e091143779d2ad970a8") @@ -110,10 +111,10 @@ ("ssass-mode" . "96f557887ad97a0066a60c54f92b7234b8407016") ("straight.el" . "3eca39dfc6797243ec7d1c6a7d45142407f73f88") ("swiper" . "b8be4913a661b557e0d3275726e36871556569d3") - ("terraform-mode" . "39d2fd5bfc86c6bf1c7bc38e6f0016d714f2d79d") - ("transient" . "8806655538187d69dd18e7755024af0f56460600") + ("terraform-mode" . "7b1e482530c76dcf856ec4a20aee6586eb2e8ccf") + ("transient" . "75a5076def1e6f5265eb2346a951ba9d97502fc9") ("tree-sitter-langs" . "d8f8ac4faeb4564fbb61e94a631b4672523d84a9") - ("treemacs" . "9986d6cd3d2822db7ae0e6d8a275db7057f3e828") + ("treemacs" . "8b7638e69f64dcef05f1bd04dbc82c829e8bf261") ("tuareg" . "53ce2fdfdd372d52f3a6547c33b687e7d403357a") ("undo-tree" . "16f4121032d09ef44b3d7d02c4d02c3c2f18041f") ("use-package" . "77945e002f11440eae72d8730d3de218163d551e") @@ -125,6 +126,6 @@ ("yaml-mode" . "3fcb36d6039bef57e2a0f6e24c51f623c0bf5fb7") ("yaml.el" . "73fde9d8fbbaf2596449285df9eb412ae9dd74d9") ("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6") - ("yasnippet-snippets" . "df524e4c8688f458dea49199c01c2e7f1190bdd5") - ("zig-mode" . "9c5e41d6a0a8d8e081dd2dc9b57696435eebbc30")) + ("yasnippet-snippets" . "ffdabd7990013718f6b765bfd5e3f1899430d2cc") + ("zig-mode" . "2013d39ee9a62449263939bc8c33a128fe1e90f0")) :gamma