From 17d8e4750bd79e0d18b5d0c9f578f23fa47552f4 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 21 Aug 2023 15:34:37 +0300 Subject: [PATCH] Nix: remove waybar completely Get it from Nixpkgs instead. --- flake.nix | 1 - nix/overlays.nix | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 3275604d..e9d5a5d9 100644 --- a/flake.nix +++ b/flake.nix @@ -74,7 +74,6 @@ wlroots-hyprland udis86 ; - waybar-hyprland = lib.warn "The `waybar-hyprland` package is now in Nixpkgs" pkgsFor.${system}.waybar-hyprland; }); devShells = eachSystem (system: { diff --git a/nix/overlays.nix b/nix/overlays.nix index f163a062..ddd8b2e6 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -15,7 +15,7 @@ lib.foldl' (attrs: overlay: attrs // (overlay final prev)) {} overlays; in { # Contains what a user is most likely to care about: - # Hyprland itself, XDPH, the Share Picker, and patched Waybar. + # Hyprland itself, XDPH and the Share Picker. default = mkJoinedOverlays (with self.overlays; [ hyprland-packages hyprland-extras @@ -52,11 +52,8 @@ in { hyprland-extras = mkJoinedOverlays [ inputs.xdph.overlays.xdg-desktop-portal-hyprland inputs.xdph.overlays.hyprland-share-picker - self.overlays.waybar-hyprland ]; - waybar-hyprland = lib.warn "The `waybar-hyprland` package is now in Nixpkgs" (final: prev: {inherit (prev) waybar-hyprland;}); - udis86 = final: prev: { udis86 = final.callPackage ./udis86.nix {}; };