diff --git a/flake.lock b/flake.lock index 29c0eea..daf5f64 100644 --- a/flake.lock +++ b/flake.lock @@ -615,6 +615,22 @@ "type": "github" } }, + "nixpkgs-pre-broken-waybar": { + "locked": { + "lastModified": 1750069205, + "narHash": "sha256-ALOBI3nTUFOX0A2bpFZqtsEZfH82icS9r9L/y3XA+2s=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1c1c9b3f5ec0421eaa0f22746295466ee6a8d48f", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1c1c9b3f5ec0421eaa0f22746295466ee6a8d48f", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1751271578, @@ -786,6 +802,7 @@ "nix-index-database": "nix-index-database", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs_5", + "nixpkgs-pre-broken-waybar": "nixpkgs-pre-broken-waybar", "nixpkgs-unstable": "nixpkgs-unstable", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", diff --git a/flake.nix b/flake.nix index 609a142..13e2075 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,9 @@ nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; + # TODO: remove after waybar >0.13.0 + nixpkgs-pre-broken-waybar.url = "github:nixos/nixpkgs/1c1c9b3f5ec0421eaa0f22746295466ee6a8d48f"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/overlays/default.nix b/overlays/default.nix index a032271..9c85b54 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -44,6 +44,10 @@ rec { patches = ( final: prev: { + waybar = + assert prev.waybar.version == "0.13.0"; + inputs.nixpkgs-pre-broken-waybar.legacyPackages.${prev.system}.waybar; + mySway = prev.sway.override { withBaseWrapper = true; withGtkWrapper = true;