diff --git a/dotfiles/config/taffybar/flake.lock b/dotfiles/config/taffybar/flake.lock index 013cc3f8..0e0ca3d9 100644 --- a/dotfiles/config/taffybar/flake.lock +++ b/dotfiles/config/taffybar/flake.lock @@ -138,15 +138,15 @@ "locked": { "lastModified": 1777525523, "narHash": "sha256-/LGaCcX6BgXRYpWnRp9CNgAgy7lmbQsubi4RwHJgnTI=", - "ref": "refs/heads/master", + "owner": "taffybar", + "repo": "taffybar", "rev": "23dbc827adca706b28df7404624ae3f5e800b04f", - "revCount": 2296, - "type": "git", - "url": "file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar" + "type": "github" }, "original": { - "type": "git", - "url": "file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar" + "owner": "taffybar", + "repo": "taffybar", + "type": "github" } }, "weeder-nix": { diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix index 1790a28b..6c997f53 100644 --- a/dotfiles/config/taffybar/flake.nix +++ b/dotfiles/config/taffybar/flake.nix @@ -1,10 +1,9 @@ { inputs = { taffybar = { - # Use the local git checkout, not a raw path snapshot, so gitignored - # build artifacts like dist-newstyle/.worktrees/.direnv don't get copied - # into flake-input store sources. - url = "git+file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar"; + # Keep the default source usable in CI. Local iteration uses + # IMALISON_TAFFYBAR_LIVE_CHECKOUT below via `just switch-local-taffybar`. + url = "github:taffybar/taffybar"; inputs.weeder-nix.inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; }; # Follow the vendored taffybar flake's pins so the config shell and the diff --git a/nixos/justfile b/nixos/justfile index adc72fa3..561c3838 100644 --- a/nixos/justfile +++ b/nixos/justfile @@ -19,7 +19,7 @@ switch-local-taffybar *args: fi' 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 imalison-taffybar path:/home/imalison/dotfiles/dotfiles/config/taffybar \ {{args}} remote-switch host *args: @@ -27,4 +27,4 @@ remote-switch host *args: fix-local-path-issue: # Kept for backwards-compat: update the lockfile inputs explicitly. - nix flake update taffybar imalison-taffybar + nix flake update imalison-taffybar