From 804533cde06189bb2109c063092d59b2d53ee4db Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 16 Mar 2025 17:15:39 +0100 Subject: ... --- overlays/niri.nix | 8 ++++++++ overlays/swayosd/default.nix | 17 ----------------- overlays/waybar.nix | 11 ++++++++--- 3 files changed, 16 insertions(+), 20 deletions(-) create mode 100644 overlays/niri.nix (limited to 'overlays') diff --git a/overlays/niri.nix b/overlays/niri.nix new file mode 100644 index 00000000..9188ed7d --- /dev/null +++ b/overlays/niri.nix @@ -0,0 +1,8 @@ +{ final, prev, flakeInputs, ... }: prev.lib.composeExtensions + flakeInputs.niri-flake.overlays.niri + (final: prev: { + niri-unstable = prev.niri-unstable.overrideAttrs (oldAttrs: { + buildInputs = (oldAttrs.buildInputs or []) ++ [ final.libgbm ]; + }); + }) + final prev diff --git a/overlays/swayosd/default.nix b/overlays/swayosd/default.nix index d8807b41..2a3a0f2b 100644 --- a/overlays/swayosd/default.nix +++ b/overlays/swayosd/default.nix @@ -6,23 +6,6 @@ inherit version src; hash = "sha256-s2vgyQP6J3i0q2o/Tt8dYoamBH3vrI/FNJYteHO8v5Q="; }; - nativeBuildInputs = with final; [ - wrapGAppsHook4 - pkg-config - meson - rustc - cargo - ninja - rustPlatform.cargoSetupHook - ]; - buildInputs = with final; [ - gtk4-layer-shell - libevdev - libinput - libpulseaudio - udev - sassc - ]; patches = (oldAttrs.patches or []) ++ [ ./exponential.patch ]; diff --git a/overlays/waybar.nix b/overlays/waybar.nix index 20f37255..e7e3b807 100644 --- a/overlays/waybar.nix +++ b/overlays/waybar.nix @@ -1,3 +1,8 @@ -{ final, prev, flakeInputs, ... }: - -flakeInputs.waybar.overlays.default final prev +{ final, prev, flakeInputs, ... }: prev.lib.composeExtensions + flakeInputs.waybar.overlays.default + (final: prev: { + waybar = prev.waybar.overrideAttrs (oldAttrs: { + dontVersionCheck = true; + }); + }) + final prev -- cgit v1.2.3