Merge remote-tracking branch 'origin/main'

This commit is contained in:
Jonas Röger 2025-03-05 14:50:39 +01:00
commit ffe2c03263
Signed by: jonas
GPG Key ID: 4000EB35E1AE0F07
2 changed files with 5 additions and 3 deletions

View File

@ -12,6 +12,8 @@
home.username = "jroeger"; home.username = "jroeger";
home.homeDirectory = "/home/jroeger"; home.homeDirectory = "/home/jroeger";
yubikey.pinentry = "gnome3";
# This value determines the Home Manager release that your configuration is # This value determines the Home Manager release that your configuration is
# compatible with. This helps avoid breakage when a new Home Manager release # compatible with. This helps avoid breakage when a new Home Manager release
# introduces backwards incompatible changes. # introduces backwards incompatible changes.

View File

@ -12,6 +12,7 @@
doom-path-pkgs = with pkgs; [ doom-path-pkgs = with pkgs; [
(ripgrep.override {withPCRE2 = true;}) (ripgrep.override {withPCRE2 = true;})
alejandra alejandra
aspell
binutils binutils
ccls ccls
clang-tools clang-tools
@ -55,14 +56,13 @@
--add-flags "--init-directory=${config.xdg.configHome}/doom-emacs" \ --add-flags "--init-directory=${config.xdg.configHome}/doom-emacs" \
--set DOOMDIR "${config.home.sessionVariables.DOOMDIR}" \ --set DOOMDIR "${config.home.sessionVariables.DOOMDIR}" \
--set DOOMLOCALDIR "${config.home.sessionVariables.DOOMLOCALDIR}" \ --set DOOMLOCALDIR "${config.home.sessionVariables.DOOMLOCALDIR}" \
--suffix LD_LIBRARY_PATH : "${pkgs.stdenv.cc.cc.lib}/lib" --prefix LD_LIBRARY_PATH : "${pkgs.stdenv.cc.cc.lib}/lib"
wrapProgram $out/bin/emacsclient \ wrapProgram $out/bin/emacsclient \
--prefix PATH : ${lib.makeBinPath doom-path-pkgs} \ --prefix PATH : ${lib.makeBinPath doom-path-pkgs} \
--set DOOMDIR "${config.home.sessionVariables.DOOMDIR}" \ --set DOOMDIR "${config.home.sessionVariables.DOOMDIR}" \
--set DOOMLOCALDIR "${config.home.sessionVariables.DOOMLOCALDIR}" \ --set DOOMLOCALDIR "${config.home.sessionVariables.DOOMLOCALDIR}" \
--suffix LD_LIBRARY_PATH : "${pkgs.stdenv.cc.cc.lib}/lib" \ --prefix LD_LIBRARY_PATH : "${pkgs.stdenv.cc.cc.lib}/lib"
--add-flags "--socket-name=${doom-socket-name}"
''; '';
}; };
doom-setup = pkgs.writeShellScript "doom-setup" '' doom-setup = pkgs.writeShellScript "doom-setup" ''