From c7c4ff9df3700936293d892538b43412c3588c28 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 30 Mar 2026 01:58:27 -0700 Subject: [PATCH] Drop redundant vendored taffybar flake inputs --- dotfiles/config/taffybar/flake.lock | 134 ---------------------------- dotfiles/config/taffybar/flake.nix | 37 -------- dotfiles/config/taffybar/taffybar | 2 +- 3 files changed, 1 insertion(+), 172 deletions(-) diff --git a/dotfiles/config/taffybar/flake.lock b/dotfiles/config/taffybar/flake.lock index a8299457..5aac6c2c 100644 --- a/dotfiles/config/taffybar/flake.lock +++ b/dotfiles/config/taffybar/flake.lock @@ -1,47 +1,5 @@ { "nodes": { - "dbus-hslogger": { - "flake": false, - "locked": { - "lastModified": 1770613712, - "narHash": "sha256-Az7USYfzylaIduPoOzxaz+6Evpn+TvVcThbPpWORt8k=", - "owner": "IvanMalison", - "repo": "dbus-hslogger", - "rev": "56195c6e46e04e2454fa0fa643e06eb7ef2a0952", - "type": "github" - }, - "original": { - "owner": "IvanMalison", - "repo": "dbus-hslogger", - "type": "github" - } - }, - "dbus-menu": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "git-ignore-nix": [ - "git-ignore-nix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770957161, - "narHash": "sha256-jXLEo7toB/1Vm5VUPYLsdforwT23Cn3KAajhZhDbqG8=", - "owner": "taffybar", - "repo": "dbus-menu", - "rev": "c18b84f7f251e520d6f6fcef290cfdd0b45ba057", - "type": "github" - }, - "original": { - "owner": "taffybar", - "repo": "dbus-menu", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -119,67 +77,6 @@ "type": "github" } }, - "gtk-sni-tray": { - "inputs": { - "dbus-menu": [ - "dbus-menu" - ], - "flake-utils": [ - "flake-utils" - ], - "git-ignore-nix": [ - "git-ignore-nix" - ], - "gtk-strut": [ - "gtk-strut" - ], - "nixpkgs": [ - "nixpkgs" - ], - "status-notifier-item": [ - "status-notifier-item" - ] - }, - "locked": { - "lastModified": 1771570735, - "narHash": "sha256-WrqV4JYtqF0fn2n8uVnxv08d2+IG+R3LHOJz4M1AE58=", - "owner": "taffybar", - "repo": "gtk-sni-tray", - "rev": "61e075f9521f89e04fadf27c094ef9480fda8164", - "type": "github" - }, - "original": { - "owner": "taffybar", - "repo": "gtk-sni-tray", - "type": "github" - } - }, - "gtk-strut": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "git-ignore-nix": [ - "git-ignore-nix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1760550944, - "narHash": "sha256-S0saDsCA3aosU23jO5+jSXkbyrv7/C48o8GjsZrqF0I=", - "owner": "taffybar", - "repo": "gtk-strut", - "rev": "5e0bf7f4b93b931a9c4b4a48b5d39de3ca8f02ae", - "type": "github" - }, - "original": { - "owner": "taffybar", - "repo": "gtk-strut", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1771369470, @@ -220,44 +117,13 @@ }, "root": { "inputs": { - "dbus-hslogger": "dbus-hslogger", - "dbus-menu": "dbus-menu", "flake-utils": "flake-utils", "git-ignore-nix": "git-ignore-nix", - "gtk-sni-tray": "gtk-sni-tray", - "gtk-strut": "gtk-strut", "nixpkgs": "nixpkgs", - "status-notifier-item": "status-notifier-item", "taffybar": "taffybar", "xmonad": "xmonad" } }, - "status-notifier-item": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "git-ignore-nix": [ - "git-ignore-nix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772010208, - "narHash": "sha256-pTYdXOt9lJotRj4batisePaVIrKcc+6fvrouYkMaI1k=", - "owner": "taffybar", - "repo": "status-notifier-item", - "rev": "4547f81f1ba6aaead9c843b3aeec0fd98574bbfa", - "type": "github" - }, - "original": { - "owner": "taffybar", - "repo": "status-notifier-item", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix index 16832b96..15f177a4 100644 --- a/dotfiles/config/taffybar/flake.nix +++ b/dotfiles/config/taffybar/flake.nix @@ -16,38 +16,6 @@ inputs.flake-utils.follows = "flake-utils"; inputs.git-ignore-nix.follows = "git-ignore-nix"; }; - dbus-menu = { - url = "github:taffybar/dbus-menu"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - inputs.git-ignore-nix.follows = "git-ignore-nix"; - }; - status-notifier-item = { - url = "github:taffybar/status-notifier-item"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - inputs.git-ignore-nix.follows = "git-ignore-nix"; - }; - gtk-strut = { - url = "github:taffybar/gtk-strut"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - inputs.git-ignore-nix.follows = "git-ignore-nix"; - }; - gtk-sni-tray = { - url = "github:taffybar/gtk-sni-tray"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - inputs.git-ignore-nix.follows = "git-ignore-nix"; - inputs.gtk-strut.follows = "gtk-strut"; - inputs.status-notifier-item.follows = "status-notifier-item"; - inputs.dbus-menu.follows = "dbus-menu"; - }; - # nixpkgs' dbus-hslogger is currently too old for taffybar. - dbus-hslogger = { - url = "github:IvanMalison/dbus-hslogger"; - flake = false; - }; taffybar = { # Use the local git checkout, not a raw path snapshot, so gitignored # build artifacts like dist-newstyle/.worktrees/.direnv don't get copied @@ -65,11 +33,6 @@ taffybar, nixpkgs, xmonad, - dbus-menu, - status-notifier-item, - gtk-strut, - gtk-sni-tray, - dbus-hslogger, ... }: flake-utils.lib.eachDefaultSystem (system: diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index 173b9991..730a0d60 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit 173b999172dee36758e79be60ce6920c80c3b5d1 +Subproject commit 730a0d60e14fdc67a02abb2e9e743fe130574708