revert emacs-overlay to last where ox-hugo worked.

1 files changed, 18 insertions, 18 deletions

diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index bbf1ba2..37b8951 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -1,19 +1,20 @@
 { pkgs, inputs, lib, config,  ...}:
 let
   outside-emacs = with pkgs; [
+    git
     nil
     ripgrep
     emacs-lsp-booster
     delta
   ];
-  org-tangle-elisp-blocks = (pkgs.callPackage ./org.nix {inherit pkgs; inherit (inputs) from-elisp;}).org-tangle ({ language, flags } : let
-    is-elisp = (language == "emacs-lisp") || (language == "elisp");
-    is-tangle = if flags ? ":tangle" then
-      flags.":tangle" == "yes" || flags.":tangle" == "y" else false;
-  in
-    is-elisp && is-tangle
-  );
-  config-el = pkgs.writeText "config.el" (org-tangle-elisp-blocks (builtins.readFile ./README.org));
+  # org-tangle-elisp-blocks = (pkgs.callPackage ./org.nix { inherit (inputs) from-elisp; }).org-tangle ({ language, flags } : let
+  #   is-elisp = (language == "emacs-lisp") || (language == "elisp");
+  #   is-tangle = if flags ? ":tangle" then
+  #     flags.":tangle" == "yes" || flags.":tangle" == "y" else false;
+  # in
+  #   is-elisp && is-tangle
+  # );
+  # config-el = pkgs.writeText "config.el" (org-tangle-elisp-blocks (builtins.readFile ./README.org));
   emacs = pkgs.emacsWithPackagesFromUsePackage {
     package = pkgs.emacs.override {
       withGTK3 = true;
@@ -23,21 +24,20 @@ let
       withToolkitScrollBars = true;
       withImageMagick = true;
     };
-    override = epkgs: epkgs // {
-      eglot-booster = pkgs.callPackage ./eglot-booster.nix {
-        inherit (pkgs) fetchFromGitHub;
-        inherit (epkgs) trivialBuild;
-      };
+    override = epkgs: let
+      callPackage = pkgs.lib.callPackageWith (pkgs // epkgs);
+    in epkgs // {
+      eglot-booster = callPackage ./eglot-booster.nix {};
     };
-    config = config-el; 
-    alwaysEnsure = true;
+    config = ./README.org;
+    alwaysTangle = true;
     defaultInitFile = true;
-    extraEmacsPackages = epkgs: with epkgs; [
-      (treesit-grammars.with-grammars (g: with g; [
+    extraEmacsPackages = epkgs: [
+      (epkgs.treesit-grammars.with-grammars (g: with g; [
         tree-sitter-rust
         tree-sitter-python
       ]))
-    ] ++ outside-emacs;
+    ];
   };
 in with lib; {
   options.santi-modules.emacs.enable = mkEnableOption "Enable emacs configuration";