Commit b9e923ea authored by Austin Horstman's avatar Austin Horstman Committed by Anderson Torres
Browse files

waybar: remove waybar-hyprland

parent 7b864dc3

pkgs/applications/misc/waybar/default.nix

+3 −8
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


, cavaSupport ? true

, evdevSupport ? true

, hyprlandSupport ? false

, hyprlandSupport ? true

, inputSupport ? true

, jackSupport ? true

, mpdSupport ? true
@@ -89,10 +89,6 @@ stdenv.mkDerivation (finalAttrs: { 
    popd

  '';



  # Patch for workspaces support in wlr/workspaces

  # See https://wiki.hyprland.org/Useful-Utilities/Status-Bars/#waybar

  patches = lib.optional hyprlandSupport [ ./hyprland.diff ];



  nativeBuildInputs = [

    meson

    ninja
@@ -166,8 +162,7 @@ stdenv.mkDerivation (finalAttrs: { 
    "tests" = runTests;

    "upower_glib" = upowerSupport;

    "wireplumber" = wireplumberSupport;

  })

  ++ lib.optional hyprlandSupport (lib.mesonBool "experimental" true);

  });



  preFixup = lib.optionalString withMediaPlayer ''

    cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py

pkgs/applications/misc/waybar/hyprland.diff

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
--- a/src/modules/wlr/workspace_manager.cpp

+++ b/src/modules/wlr/workspace_manager.cpp

@@ -523,7 +523,8 @@

   if (action.empty())

     return true;

   else if (action == "activate") {

-    zext_workspace_handle_v1_activate(workspace_handle_);

+    const std::string command = "hyprctl dispatch workspace " + name_;

+    system(command.c_str());

   } else if (action == "close") {

     zext_workspace_handle_v1_remove(workspace_handle_);

   } else {

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -1823,6 +1823,7 @@ mapAliases ({ 
  ### W ###



  wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21

  waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21

  way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13

  wayfireApplications-unwrapped = throw ''

    'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire'

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -32665,10 +32665,6 @@ with pkgs; 














  waybar = callPackage ../applications/misc/waybar { };



























  waybar-hyprland = callPackage ../applications/misc/waybar {













    hyprlandSupport = true;













  };



























  waycorner = callPackage ../applications/misc/waycorner { };





























  waylock = callPackage ../applications/misc/waylock { };