diff --git a/home-manager/modules/emacs/config.org b/home-manager/modules/emacs/config.org index a694643..6e20e89 100644 --- a/home-manager/modules/emacs/config.org +++ b/home-manager/modules/emacs/config.org @@ -1734,14 +1734,12 @@ Register =nushell= LSP with eglot '(nushell-ts-mode . ("nu" "--lsp")))) #+end_src -*** hare +*** Lua -[[https://git.sr.ht/~bbuccianti/hare-mode][hare-mode]] for [[https://harelang.org][hare]] support. +[[https://github.com/immerr/lua-mode][lua-mode]] for Lua support. #+begin_src emacs-lisp - (use-package hare-mode - :ensure nil ;; It's installed outside emacs - ) + (use-package lua-mode) #+end_src * Org diff --git a/home-manager/modules/emacs/default.nix b/home-manager/modules/emacs/default.nix index 0a2d2b1..5ff6b49 100644 --- a/home-manager/modules/emacs/default.nix +++ b/home-manager/modules/emacs/default.nix @@ -16,28 +16,6 @@ let cp ${initFile} $out ''; - tree-sitter-hare = pkgs.tree-sitter.buildGrammar { - language = "tree-sitter-hare"; - version = "unstable-2023-12-31"; - src = pkgs.fetchFromSourcehut { - owner = "~ecs"; - repo = "tree-sitter-hare"; - rev = "9408bb8fd6c110307f7c92fa834eb5dbd92e36d8"; - sha256 = "iqaj+7Ax5zfXGXsJw5pesTlTeah2X4Li4LpInDSUTcU="; - }; - }; - - hare-mode = pkgs.emacsPackages.trivialBuild { - pname = "hare-mode"; - version = "unstable-2022-04-27"; - src = pkgs.fetchFromSourcehut { - owner = "~bbuccianti"; - repo = "hare-mode"; - rev = "bb7b2faccb5939b0c8d4ffa6a6e28a0d2bc93dd6"; - sha256 = "SOnsNDWKL077AgTdpd9zZPhiyv8d/snllzTy53qlco8="; - }; - }; - tree-sitter-qml = pkgs.tree-sitter.buildGrammar { language = "tree-sitter-qmljs"; version = "unstable-2024-02-02"; @@ -62,7 +40,6 @@ let alwaysTangle = true; extraEmacsPackages = epkgs: with epkgs; [ - hare-mode vterm (treesit-grammars.with-grammars ( p: with p; [ @@ -90,7 +67,6 @@ let tree-sitter-gomod tree-sitter-gowork tree-sitter-graphql - tree-sitter-hare tree-sitter-haskell tree-sitter-hcl tree-sitter-heex