diff --git a/home/jonas/doom.nix b/home/jonas/doom.nix index 1f4acd6..c2cab87 100644 --- a/home/jonas/doom.nix +++ b/home/jonas/doom.nix @@ -19,23 +19,18 @@ mlocate zstd ]; - wrapped-emacs = let - emacs-pkg = with pkgs; - (emacsPackagesFor emacs29).emacsWithPackages - (epkgs: [epkgs.vterm epkgs.treesit-grammars.with-all-grammars]); - in - pkgs.symlinkJoin { - name = "wrapped-emacs"; - paths = [pkgs.emacs29]; - nativeBuildInputs = [pkgs.makeBinaryWrapper]; - postBuild = '' - wrapProgram $out/bin/emacs \ - --prefix PATH : ${lib.makeBinPath doom-path-pkgs} \ - --add-flags "--init-directory=${config.xdg.configHome}/doom-emacs" - wrapProgram $out/bin/emacsclient \ - --prefix PATH : ${lib.makeBinPath doom-path-pkgs} - ''; - }; + wrapped-emacs = pkgs.symlinkJoin { + name = "wrapped-emacs"; + paths = [pkgs.emacs29]; + nativeBuildInputs = [pkgs.makeBinaryWrapper]; + postBuild = '' + wrapProgram $out/bin/emacs \ + --prefix PATH : ${lib.makeBinPath doom-path-pkgs} \ + --add-flags "--init-directory=${config.xdg.configHome}/doom-emacs" + wrapProgram $out/bin/emacsclient \ + --prefix PATH : ${lib.makeBinPath doom-path-pkgs} + ''; + }; doom-setup = pkgs.writeShellScript "doom-setup" '' export PATH="$PATH:${lib.makeBinPath doom-path-pkgs}" export EMACS="${wrapped-emacs}/bin/emacs"