Rework haskell and Ruby modes

lang/haskell.el

@@ -21,15 +21,13 @@
 (use-package lsp-haskell
   :straight t
   :defer t
-  :requires (lsp-mode lsp-ui haskell-mode)
-  :config
-  (setq lsp-haskell-process-path-hie "haskell-language-server-wrapper"))
+  :requires (lsp-mode lsp-ui haskell-mode))
 
 (defun activate-haskell-mode ()
   "Run this in haskell-mode."
   (set-indent 2)
   (column-enforce-n 80)
-  (lsp)
+  (lsp-deferred)
 
   ;; Company list override
   (add-to-list (make-local-variable 'company-backends)

lang/ruby.el

@@ -35,7 +35,7 @@
 (eval-after-load 'rspec-mode
   '(rspec-install-snippets))
 (add-hook 'enh-ruby-mode-hook 'activate-ruby-mode)
-(add-hook 'enh-ruby-mode-hook 'lsp-deferred)
+;; (add-hook 'enh-ruby-mode-hook 'lsp-deferred)
 
 (provide '+custom-lang-ruby)
 ;;; ruby.el ends here

straight/versions/default.el

@@ -1,45 +1,45 @@
 (("ace-window" . "77115afc1b0b9f633084cf7479c767988106c196")
  ("all-the-icons.el" . "ee414384938ccf2ce93c77d717b85dc5538a257d")
- ("apheleia" . "96a9805ecb75aac2adde7568d26b3e3b3ffc19af")
+ ("apheleia" . "c07e90793c839d1973a0820d24e03a0a6b30b77e")
  ("apropospriate-theme" . "591e0c2bcc886009e84d9815bd64428b1b04a97b")
  ("autothemer" . "cb4d4b69f8bb1f8158d2311692b7607794b75829")
  ("avy" . "be612110cb116a38b8603df367942e2bb3d9bdbe")
- ("base16-emacs" . "f9e1699ea493bf183ed08292ac0cf053fc2603d8")
+ ("base16-emacs" . "c24d84b6c4794d1fc92429b6c70009434a137fe4")
  ("buffer-move" . "e7800b3ab1bd76ee475ef35507ec51ecd5a3f065")
  ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470")
  ("caml-mode" . "47defafa2b08fb680e89bfee9cb9ce82bd9e3bcf")
  ("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121")
- ("cider" . "60c9cea54315b08fb129cb57db5ade70ae28371a")
+ ("cider" . "105847f6ac70e046ba18374883443ad8834c0406")
  ("clj-refactor.el" . "fa3efe18e7150df5153a7d05c54e96d59398a0a8")
- ("clojure-mode" . "222fdafa2add56a171ded245339a383e5e3078ec")
+ ("clojure-mode" . "87e8e8133a0be8e82b3d1da4d1604ed438650c92")
  ("color-theme-sanityinc-tomorrow" . "a918dfe597e3a350b2dd5368eaf33b0432885453")
  ("column-enforce-mode" . "14a7622f2268890e33536ccd29510024d51ee96f")
  ("company-box" . "b6f53e26adf948aca55c3ff6c22c21a6a6614253")
- ("company-mode" . "619c8f2b2377d70d704d285867274c7e9fe4e8d7")
- ("compat" . "940bac4724067e6e48ec042db801af4fc05537ec")
- ("copilot.el" . "8f5e45405ead77fcbe85b5c02193f23449d2d518")
+ ("company-mode" . "0c0186cca8e7e9a12a44ffe42ad7037ffa6bfac7")
+ ("compat" . "30579d440be2512e8deda077d0499186c29ffffa")
+ ("copilot.el" . "0e24423cfef2993b3a9633c8cbb654079f2652a9")
  ("counsel-projectile" . "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b")
  ("cyberpunk-theme.el" . "1fd5350ddfc53c30e6eef82af77c62d7c825df3c")
  ("dap-mode" . "2f0c5b28578ce65ec746e4084ba72ba5c652ea79")
  ("dart-mode" . "dffc0209a19fdfac72b861d6adb445c1b6b464f7")
  ("dash-at-point" . "fba1a6f42ea51d05110e12c62bdced664059eb55")
- ("dash.el" . "13f9fcd09d40132e9e1346a69e7b293d835a85f2")
+ ("dash.el" . "5df7605da5a080df769d4f260034fb0e5e86a7a4")
  ("deft" . "28be94d89bff2e1c7edef7244d7c5ba0636b1296")
  ("dhall-mode" . "87ab69fe765d87b3bb1604a306a8c44d6887681d")
  ("diminish.el" . "fbd5d846611bad828e336b25d2e131d1bc06b83d")
  ("docker.el" . "d5255a65b7240d0038cc417f301b43df05a27922")
- ("dockerfile-mode" . "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c")
- ("dune" . "2f954897efea55a3556439c86e737e742160924d")
+ ("dockerfile-mode" . "448b7ced29ae393ce4f0a3fa524cedc3631c7218")
+ ("dune" . "fe42ff4505c5f7af93262b43393c44516ad0594c")
  ("easy-kill" . "de7d66c3c864a4722a973ee9bc228a14be49ba0c")
- ("editorconfig-emacs" . "9780a07648afe0c12c7f7cd8f1cdfe1be4fc8684")
- ("el-get" . "a5ba5852648a90ee0cde9fb5d72e69497d260eec")
+ ("editorconfig-emacs" . "4b81a5992858cbf03bcd7ed6ef31e4be0b55a7c1")
+ ("el-get" . "4f0d43b3da56794149e9cf8fd80c91a48f8cb55a")
  ("eldoc" . "be58e7c1708abc399e28ea6eee13b3d871c8abf7")
  ("elisp-refs" . "541a064c3ce27867872cf708354a65d83baf2a6d")
  ("elisp-tree-sitter" . "3cfab8a0e945db9b3df84437f27945746a43cc71")
  ("elixir-ts-mode" . "6db05baed9a34d01edf0bfdd804d951dedc6dccb")
  ("emacs-aio" . "da93523e235529fa97d6f251319d9e1d6fc24a41")
- ("emacs-ansible" . "d89ac0ee57742cca0f0e0a3453d9dcc521575690")
- ("emacs-dashboard" . "c894da620bc19d35c8cb67d3fd5b39e9af34de9d")
+ ("emacs-ansible" . "1d7de8d3ddac980715eebd87ee66859f8665b101")
+ ("emacs-dashboard" . "f51bdc9e88c473e4eff40bb923c52b4f2256311e")
  ("emacs-direnv" . "14f74269af34f8c30ab4a521eff290b74460daed")
  ("emacs-elixir" . "00d6580a040a750e019218f9392cf9a4c2dac23a")
  ("emacs-fsharp-mode" . "b4d31c3da018cfbb3d1f9e6fd416d8777f0835bd")
@@ -47,21 +47,21 @@
  ("emacs-leuven-theme" . "28a2d1a3f22b894e1b973c62a6c78786cfe5ab1f")
  ("emacs-reformatter" . "76315e32a1c075d943184fe7b32f1cef98a8272a")
  ("emacs-theme-darktooth" . "2358dd334b5dcb6dc9828422bd7bd1e4da556819")
- ("emacs-which-key" . "4d20bc852545a2e602f59084a630f888542052b1")
- ("emacsmirror-mirror" . "4e16c6252dccace7f33c59eed54431754497586d")
+ ("emacs-which-key" . "f2eae30c62a347dade351c9d39a34258b9fd094d")
+ ("emacsmirror-mirror" . "cee023f5e045f395a25d2056735900c6443cc401")
  ("enhanced-ruby-mode" . "03dee65fc7153e5f98d2dcc294881a5bc38d5d5b")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
- ("exec-path-from-shell" . "6c10a9d4a38425f2b494013b6bdff91537a6b6da")
+ ("exec-path-from-shell" . "d95677ad608c214647b87bc20df1642763e3b400")
  ("f.el" . "4f03d7bb724a9049b0ab9ef86127694756f99656")
- ("flycheck" . "e56e30d8c66ffc9776d07740658d3b542c1a8e21")
- ("flycheck-rust" . "a139cd53c5062697e9ed94ad80b803c37d999600")
+ ("flycheck" . "358a5d7f03bc4880068af25fb687ab13c9bdeec5")
+ ("flycheck-rust" . "b1cc27a125cd71eca209872c576dbe159624a63d")
  ("flyspell-correct" . "1e7a5a56362dd875dddf848b9a9e25d1395b9d37")
  ("frame-local" . "7ee1106c3bcd4022f48421f8cb1ef4f995da816e")
- ("git-modes" . "4a61a9b86df9c824a99c522f42d55e68faf85f91")
+ ("git-modes" . "3cc94974c09c43462dfbfbe20396a414352dbb92")
  ("gleam-mode" . "399cb373d4c55e97157de25807fbd0eba0ac0639")
- ("gnu-elpa-mirror" . "92b4acc2cc17f1c5a45f8161d76d013e5334bbc9")
- ("go-mode.el" . "8dce1e3ba1cdc34a856ad53c8421413cfe33660e")
- ("graphql-mode" . "49a391b5290e3354b07f7b77ded97a154c084f46")
+ ("gnu-elpa-mirror" . "5779c96cfc03274ee2f320a82eedda20373122c9")
+ ("go-mode.el" . "6f4ff9ef874d151ed8d297a80f1bf27db5d9dbf0")
+ ("graphql-mode" . "2183895ea7932359586c4bb99e8562c4aef3aaf7")
  ("groovy-emacs-modes" . "7b8520b2e2d3ab1d62b35c426e17ac25ed0120bb")
  ("haskell-mode" . "43b4036bf02b02de75643a1a2a31e28efac1c50b")
  ("hcl-mode" . "751b79247f326ab52e00032e805775c37ad9f080")
@@ -71,7 +71,7 @@
  ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b")
  ("jenkinsfile-mode" . "568865ee419e0592de0dd0717d6769a66d9df111")
  ("js2-mode" . "ca0af32eea0281322a9ce268d98f01fbb88bbb7a")
- ("json-mode" . "a93a0c76784376fbb9105719f25c7489991056a1")
+ ("json-mode" . "bfd1557aaa20b7518b808fdc869f094b52205234")
  ("json-snatcher" . "b28d1c0670636da6db508d03872d96ffddbc10f2")
  ("jsonrpc" . "bc7aeb5294d16677ae70b72f8e5e9eea2d756164")
  ("jump.el" . "55caa66a7cc6e0b1a76143fd40eff38416928941")
@@ -79,32 +79,32 @@
  ("kotlin-mode" . "fddd747e5b4736e8b27a147960f369b86179ddff")
  ("lean4-mode" . "d1c936409ade7d93e67107243cbc0aa55cda7fd5")
  ("let-alist" . "f8e2c18f51ce1d632fbf37d2b0ceceb77a19f419")
- ("lsp-dart" . "e7ee6afc2e165291360fd35d16648307920837c7")
+ ("lsp-dart" . "f51c80f5458d8ba4db9dd3781d190c6c32213250")
  ("lsp-docker" . "60e1103ac7c8e30d036ea65fad489210682d6259")
  ("lsp-haskell" . "89d16370434e9a247e95b8b701f524f5abfc884b")
- ("lsp-mode" . "02c5ba59ce3d1cede4aa689c530f16cccfb5e1d1")
+ ("lsp-mode" . "799ca89908398ccf5cdf6b120642717b288ae238")
  ("lsp-treemacs" . "e54e74deb8150964e3c3024e1ec14295a34e2a3b")
  ("lsp-ui" . "bc58c6664577d1d79060c6b32b7ad20e70ee19d0")
  ("macrostep" . "0b04a89f698c335c9ea492553470a8d45c113edd")
- ("magit" . "fc61ce236d5f8fedff9f469fdb25b4d5d49694e8")
- ("map" . "d85c08b7567eb70fabfe6275a88d782bcad35a03")
+ ("magit" . "f5ddce8c8459ffcbb2bd3ae759259d6b627c69cd")
+ ("map" . "613340b2b8770ce53b6d2c66491ce0f67a7e52be")
  ("markdown-mode" . "e096bb97a91fcd4dc2b46d8b6e093194b03b7364")
- ("melpa" . "bc2db57a308db64656ccb1b1f31106d0fd71666a")
- ("merlin" . "857f17a6fdf997ce04227b4c28b88a2edb573782")
+ ("melpa" . "c3ddb574892855f0e23283cc8bded51d857265d0")
+ ("merlin" . "0f64255167b63d8eab606419693ac2ca83d132f0")
  ("modus-themes" . "64823c7767710207cdf443492e0f712876dc4ee4")
- ("multiple-cursors.el" . "234806c832994cadedb42596fe235e91bbd59e8c")
+ ("multiple-cursors.el" . "d36c62aa7194cbd3a1e275527738a198f34939ad")
  ("nginx-mode" . "6e9d96f58eddd69f62f7fd443d9b9753e16e0e96")
- ("nongnu-elpa" . "119e5d4ac0d253b6f58749212f48b497d36a558e")
- ("otp" . "6cab4a3dc802cd1911a34ba12f535111e94ba52f")
+ ("nongnu-elpa" . "547221c2a9b7968fc1313bc9d3fcd2e467d214b5")
+ ("otp" . "a5566ca0707f50ce64bb41938580e4f5c5068cf2")
  ("paredit" . "9a2c4b37fc8c1c7bdbb1f86fdec874c0d0652e64")
  ("parseclj" . "6af22372e0fe14df882dd300b22b12ba2d7e00b0")
  ("parseedn" . "3407e4530a367b6c2b857dae261cdbb67a440aaa")
  ("pfuture" . "19b53aebbc0f2da31de6326c495038901bffb73c")
- ("php-mode" . "ac15ce017d1beb11c4f170a60563413449bf7585")
+ ("php-mode" . "a0bcafbe30494b2c5a70c2fe05f2bb0859e83645")
  ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
  ("posframe" . "017deece88360c7297265680d78a0bb316470716")
  ("powerline" . "c35c35bdf5ce2d992882c1f06f0f078058870d4a")
- ("projectile" . "f7e60843bfada2eee89595580786a4468fd3f881")
+ ("projectile" . "0163b335a18af0f077a474d4dc6b36e22b5e3274")
  ("purescript-mode" . "eacc61aaafe6055b5f278c9843558f220f18b153")
  ("queue" . "7ab8f23e770f64f6bd28a44c46c8becfc1af03d8")
  ("rainbow-delimiters" . "f40ece58df8b2f0fb6c8576b527755a552a5e763")
@@ -113,31 +113,31 @@
  ("reason-mode" . "d657ff75572a8ea7eda6fe22ada3a2ebf5bc6119")
  ("rspec-mode" . "29df3d081c6a1cbdf840cd13d45ea1c100c5bbaa")
  ("ruby-end.el" . "ba7d7230f9e3ed75c9982d32bb9fdff1dc10935d")
- ("rust-mode" . "9c26dc1195ec05309ee15c014631fb9abd6cf5d2")
+ ("rust-mode" . "8bbe70b72fde8046e12e6a41ffbee6c9f6b4ddd7")
  ("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d")
  ("seq" . "4355cde01767911660f761cf874edb412d06bd7a")
  ("sesman" . "ec7390c0d0fb8b278aa06848634f922bc893de31")
- ("slime" . "d85dd9899f7524513c8ad1bd47b0dd248b1915cb")
+ ("slime" . "1b634dd03503a782882a4d078847920fe9544393")
  ("slime-company" . "f20ecc4104d4c35052696e7e760109fb02060e72")
  ("spaceline" . "086420d16e526c79b67fc1edec4c2ae1e699f372")
  ("speed-type" . "b982ee6081a11837760eeaed73c4f413eefb07b1")
  ("spinner" . "67681b8f1580a7cd7a1aa49d78eaa30d11f7c178")
  ("straight.el" . "b3760f5829dba37e855add7323304561eb57a3d4")
- ("swiper" . "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d")
+ ("swiper" . "4546ce0ca4655512387116b02939ef42ae21fb9f")
  ("tablist" . "fcd37147121fabdf003a70279cf86fbe08cfac6f")
  ("terraform-mode" . "e8b57df8c2a3d3171f3768f60eb84067f553289c")
- ("transient" . "522b625cf39cb1a9322719dcb039f25bc49ab35b")
- ("tree-sitter-langs" . "20fbbb85735a9196ba3e7fb33f99b3a904b363ba")
- ("treemacs" . "529876dcc0d2c30667f1697c4eb7a5f137da4c3e")
+ ("transient" . "85ecbc66b68207275f81de4f9bd321474a6c8c61")
+ ("tree-sitter-langs" . "2f0bfac4b3acd6c23cda184242a96991a1e358ce")
+ ("treemacs" . "025b7ce326bec062a33d772cc6548e55f940c622")
  ("tuareg" . "1d53723e39f22ab4ab76d31f2b188a2879305092")
  ("undo-tree" . "f9e7eac16f674aa7ed8fa065401d26c0258a84f8")
  ("use-package" . "a6e856418d2ebd053b34e0ab2fda328abeba731c")
  ("visual-regexp.el" . "48457d42a5e0fe10fa3a9c15854f1f127ade09b5")
- ("web-mode" . "82847071ce93293bdb7945db08d970f13fd883cf")
- ("with-editor" . "d43db3c58c34d4dbc3ce6f68ec24fecf3452b20e")
+ ("web-mode" . "f19788e76c2359075975c20b8fda1f0b5080f042")
+ ("with-editor" . "5db5f0eb2202f52d44f529fe00654c866bb64eb1")
  ("yaml-mode" . "5b58248ab255dff6cfa4c4057a191bc4446ee5b6")
  ("yaml.el" . "70c4fcead97e9bd6594e418c922ae769818f4245")
- ("yasnippet" . "297546f0853a6a51f5b05e954d0c6aea8caa5ec2")
+ ("yasnippet" . "5b565c54b0dce77f6f0e4dd12111f43379e26d8d")
  ("yasnippet-snippets" . "441bad332344b02402add62d085b8313bdc7f618")
  ("zig-mode" . "079149a19fc869343130e69d7b944afd3a1813cc"))
 :gamma