diff --git a/.gitignore b/.gitignore index e82b8d3..e7b6e60 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ ac-comphist.dat !straight/versions/default.el /speed-type /tutorial +/tree-sitter # Ignore actual init as it can contain private data init.el diff --git a/lang/elixir.el b/lang/elixir.el index 55c73f5..b18ea2c 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-transient "$HOME/.emacs.d/pkg/transient.el") -(use-package elixir-mode :requires (lsp-mode lsp-ui) :straight t) +(use-package elixir-ts-mode :requires (lsp-mode lsp-ui) :straight t) -(add-to-list 'auto-mode-alist '("\\.heex\\'" . elixir-mode)) +(add-to-list 'auto-mode-alist '("\\.heex\\'" . elixir-ts-mode)) (transient-define-prefix +custom-lang-elixir/transient-context-menu () "Elixir Buffer Commands" @@ -17,13 +17,13 @@ ("m" "iMenu" lsp-ui-imenu)] ["Buffer" ("r" "Reload" revert-buffer-no-confirm) - ("f" "Format" elixir-format) + ("f" "Format" lsp-format-buffer) ("i" "Indent" mark-and-indent-whole-buffer) ("e" "Show Errors" flycheck-list-errors)]] ["" ("q" "Quit" keyboard-quit)]) -(defun +custom-lang-elixir/activate-elixir-mode () +(defun +custom-lang-elixir/activate-elixir-ts-mode () "All things Elixir." (set-indent 2) (column-enforce-n 98) @@ -31,18 +31,17 @@ (setq-local flycheck-check-syntax-automatically '(save mode-enabled)) (setq-local lsp-eldoc-enable-hover nil) (setq-local company-minimum-prefix-length 3) - (define-key elixir-mode-map (kbd "") 'elixir-format) ;; If needed, switch the one below to false to disable documentation pop-ups ;; (setq-local lsp-ui-doc-enable t) - (define-key elixir-mode-map (kbd "C-c l") '+custom-lang-elixir/transient-context-menu) + (define-key elixir-ts-mode-map (kbd "C-c l") '+custom-lang-elixir/transient-context-menu) ;; Company list override (add-to-list (make-local-variable 'company-backends) '(company-capf company-yasnippet))) -(add-hook 'elixir-mode-hook '+custom-lang-elixir/activate-elixir-mode) +(add-hook 'elixir-ts-mode-hook '+custom-lang-elixir/activate-elixir-ts-mode) (provide '+custom-lang-elixir) ;;; elixir.el ends here diff --git a/pkg/company-yasnippet.el b/pkg/company-yasnippet.el index 739750c..ab186d5 100644 --- a/pkg/company-yasnippet.el +++ b/pkg/company-yasnippet.el @@ -35,7 +35,7 @@ :straight (:host github :repo "zerolfx/copilot.el" :files ("dist" "*.el")) :ensure t) -(add-hook 'prog-mode-hook 'copilot-mode) +;; (add-hook 'prog-mode-hook 'copilot-mode) (define-key copilot-completion-map (kbd "") 'copilot-accept-completion) (define-key copilot-completion-map (kbd "TAB") 'copilot-accept-completion) diff --git a/straight/versions/default.el b/straight/versions/default.el index f0e57b8..b20d739 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -1,6 +1,6 @@ (("ace-window" . "77115afc1b0b9f633084cf7479c767988106c196") ("all-the-icons.el" . "be9d5dcda9c892e8ca1535e288620eec075eb0be") - ("apheleia" . "ddea9bea708ce029cea6126b5be8e9f8979c58b3") + ("apheleia" . "8f512dba3ee2eabae0dbfd8289b89d54c132cb87") ("apropospriate-theme" . "591e0c2bcc886009e84d9815bd64428b1b04a97b") ("autothemer" . "cb4d4b69f8bb1f8158d2311692b7607794b75829") ("avy" . "be612110cb116a38b8603df367942e2bb3d9bdbe") @@ -9,14 +9,14 @@ ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470") ("caml-mode" . "47defafa2b08fb680e89bfee9cb9ce82bd9e3bcf") ("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121") - ("cider" . "5261886ad7c0a8828d022812c7c1c6b503ddd6ba") - ("clj-refactor.el" . "b390a17a2b0db2bb7d2b0d1cf014513cc1346e4c") - ("clojure-mode" . "481ca480e8b7b6c90881f8bd8434addab1d33778") + ("cider" . "25c51fd4b1246801ba3fa15c57b44d860772417c") + ("clj-refactor.el" . "a3b5238345e0991785e5170112f5db9c9663b7fb") + ("clojure-mode" . "222fdafa2add56a171ded245339a383e5e3078ec") ("column-enforce-mode" . "14a7622f2268890e33536ccd29510024d51ee96f") ("company-box" . "b6f53e26adf948aca55c3ff6c22c21a6a6614253") - ("company-mode" . "e22230561ef559b032b4a2d79bef686d494b8ea6") - ("compat" . "b6b64e004cd35b8fe3c40fe5ca250826f65a3369") - ("copilot.el" . "30a054f8569550853a9b6f947a2fe1ded7e7cc6b") + ("company-mode" . "f0fee2c59de4642f4c8a782734f24dfcf25c0a3a") + ("compat" . "605f224633eb28efbe62252605515ce3d557e19f") + ("copilot.el" . "588089d296ed9c7083625ada8c624df128e1ae60") ("counsel-projectile" . "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b") ("dap-mode" . "755845ae053bbfdd3f7b3dca13efa4be480370b5") ("dart-mode" . "61e01142352f6813aca6512bedadb5007de3a0b9") @@ -25,28 +25,28 @@ ("deft" . "28be94d89bff2e1c7edef7244d7c5ba0636b1296") ("dhall-mode" . "87ab69fe765d87b3bb1604a306a8c44d6887681d") ("diminish.el" . "fbd5d846611bad828e336b25d2e131d1bc06b83d") - ("docker.el" . "2def2ab7fa04ed14403d00e3547a94c3822302cb") + ("docker.el" . "d5255a65b7240d0038cc417f301b43df05a27922") ("dockerfile-mode" . "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c") - ("dune" . "c5352807775e688de982cb0e4029fb84341a261d") + ("dune" . "c65461394c41dbacfca8fb12f5af667b02a63a38") ("easy-kill" . "de7d66c3c864a4722a973ee9bc228a14be49ba0c") ("editorconfig-emacs" . "4bf871b7a2f2433d1032ef2b251bfb08c23347f4") ("el-get" . "a5ba5852648a90ee0cde9fb5d72e69497d260eec") - ("eldoc" . "7dd56ba328a126a237115c13f653e5f34fda8989") + ("eldoc" . "ef02c43ea0b213b98db6f348bdb5c35b8436bb49") ("elisp-refs" . "541a064c3ce27867872cf708354a65d83baf2a6d") ("elisp-tree-sitter" . "3cfab8a0e945db9b3df84437f27945746a43cc71") + ("elixir-ts-mode" . "23fc038fa783aa0e4d03139c39b98789f439378b") ("emacs-aio" . "da93523e235529fa97d6f251319d9e1d6fc24a41") ("emacs-ansible" . "d89ac0ee57742cca0f0e0a3453d9dcc521575690") - ("emacs-dashboard" . "9c8b0cce865e34340c6d435253f6a3aed3b3ace5") + ("emacs-dashboard" . "54b7767b79fb7b9966c48a31a9d32f372ef9ec3d") ("emacs-direnv" . "14f74269af34f8c30ab4a521eff290b74460daed") - ("emacs-elixir" . "00d6580a040a750e019218f9392cf9a4c2dac23a") ("emacs-fsharp-mode" . "b4d31c3da018cfbb3d1f9e6fd416d8777f0835bd") ("emacs-gradle-mode" . "e4d665d5784ecda7ddfba015f07c69be3cfc45f2") - ("emacs-leuven-theme" . "ab33c7a526573e1392f7faa22e87735d3706866c") + ("emacs-leuven-theme" . "09541e421e06f581e617dd3b149bb4037ce8c1f2") ("emacs-racer" . "1e63e98626737ea9b662d4a9b1ffd6842b1c648c") - ("emacs-reformatter" . "af56cd5e47c3732f9d972fc8fd64ceca1e0bf4b7") + ("emacs-reformatter" . "8040d6bf1e219a38626a359fdb02a7f942f9e95a") ("emacs-theme-darktooth" . "2358dd334b5dcb6dc9828422bd7bd1e4da556819") ("emacs-which-key" . "4d20bc852545a2e602f59084a630f888542052b1") - ("emacsmirror-mirror" . "5cbbb0a404ce3aa1cedd3fd9dea4f0b80cd89a3a") + ("emacsmirror-mirror" . "ffb0ad0ce17a28de89e445208942b003be93461d") ("enhanced-ruby-mode" . "03dee65fc7153e5f98d2dcc294881a5bc38d5d5b") ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") ("exec-path-from-shell" . "99b1b731d55614dceb72b6f16602df2b8d030dc9") @@ -57,12 +57,13 @@ ("frame-local" . "7ee1106c3bcd4022f48421f8cb1ef4f995da816e") ("git-modes" . "399b1b446644afce8d0949ff85a882bfdbbfb7bf") ("gleam-mode" . "399cb373d4c55e97157de25807fbd0eba0ac0639") - ("gnu-elpa-mirror" . "3e9da80a174721e8b7a229a294c8ac977bd29af5") + ("gnu-elpa-mirror" . "801d4646475ceeb1212b4f9adc8f02c63c224662") ("go-mode.el" . "8dce1e3ba1cdc34a856ad53c8421413cfe33660e") ("graphql-mode" . "49a391b5290e3354b07f7b77ded97a154c084f46") ("groovy-emacs-modes" . "7b8520b2e2d3ab1d62b35c426e17ac25ed0120bb") - ("haskell-mode" . "8d0f44bfe2a9ab6b0969c9bafb75089f315ff5ae") + ("haskell-mode" . "79eaf444a72109f93f552abb53f834cc63bbf9f2") ("hcl-mode" . "751b79247f326ab52e00032e805775c37ad9f080") + ("heex-ts-mode" . "80f35c61eb99393179b58a75c0fdd9b546d25136") ("helpful" . "a32a5b3d959a7fccf09a71d97b3d7c888ac31c69") ("ht.el" . "1c49aad1c820c86f7ee35bf9fff8429502f60fef") ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b") @@ -70,39 +71,39 @@ ("js2-mode" . "79bc78d77db0d2e8e43dc0f9e0504ad90bcbc26d") ("json-mode" . "481d5d9f4003fc14d116bf31d1bf71d14960d7d9") ("json-snatcher" . "b28d1c0670636da6db508d03872d96ffddbc10f2") - ("jsonrpc" . "768f955f702a471c47f7ca1cf6ef57e5838892d5") + ("jsonrpc" . "fcd46e2ff985b118af205d98b6d3ee77a6ae64e3") ("jump.el" . "55caa66a7cc6e0b1a76143fd40eff38416928941") ("keyfreq" . "c6955162307f37c2ac631d9daf118781009f8dda") ("kotlin-mode" . "fddd747e5b4736e8b27a147960f369b86179ddff") ("lean4-mode" . "d1c936409ade7d93e67107243cbc0aa55cda7fd5") ("let-alist" . "0c968ff216a2c91080d79272e85132fef6f14988") ("lsp-dart" . "e7ee6afc2e165291360fd35d16648307920837c7") - ("lsp-docker" . "6b7701917417e4e74961185051c147e1bf003750") + ("lsp-docker" . "60e1103ac7c8e30d036ea65fad489210682d6259") ("lsp-haskell" . "89d16370434e9a247e95b8b701f524f5abfc884b") - ("lsp-mode" . "91dbd0240afb5223b2ddfca8326d1c2fb3e8cf7f") + ("lsp-mode" . "01bd566c0508993202b08071ed7037c9fc4e3329") ("lsp-treemacs" . "e66ae2196503d4e84334519e56b4388feffa5060") ("lsp-ui" . "0dd39900c8ed8145d207985cb2f65cedd1ffb410") ("macrostep" . "0b04a89f698c335c9ea492553470a8d45c113edd") - ("magit" . "f4ff817cb2a48f0f7887050c3be469c03a059567") + ("magit" . "f25d10351fc1d44282dad45caaf99cb19913eda4") ("map" . "941b1e5fa39acce026b287565cb1a95c57d611ed") - ("markdown-mode" . "b1a862f0165b7bafe0f874738a55be1b1720dd7d") - ("melpa" . "d01c726fc20b97e6127603f7bc347a5cf5e21cf8") - ("merlin" . "53eaad5df01bbdabc9e655dbadebc302d0475f31") - ("modus-themes" . "bdb18b2ee27344e44e2a17c78524205d02d5174c") + ("markdown-mode" . "141f9a05d121f60fe5e411c0ad114e3d3216c9ad") + ("melpa" . "6587a445e951c1d99b21953dcb3da9c1119862f4") + ("merlin" . "b06a4e4f976100c23173d715f1b35cd91f8131f0") + ("modus-themes" . "642cc5f8358fd1f2911792a4bbed160d24e9b01b") ("multiple-cursors.el" . "234806c832994cadedb42596fe235e91bbd59e8c") ("nginx-mode" . "6e9d96f58eddd69f62f7fd443d9b9753e16e0e96") - ("nongnu-elpa" . "e9d06c3dfe8b41a568dd1ba6fa10e284ef5380c1") - ("otp" . "966fad5a46078488d8a3dd7f79e1625bdbc42d26") + ("nongnu-elpa" . "b299b0d074a4762e99474ba443d37263f87ace1d") + ("otp" . "9cbb1fec5a1d44f87304dcc46d3afc9fba81f292") ("paredit" . "9a2c4b37fc8c1c7bdbb1f86fdec874c0d0652e64") - ("parseclj" . "74ff7d63fed92a3c859e474ae85f011e794b751a") - ("parseedn" . "c8f07926a688bfe995fde4460103915d401a1aff") + ("parseclj" . "6af22372e0fe14df882dd300b22b12ba2d7e00b0") + ("parseedn" . "3407e4530a367b6c2b857dae261cdbb67a440aaa") ("pfuture" . "19b53aebbc0f2da31de6326c495038901bffb73c") - ("php-mode" . "4a29636243ba7f4afba476348587713531d994bc") + ("php-mode" . "7d740e7e5197266b78306d0c4e0da4aac2d2ad75") ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61") ("pos-tip" . "90a9babc829b298af36be695009894fc00a97935") ("posframe" . "017deece88360c7297265680d78a0bb316470716") ("powerline" . "c35c35bdf5ce2d992882c1f06f0f078058870d4a") - ("projectile" . "9446ea92d28462aeb37846a8be0a0c97a7bc0cee") + ("projectile" . "e0fc464d1e41c8d7267636ea2b7330491087c19d") ("purescript-mode" . "eacc61aaafe6055b5f278c9843558f220f18b153") ("queue" . "7ab8f23e770f64f6bd28a44c46c8becfc1af03d8") ("rainbow-delimiters" . "f40ece58df8b2f0fb6c8576b527755a552a5e763") @@ -114,25 +115,25 @@ ("rust-mode" . "9c26dc1195ec05309ee15c014631fb9abd6cf5d2") ("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d") ("sesman" . "e0f555f963c9f02f8e4a50e06fc353eb4c15ee77") - ("slime" . "735258a26bb97e85d25f39e4bef83c1f80c12f5d") + ("slime" . "799a05f5b8cf4f65c1e90b802d0666f164aa7eb3") ("slime-company" . "f20ecc4104d4c35052696e7e760109fb02060e72") ("spaceline" . "086420d16e526c79b67fc1edec4c2ae1e699f372") ("speed-type" . "b982ee6081a11837760eeaed73c4f413eefb07b1") ("spinner" . "67681b8f1580a7cd7a1aa49d78eaa30d11f7c178") - ("straight.el" . "9b11112b2e7aedd994feb2d8f95bd66dbc5749a5") + ("straight.el" . "b3760f5829dba37e855add7323304561eb57a3d4") ("swiper" . "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d") ("tablist" . "fcd37147121fabdf003a70279cf86fbe08cfac6f") ("terraform-mode" . "e8b57df8c2a3d3171f3768f60eb84067f553289c") - ("transient" . "3cd1de1695084df089cc90cff89b32dfd6ca5a0a") - ("tree-sitter-langs" . "3a3ad0527d5f8c7768678878eb5cfe399bedf703") - ("treemacs" . "a1e855bce6c112d57994c991bc50775b6922f73e") + ("transient" . "2c8b50231b11d354b60709c361f2dfbc4cb8163d") + ("tree-sitter-langs" . "209c986300a7eadb84c8dff142c576d812b7c77e") + ("treemacs" . "529876dcc0d2c30667f1697c4eb7a5f137da4c3e") ("tuareg" . "1d53723e39f22ab4ab76d31f2b188a2879305092") ("undo-tree" . "f9e7eac16f674aa7ed8fa065401d26c0258a84f8") ("use-package" . "a6e856418d2ebd053b34e0ab2fda328abeba731c") ("visual-regexp.el" . "48457d42a5e0fe10fa3a9c15854f1f127ade09b5") - ("web-mode" . "848fce94de202541cd3fcd35e9c9d22783e9e828") + ("web-mode" . "df57cd0beea9c6bdc64259bd11bde0c076a64cc9") ("with-editor" . "fcd186d1e684c2dca6497c89af77b27b2b036c11") - ("yaml-mode" . "23395dfcf004c952850691b70e63f97f169596e8") + ("yaml-mode" . "5b58248ab255dff6cfa4c4057a191bc4446ee5b6") ("yaml.el" . "fe08b8f5307af1e7b876ece64b7303213f04b63c") ("yasnippet" . "52a1c5031912243c791c55e0fe345d04f219b507") ("yasnippet-snippets" . "063f54cea33f59defe9123549bf55ca342457a1c")