waybar: move wm specific settings to wm modules

This commit is contained in:
Aly Raffauf 2024-04-19 18:51:24 -04:00
parent 07053b3f89
commit 1019dd7ed7
5 changed files with 22 additions and 6 deletions

View file

@ -24,14 +24,12 @@
output = ["*"]; output = ["*"];
position = "top"; position = "top";
reload_style_on_change = true; reload_style_on_change = true;
modules-left = ["hyprland/workspaces" "river/tags" "sway/workspaces" "hyprland/submap"]; modules-left = lib.mkDefault ["hyprland/workspaces" "hyprland/submap"];
modules-center = ["clock"]; modules-center = ["clock"];
modules-right = [ modules-right = [
"tray" "tray"
"bluetooth" "bluetooth"
# "network"
"pulseaudio" "pulseaudio"
# "wireplumber"
"group/power" "group/power"
"custom/logout" "custom/logout"
]; ];

View file

@ -21,7 +21,7 @@ window#waybar {
color: #ca9ee6; color: #ca9ee6;
} }
#submap { #submap, #mode {
padding: 0 15px; padding: 0 15px;
margin: 0 5px; margin: 0 5px;
color: #e78284; color: #e78284;

View file

@ -65,6 +65,12 @@
extraPortals = [pkgs.xdg-desktop-portal-hyprland]; extraPortals = [pkgs.xdg-desktop-portal-hyprland];
}; };
programs.waybar.settings = {
mainBar = {
modules-left = ["hyprland/workspaces" "hyprland/submap"];
};
};
wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland.enable = true;
wayland.windowManager.hyprland.extraConfig = let wayland.windowManager.hyprland.extraConfig = let
modifier = "SUPER"; modifier = "SUPER";
@ -368,7 +374,7 @@
binde=,left,resizeactive,-10 0 binde=,left,resizeactive,-10 0
binde=,up,resizeactive,0 -10 binde=,up,resizeactive,0 -10
binde=,down,resizeactive,0 10 binde=,down,resizeactive,0 10
bind=,escape,submap,reset bind=,escape,submap,reset
submap=reset submap=reset
bind=ALT,M,submap,move bind=ALT,M,submap,move
@ -392,7 +398,7 @@
# hyprnome # hyprnome
bind = , comma, exec, ${hyprnome} --previous --move bind = , comma, exec, ${hyprnome} --previous --move
bind = , period, exec, ${hyprnome} --move bind = , period, exec, ${hyprnome} --move
bind=,escape,submap,reset bind=,escape,submap,reset
submap=reset submap=reset
''; '';
}; };

View file

@ -109,6 +109,12 @@
} }
''; '';
programs.waybar.settings = {
mainBar = {
modules-left = ["river/tags" "river/mode"];
};
};
wayland.windowManager.river.enable = true; wayland.windowManager.river.enable = true;
wayland.windowManager.river.extraConfig = let wayland.windowManager.river.extraConfig = let
modifier = "Super"; modifier = "Super";

View file

@ -47,6 +47,12 @@
services.cliphist.enable = lib.mkDefault true; services.cliphist.enable = lib.mkDefault true;
programs.waybar.settings = {
mainBar = {
modules-left = ["sway/workspaces" "sway/mode"];
};
};
wayland.windowManager.sway.enable = true; wayland.windowManager.sway.enable = true;
wayland.windowManager.sway.config = let wayland.windowManager.sway.config = let
modifier = "Mod4"; modifier = "Mod4";