From 7e07e768da91819c9a4984d7d31f4fcaea51bed2 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 3 Jun 2026 16:18:13 -0700 Subject: [PATCH] Propagate taffybar Wayland monitor fix --- dotfiles/config/taffybar/flake.lock | 6 +++--- dotfiles/config/taffybar/taffybar | 2 +- nixos/flake.lock | 6 +++--- nixos/justfile | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dotfiles/config/taffybar/flake.lock b/dotfiles/config/taffybar/flake.lock index 7a13f1ae..c0b77cd8 100644 --- a/dotfiles/config/taffybar/flake.lock +++ b/dotfiles/config/taffybar/flake.lock @@ -136,11 +136,11 @@ "xmonad-contrib": "xmonad-contrib" }, "locked": { - "lastModified": 1780296593, - "narHash": "sha256-+ftQu8ySHFUyxvLso3miLPl8N0Hl3V6Iq7TorkP8s+8=", + "lastModified": 1780528245, + "narHash": "sha256-1whI87DIe3+KdQkQSl3IwpqXiVn3BEVEG2EtgkmNlN0=", "owner": "taffybar", "repo": "taffybar", - "rev": "2f27e31cd69c403a031e99dc7fd056b183779800", + "rev": "31578b0770b061c9a63109739776b7291de1ae9b", "type": "github" }, "original": { diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index 2f27e31c..31578b07 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit 2f27e31cd69c403a031e99dc7fd056b183779800 +Subproject commit 31578b0770b061c9a63109739776b7291de1ae9b diff --git a/nixos/flake.lock b/nixos/flake.lock index 8a73a562..9096b71b 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -2100,11 +2100,11 @@ "xmonad-contrib": "xmonad-contrib" }, "locked": { - "lastModified": 1780296593, - "narHash": "sha256-+ftQu8ySHFUyxvLso3miLPl8N0Hl3V6Iq7TorkP8s+8=", + "lastModified": 1780528245, + "narHash": "sha256-1whI87DIe3+KdQkQSl3IwpqXiVn3BEVEG2EtgkmNlN0=", "owner": "taffybar", "repo": "taffybar", - "rev": "2f27e31cd69c403a031e99dc7fd056b183779800", + "rev": "31578b0770b061c9a63109739776b7291de1ae9b", "type": "github" }, "original": { diff --git a/nixos/justfile b/nixos/justfile index 0fbe6c80..4425162b 100644 --- a/nixos/justfile +++ b/nixos/justfile @@ -3,7 +3,7 @@ switch-trusted-public-keys := "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZP switch *args: case "$(/run/current-system/sw/bin/systemctl show -P ActiveState nixos-upgrade.service 2>/dev/null)" in active|activating|reloading) /run/wrappers/bin/sudo /run/current-system/sw/bin/systemctl stop nixos-upgrade.service;; esac - dotfiles_worktree="$(/run/current-system/sw/bin/readlink -f "$PWD/..")"; /run/wrappers/bin/sudo env DOTFILES_WORKTREE="$dotfiles_worktree" PATH=/run/current-system/sw/bin:/nix/var/nix/profiles/system/sw/bin:/etc/profiles/per-user/root/bin:/usr/bin:/bin /run/current-system/sw/bin/nixos-rebuild switch --flake ".#" --impure --option substituters '{{switch-substituters}}' --option trusted-public-keys '{{switch-trusted-public-keys}}' {{args}} + dotfiles_worktree="$(/run/current-system/sw/bin/readlink -f "$PWD/..")"; /run/wrappers/bin/sudo env DOTFILES_WORKTREE="$dotfiles_worktree" IMALISON_TAFFYBAR_LIVE_CHECKOUT="${IMALISON_TAFFYBAR_LIVE_CHECKOUT:-}" PATH=/run/current-system/sw/bin:/nix/var/nix/profiles/system/sw/bin:/etc/profiles/per-user/root/bin:/usr/bin:/bin /run/current-system/sw/bin/nixos-rebuild switch --flake ".#" --impure --option substituters '{{switch-substituters}}' --option trusted-public-keys '{{switch-trusted-public-keys}}' {{args}} populate-cachix cache="colonelpanic8-dotfiles" host=`hostname` *args: store_path="$(nix build --no-link --print-out-paths ".#nixosConfigurations.{{host}}.config.system.build.toplevel" --impure --option warn-dirty false {{args}})" && cachix push {{cache}} "$store_path"