From 328618bfec5210a63051a7a424cece35d0bd3f38 Mon Sep 17 00:00:00 2001 From: LorenzBischof <1837725+LorenzBischof@users.noreply.github.com> Date: Tue, 2 Sep 2025 08:51:48 +0200 Subject: [PATCH] nixos-branding-guide: use exec in devshell --- dev-shells/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dev-shells/default.nix b/dev-shells/default.nix index 68cb279..d44ccb9 100644 --- a/dev-shells/default.nix +++ b/dev-shells/default.nix @@ -46,14 +46,13 @@ mapAttrs (system: pkgs: { ]; - shellHook = - '' - export NIXOSLOGO_SRC=$(git rev-parse --show-toplevel)/package-sets/python-packages/nixoslogo - export NIXOS_ANNOTATIONS_FONT_FILE="${jura}/share/fonts/truetype/jura/Jura-Regular.ttf" - export NIXOS_COLOR_PALETTE_FILE="${nixos-branding.nixos-color-palette}/colors.toml"; - export NIXOS_LOGOTYPE_FONT_FILE="${route159}/share/fonts/opentype/route159/Route159-Regular.otf" - '' - + checks.${system}.pre-commit-check.shellHook; + shellHook = '' + export NIXOSLOGO_SRC=$(git rev-parse --show-toplevel)/package-sets/python-packages/nixoslogo + export NIXOS_ANNOTATIONS_FONT_FILE="${jura}/share/fonts/truetype/jura/Jura-Regular.ttf" + export NIXOS_COLOR_PALETTE_FILE="${nixos-branding.nixos-color-palette}/colors.toml"; + export NIXOS_LOGOTYPE_FONT_FILE="${route159}/share/fonts/opentype/route159/Route159-Regular.otf" + '' + + checks.${system}.pre-commit-check.shellHook; } ) { }; @@ -67,7 +66,7 @@ mapAttrs (system: pkgs: { shellHook = '' cd $(git rev-parse --show-toplevel)/package-sets/top-level/nixos-branding/nixos-branding-guide - ${nixos-branding-guide-editable}/bin/typst-watch + exec ${nixos-branding-guide-editable}/bin/typst-watch ''; }