Skip to content

Commit

Permalink
general: use colmena direct flake eval for potentially faster evaluation
Browse files Browse the repository at this point in the history
  • Loading branch information
xddxdd committed Jan 2, 2025
1 parent 017ba16 commit 20aa907
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
1 change: 1 addition & 0 deletions flake-modules/commands/colmena.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
ACTION=$1; shift;
if [ "$ACTION" = "apply" ] || [ "$ACTION" = "build" ]; then
${pkgs.colmena}/bin/colmena $ACTION \
--experimental-flake-eval \
--eval-node-limit 5 \
--parallel 0 \
--keep-result \
Expand Down
7 changes: 4 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
flake = false;
};
colmena = {
url = "github:zhaofengli/colmena";
url = "github:zhaofengli/colmena/direct-flake-eval";
inputs.flake-compat.follows = "flake-compat";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
Expand Down Expand Up @@ -160,7 +160,14 @@

nixpkgs-options =
let
permittedInsecurePackages = [ ];
permittedInsecurePackages = [
"aspnetcore-runtime-6.0.36"
"aspnetcore-runtime-wrapped-6.0.36"
"dotnet-sdk-6.0.428"
"dotnet-sdk-wrapped-6.0.428"
"fluffychat-linux-1.22.1"
"olm-3.2.16"
];
overlays =
let
rpi_dt_ao_overlay = _final: prev: {
Expand Down Expand Up @@ -224,6 +231,8 @@
};
}).config._dnsconfig_js;
};

pre-commit.settings.hooks.flake-checker.enable = lib.mkForce false;
};
};
}
4 changes: 2 additions & 2 deletions home/client-apps/fonts.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ osConfig, ... }:
{ osConfig, config, ... }:
{
# To make Steam recognize Chinese fonts
fonts.fontconfig.defaultFonts = osConfig.fonts.fontconfig.defaultFonts;
xdg.dataFile."fonts".source = "/run/current-system/sw/share/X11/fonts";
xdg.dataFile."fonts".source = config.lib.file.mkOutOfStoreSymlink "/run/current-system/sw/share/X11/fonts";
}

0 comments on commit 20aa907

Please sign in to comment.