colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(taffybar): make live checkout opt-in

Browse Source
This commit is contained in:
Ivan Malison
2026-03-30 12:36:22 -07:00
committed by Kat Huang
parent 13f446e685
commit a4e3a50db0
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dotfiles/config/taffybar/flake.nix
View File

@@ -46,17 +46,20 @@
config.allowBroken = true; config.allowBroken = true;
}; };
# Exclude local worktree/build artifacts from the source we feed to # Default to the flake input so normal NixOS rebuilds stay pinned and
# callCabal2nix. cleanSource alone still includes .worktrees/. # reproducible. switch-local-taffybar opts into the live checkout via
# Use the live local checkout directly so Nix picks up dirty nested-repo # IMALISON_TAFFYBAR_LIVE_CHECKOUT when iterating on the vendored stack.
# changes while iterating on the vendored taffybar stack. liveTaffybarCheckout = builtins.getEnv "IMALISON_TAFFYBAR_LIVE_CHECKOUT";
localTaffybarCheckout = /home/imalison/dotfiles/dotfiles/config/taffybar/taffybar; taffybarSourceRoot =
if liveTaffybarCheckout != ""
then /. + liveTaffybarCheckout
else taffybar.outPath;
cleanedTaffybarSource = pkgs.lib.cleanSourceWith { cleanedTaffybarSource = pkgs.lib.cleanSourceWith {
src = localTaffybarCheckout; src = taffybarSourceRoot;
filter = path: type: filter = path: type:
let let
relPath = pkgs.lib.removePrefix "${toString localTaffybarCheckout}/" (toString path); relPath = pkgs.lib.removePrefix "${toString taffybarSourceRoot}/" (toString path);
excludedTopLevel = [ ".worktrees" ".direnv" "dist" "dist-newstyle" "result" ]; excludedTopLevel = [ ".worktrees" ".direnv" "dist" "dist-newstyle" "result" ];
isExcluded = pkgs.lib.lists.any isExcluded = pkgs.lib.lists.any
(prefix: relPath == prefix || pkgs.lib.hasPrefix "${prefix}/" relPath) (prefix: relPath == prefix || pkgs.lib.hasPrefix "${prefix}/" relPath)

3
nixos/justfile
View File

@@ -17,7 +17,8 @@ switch-local-taffybar *args:
systemctl status nixos-rebuild-switch-to-configuration.service --no-pager >&2 || true; \ systemctl status nixos-rebuild-switch-to-configuration.service --no-pager >&2 || true; \
while systemctl is-active --quiet nixos-rebuild-switch-to-configuration.service; do sleep 1; done; \ while systemctl is-active --quiet nixos-rebuild-switch-to-configuration.service; do sleep 1; done; \
fi' fi'
sudo nixos-rebuild switch --flake "git+https://github.com/colonelpanic8/dotfiles.git?ref=master&dir=nixos#" --impure --option warn-dirty false \ sudo env IMALISON_TAFFYBAR_LIVE_CHECKOUT=/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar \
nixos-rebuild switch --flake "git+https://github.com/colonelpanic8/dotfiles.git?ref=master&dir=nixos#" --impure --option warn-dirty false \
--override-input taffybar git+file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar \ --override-input taffybar git+file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar \
{{args}} {{args}}