Generation 71 2024-04-20 20:29:39 (current)

This commit is contained in:
Jonas Röger 2024-04-20 20:29:40 +02:00
parent 75af910611
commit ed2f3ea330

View File

@ -7,6 +7,7 @@
doom-path-pkgs = with pkgs; [ doom-path-pkgs = with pkgs; [
(ripgrep.override {withPCRE2 = true;}) (ripgrep.override {withPCRE2 = true;})
binutils binutils
cmake
editorconfig-core-c editorconfig-core-c
emacs-all-the-icons-fonts emacs-all-the-icons-fonts
fd fd
@ -22,10 +23,9 @@
(emacsPackagesFor emacs29).emacsWithPackages (emacsPackagesFor emacs29).emacsWithPackages
(epkgs: [epkgs.vterm epkgs.treesit-grammars.with-all-grammars]); (epkgs: [epkgs.vterm epkgs.treesit-grammars.with-all-grammars]);
in in
emacs-pkg pkgs.symlinkJoin {
// (pkgs.symlinkJoin {
name = "wrapped-emacs"; name = "wrapped-emacs";
paths = [emacs-pkg]; paths = [pkgs.emacs29];
nativeBuildInputs = [pkgs.makeBinaryWrapper]; nativeBuildInputs = [pkgs.makeBinaryWrapper];
postBuild = '' postBuild = ''
wrapProgram $out/bin/emacs \ wrapProgram $out/bin/emacs \
@ -34,7 +34,7 @@
wrapProgram $out/bin/emacsclient \ wrapProgram $out/bin/emacsclient \
--prefix PATH : ${lib.makeBinPath doom-path-pkgs} --prefix PATH : ${lib.makeBinPath doom-path-pkgs}
''; '';
}); };
doom-setup = pkgs.writeShellScript "doom-setup" '' doom-setup = pkgs.writeShellScript "doom-setup" ''
export PATH="$PATH:${lib.makeBinPath doom-path-pkgs}" export PATH="$PATH:${lib.makeBinPath doom-path-pkgs}"
export EMACS="${wrapped-emacs}/bin/emacs" export EMACS="${wrapped-emacs}/bin/emacs"