diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix index 55b5f0ee..6caf798e 100644 --- a/dotfiles/config/taffybar/flake.nix +++ b/dotfiles/config/taffybar/flake.nix @@ -71,6 +71,7 @@ gtk-strut, gtk-sni-tray, dbus-hslogger, + ... }: flake-utils.lib.eachDefaultSystem (system: let diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index 0dc7523c..920e5434 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -689,7 +689,7 @@ endWidgetsForHost hostName = ] laptopEndWidgets = [ batteryNetworkWidget, - wakeupDebugWidget, + sniTrayWidget, asusDiskUsageWidget, audioBacklightWidget, ramSwapWidget, diff --git a/nixos/flake.lock b/nixos/flake.lock index a1d3cbc5..e818df14 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -209,9 +209,18 @@ }, "dbus-menu": { "inputs": { - "flake-utils": "flake-utils_2", - "git-ignore-nix": "git-ignore-nix_2", - "nixpkgs": "nixpkgs_3" + "flake-utils": [ + "imalison-taffybar", + "flake-utils" + ], + "git-ignore-nix": [ + "imalison-taffybar", + "git-ignore-nix" + ], + "nixpkgs": [ + "imalison-taffybar", + "nixpkgs" + ] }, "locked": { "lastModified": 1770957161, @@ -472,24 +481,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "git-hooks-nix": { "inputs": { "flake-compat": [ @@ -545,7 +536,6 @@ "inputs": { "nixpkgs": [ "imalison-taffybar", - "dbus-menu", "nixpkgs" ] }, @@ -564,50 +554,6 @@ } }, "git-ignore-nix_3": { - "inputs": { - "nixpkgs": [ - "imalison-taffybar", - "gtk-sni-tray", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_4": { - "inputs": { - "nixpkgs": [ - "imalison-taffybar", - "gtk-strut", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_5": { "inputs": { "nixpkgs": [ "kanshi-sni", @@ -705,7 +651,10 @@ "imalison-taffybar", "flake-utils" ], - "git-ignore-nix": "git-ignore-nix_3", + "git-ignore-nix": [ + "imalison-taffybar", + "git-ignore-nix" + ], "gtk-strut": [ "imalison-taffybar", "gtk-strut" @@ -756,7 +705,10 @@ "imalison-taffybar", "flake-utils" ], - "git-ignore-nix": "git-ignore-nix_4", + "git-ignore-nix": [ + "imalison-taffybar", + "git-ignore-nix" + ], "nixpkgs": [ "imalison-taffybar", "nixpkgs" @@ -818,7 +770,7 @@ "hercules-ci-effects_2": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1701009247, @@ -1257,6 +1209,7 @@ "flake-utils": [ "flake-utils" ], + "git-ignore-nix": "git-ignore-nix_2", "gtk-sni-tray": "gtk-sni-tray", "gtk-strut": "gtk-strut", "nixpkgs": [ @@ -1288,7 +1241,7 @@ "flake-utils": [ "flake-utils" ], - "git-ignore-nix": "git-ignore-nix_5", + "git-ignore-nix": "git-ignore-nix_3", "nixpkgs": [ "nixpkgs" ] @@ -1352,7 +1305,7 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression" }, @@ -1527,22 +1480,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1771043024, "narHash": "sha256-WoiezqWJQ3OHILah+p6rzNXdJceEAmAhyDFZFZ6pZzY=", @@ -1555,7 +1492,7 @@ "url": "https://channels.nixos.org/nixos-25.11/nixexprs.tar.xz" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1771369470, "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", @@ -1571,7 +1508,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1697723726, "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", @@ -1587,7 +1524,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1703255338, "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", @@ -1607,7 +1544,7 @@ "inputs": { "flake-parts": "flake-parts_4", "hercules-ci-effects": "hercules-ci-effects_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "osx-kvm": "osx-kvm" }, "locked": { @@ -1858,12 +1795,12 @@ "nixified-ai": "nixified-ai", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixtheplanet": "nixtheplanet", "notifications-tray-icon": "notifications-tray-icon", "org-agenda-api": "org-agenda-api", "railbird-secrets": "railbird-secrets", - "systems": "systems_3", + "systems": "systems_2", "taffybar": "taffybar", "vscode-server": "vscode-server", "xmonad": "xmonad", @@ -1953,21 +1890,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "taffybar": { "inputs": { "dbus-hslogger": "dbus-hslogger_2",