update to 25.05

This commit is contained in:
2025-06-07 01:03:14 +02:00
parent 371b1b1432
commit 18012450c0
12 changed files with 136 additions and 121 deletions
@@ -17,14 +17,17 @@ let
pkgs.wqy_zenhei
pkgs.corefonts
pkgs.hack-font
(pkgs.nerdfonts.override { fonts = [ "Hack" ]; })
pkgs.nerd-fonts.hack
] ++ defaultFonts;
moreFonts = [
pkgs.ubuntu_font_family
pkgs.monocraft
(pkgs.nerdfonts.override { fonts = [ "DroidSansMono" "Meslo" "ProFont" "FiraCode"]; })
pkgs.nerd-fonts.droid-sans-mono
pkgs.nerd-fonts.meslo-lg
pkgs.nerd-fonts.profont
pkgs.nerd-fonts.fira-code
];
in
{
@@ -3,9 +3,10 @@
lib,
pkgs,
materusArg,
materusCfg,
...
}: let
emacs-pkg = pkgs.emacs;
emacs-pkg = materusCfg.configInputs.emacs-overlay.packages.x86_64-linux.emacs-git;
materus-nix = e:
e.trivialBuild {
@@ -188,8 +189,12 @@
ripgrep
cmake
gnumake
nixfmt-rfc-style
python3Full
nixfmt-rfc-style
(python3.withPackages (python-pkgs: with python-pkgs; [
matplotlib
pandas
requests
]))
multimarkdown
git
emacs-lsp-booster
@@ -31,9 +31,7 @@ in
'';
home.packages = [
(lib.mkIf cfg.enableHackFont (pkgs.nerdfonts.override {
fonts = [ "Hack" ];
}))
(lib.mkIf cfg.enableHackFont (pkgs.nerd-fonts.hack))
(lib.mkIf cfg.enableWezcraft (pkgs.monocraft))
(lib.mkIf cfg.enableWezcraft (pkgs.writeShellScriptBin "wezcraft" ''
${lib.getExe config.programs.wezterm.package} --config font="wezterm.font 'Monocraft Nerd Font'" $@