diff --git a/home/jonas/doom.nix b/home/jonas/doom.nix index c568b9c..369c847 100644 --- a/home/jonas/doom.nix +++ b/home/jonas/doom.nix @@ -7,6 +7,7 @@ doom-path-pkgs = with pkgs; [ (ripgrep.override {withPCRE2 = true;}) binutils + cmake editorconfig-core-c emacs-all-the-icons-fonts fd @@ -22,10 +23,9 @@ (emacsPackagesFor emacs29).emacsWithPackages (epkgs: [epkgs.vterm epkgs.treesit-grammars.with-all-grammars]); in - emacs-pkg - // (pkgs.symlinkJoin { + pkgs.symlinkJoin { name = "wrapped-emacs"; - paths = [emacs-pkg]; + paths = [pkgs.emacs29]; nativeBuildInputs = [pkgs.makeBinaryWrapper]; postBuild = '' wrapProgram $out/bin/emacs \ @@ -34,7 +34,7 @@ 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"