From 0f07a5c4dcae27e82487345b8fe26ec618e7a1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20R=C3=B6ger?= Date: Sat, 20 Apr 2024 15:20:10 +0200 Subject: [PATCH] Generation 63 2024-04-20 15:20:09 (current) --- home/jonas/doom.nix | 27 ++++++++++++++------------- home/jonas/static/doom-config/init.el | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/home/jonas/doom.nix b/home/jonas/doom.nix index da652e9..fdd667c 100644 --- a/home/jonas/doom.nix +++ b/home/jonas/doom.nix @@ -4,21 +4,21 @@ lib, ... }: let + doom-path-pkgs = with pkgs; [ + (ripgrep.override {withPCRE2 = true;}) + binutils + editorconfig-core-c + emacs-all-the-icons-fonts + fd + gnutls + imagemagick + mlocate + zstd + ]; wrapped-emacs = let emacs-pkg = with pkgs; (emacsPackagesFor emacs29).emacsWithPackages (epkgs: [epkgs.vterm epkgs.treesit-grammars.with-all-grammars]); - path-pkgs = with pkgs; [ - (ripgrep.override {withPCRE2 = true;}) - binutils - editorconfig-core-c - emacs-all-the-icons-fonts - fd - gnutls - imagemagick - mlocate - zstd - ]; in pkgs.symlinkJoin { name = "wrapped-emacs"; @@ -26,12 +26,13 @@ nativeBuildInputs = [pkgs.makeBinaryWrapper]; postBuild = '' wrapProgram $out/bin/emacs \ - --prefix PATH : ${lib.makeBinPath path-pkgs} + --prefix PATH : ${lib.makeBinPath doom-path-pkgs} wrapProgram $out/bin/emacsclient \ - --prefix PATH : ${lib.makeBinPath path-pkgs} + --prefix PATH : ${lib.makeBinPath doom-path-pkgs} ''; }; doom-setup = pkgs.writeShellScript "doom-setup" '' + export PATH="${lib.makeBinPath doom-path-pkgs}" export EMACS="${wrapped-emacs}/bin/emacs" export DOOMDIR="${config.home.sessionVariables.DOOMDIR}" export DOOMLOCALDIR="${config.home.sessionVariables.DOOMLOCALDIR}" diff --git a/home/jonas/static/doom-config/init.el b/home/jonas/static/doom-config/init.el index 10d9b66..c2550a7 100644 --- a/home/jonas/static/doom-config/init.el +++ b/home/jonas/static/doom-config/init.el @@ -146,7 +146,7 @@ ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB ;;kotlin ; a better, slicker Java(Script) - ;;latex ; writing papers in Emacs has never been so fun + latex ; writing papers in Emacs has never been so fun ;;lean ; for folks with too much to prove ;;ledger ; be audit you can be ;;lua ; one-based indices? one-based indices