christoph/flake-nixinator
1
Fork 0
Code Activity

Disable waybar hyprland patches (now included natively)

Browse Source
This commit is contained in:
Christoph Urlacher
2023-09-08 14:04:00 +02:00
parent 32ac62fe0a
commit a8b77989b4
2 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/waybar/config.json
View File

@ -16,7 +16,7 @@
], ],
"modules-center": [ "modules-center": [
"wlr/workspaces" "hyprland/workspaces"
], ],
"modules-right": [ "modules-right": [
@ -35,7 +35,7 @@
"tooltip": false "tooltip": false
}, },
"wlr/workspaces": { "hyprland/workspaces": {
"all-outputs": false, "all-outputs": false,
"format": "{name}", "format": "{name}",
"on-click": "activate", "on-click": "activate",

55
home/modules/waybar/default.nix
View File

@ -16,37 +16,38 @@ in {
config = let config = let
# Taken from https://github.com/Ruixi-rebirth/flakes/blob/main/modules/programs/wayland/waybar/workspace-patch.nix # Taken from https://github.com/Ruixi-rebirth/flakes/blob/main/modules/programs/wayland/waybar/workspace-patch.nix
hyprctl = "${pkgs.hyprland}/bin/hyprctl"; # hyprctl = "${pkgs.hyprland}/bin/hyprctl";
workspaces-patch = pkgs.writeTextFile { # workspaces-patch = pkgs.writeTextFile {
name = "waybar-hyprctl.diff"; # name = "waybar-hyprctl.diff";
text = '' # text = ''
diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp # diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp
index 6a496e6..a689be0 100644 # index 6a496e6..a689be0 100644
--- a/src/modules/wlr/workspace_manager.cpp # --- a/src/modules/wlr/workspace_manager.cpp
+++ b/src/modules/wlr/workspace_manager.cpp # +++ b/src/modules/wlr/workspace_manager.cpp
@@ -511,7 +511,9 @@ auto Workspace::handle_clicked(GdkEventButton *bt) -> bool { # @@ -511,7 +511,9 @@ auto Workspace::handle_clicked(GdkEventButton *bt) -> bool {
if (action.empty()) # if (action.empty())
return true; # return true;
else if (action == "activate") { # else if (action == "activate") {
- zext_workspace_handle_v1_activate(workspace_handle_); # - zext_workspace_handle_v1_activate(workspace_handle_);
+ // zext_workspace_handle_v1_activate(workspace_handle_); # + // zext_workspace_handle_v1_activate(workspace_handle_);
+ const std::string command = "${hyprctl} dispatch workspace " + name_; # + const std::string command = "${hyprctl} dispatch workspace " + name_;
+ system(command.c_str()); # + system(command.c_str());
} else if (action == "close") { # } else if (action == "close") {
zext_workspace_handle_v1_remove(workspace_handle_); # zext_workspace_handle_v1_remove(workspace_handle_);
} else { # } else {
''; # '';
}; # };
waybar-hyprland = pkgs.waybar.overrideAttrs (oldAttrs: { # waybar-hyprland = pkgs.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"]; # mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
patches = (oldAttrs.patches or []) ++ [workspaces-patch]; # patches = (oldAttrs.patches or []) ++ [workspaces-patch];
}); # });
in in
mkIf cfg.enable { mkIf cfg.enable {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = waybar-hyprland; # package = waybar-hyprland;
package = pkgs.waybar;
systemd = { systemd = {
enable = false; # Gets started by hyprland enable = false; # Gets started by hyprland
@ -60,7 +61,7 @@ in {
trap "${pkgs.procps}/bin/pkill waybar" EXIT trap "${pkgs.procps}/bin/pkill waybar" EXIT
while true; do while true; do
${waybar-hyprland}/bin/waybar -c $HOME/NixFlake/config/waybar/config.json -s $HOME/NixFlake/config/waybar/style.css & ${pkgs.waybar}/bin/waybar -c $HOME/NixFlake/config/waybar/config.json -s $HOME/NixFlake/config/waybar/style.css &
${pkgs.inotifyTools}/bin/inotifywait -e create,modify $HOME/NixFlake/config/waybar/config.json $HOME/NixFlake/config/waybar/style.css ${pkgs.inotifyTools}/bin/inotifywait -e create,modify $HOME/NixFlake/config/waybar/config.json $HOME/NixFlake/config/waybar/style.css
${pkgs.procps}/bin/pkill waybar ${pkgs.procps}/bin/pkill waybar
done done