Generation 58 2024-04-20 14:16:45 (current)

home/jonas/doom.nix

@@ -5,24 +5,24 @@
   ...
 }: let
   wrapped-emacs = let
-    emacs-pkgs = with pkgs;
+    emacs-pkg = with pkgs;
       (emacsPackagesFor emacs29).emacsWithPackages
       (epkgs: [epkgs.vterm epkgs.treesit-grammars.with-all-grammars]);
     path-pkgs = with pkgs; [
-      binutils
       (ripgrep.override {withPCRE2 = true;})
-      gnutls
+      binutils
-      fd
-      imagemagick
-      zstd
       editorconfig-core-c
       emacs-all-the-icons-fonts
+      fd
+      gnutls
+      imagemagick
+      mlocate
+      zstd
     ];
   in
-    emacs-pkgs
+    pkgs.symlinkJoin {
-    // (pkgs.symlinkJoin {
       name = "wrapped-emacs";
-      paths = [emacs-pkgs];
+      paths = [emacs-pkg];
       nativeBuildInputs = [pkgs.makeBinaryWrapper];
       postBuild = ''
         wrapProgram $out/bin/emacs \
@@ -30,7 +30,7 @@
         wrapProgram $out/bin/emacsclient \
           --prefix PATH : ${lib.makeBinPath path-pkgs}
       '';
-    });
+    };
   doom-setup = pkgs.writeShellScript "doom-setup" ''
     export DOOMDIR="${config.home.sessionVariables.DOOMDIR}"
     export DOOMLOCALDIR="${config.home.sessionVariables.DOOMLOCALDIR}"
@@ -43,7 +43,7 @@
 in {
   programs.emacs = {
     enable = true;
-    #package = wrapped-emacs;
+    package = wrapped-emacs;
   };
 
   home = {