Fixed moving/resizing windows and got multimonitor to behave like xmonad

This commit is contained in:
Emmet 2023-08-20 21:26:28 -05:00
parent 0a71232a56
commit 681c3cc939

View file

@ -40,7 +40,9 @@
bind=SUPER,SPACE,fullscreen,1 bind=SUPER,SPACE,fullscreen,1
bind=ALT,TAB,cyclenext bind=ALT,TAB,cyclenext
bind=ALT,TAB,bringactivetotop
bind=ALTSHIFT,TAB,cyclenext,prev bind=ALTSHIFT,TAB,cyclenext,prev
bind=ALTSHIFT,TAB,bringactivetotop
bind=SUPER,RETURN,exec,'' + term + '' bind=SUPER,RETURN,exec,'' + term + ''
@ -53,8 +55,9 @@
bind=SUPERSHIFT,X,exec,fnottctl dismiss all bind=SUPERSHIFT,X,exec,fnottctl dismiss all
bind=SUPER,Q,killactive bind=SUPER,Q,killactive
bind=SUPERSHIFT,Q,exit bind=SUPERSHIFT,Q,exit
bind=SUPER,mouse:272,movewindow bindm=SUPER,mouse:272,movewindow
bind=SUPER,mouse:273,movewindow bindm=SUPER,mouse:273,resizewindow
bind=SUPER,T,togglefloating
bind=,code:107,exec,grim -g "$(slurp)" bind=,code:107,exec,grim -g "$(slurp)"
bind=SHIFT,code:107,exec,grim -g "$(slurp -o)" bind=SHIFT,code:107,exec,grim -g "$(slurp -o)"
@ -223,7 +226,7 @@
passivews=$(grep -A 6 "Monitor $passivemonitor" "$monitors" | awk 'NR==4 {print $1}' RS='(' FS=')') passivews=$(grep -A 6 "Monitor $passivemonitor" "$monitors" | awk 'NR==4 {print $1}' RS='(' FS=')')
if [[ $workspace -eq $passivews ]] && [[ $activemonitor != "$passivemonitor" ]]; then if [[ $workspace -eq $passivews ]] && [[ $activemonitor != "$passivemonitor" ]]; then
hyprctl dispatch swapactiveworkspaces "$activemonitor" "$passivemonitor" && hyprctl dispatch workspace "$workspace" && hyprctl dispatch swapactiveworkspaces "$activemonitor" "$passivemonitor" && hyprctl dispatch workspace "$workspace"
echo $activemonitor $passivemonitor echo $activemonitor $passivemonitor
else else
hyprctl dispatch moveworkspacetomonitor "$workspace $activemonitor" && hyprctl dispatch workspace "$workspace" hyprctl dispatch moveworkspacetomonitor "$workspace $activemonitor" && hyprctl dispatch workspace "$workspace"
@ -286,6 +289,10 @@
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = pkgs.waybar.overrideAttrs (oldAttrs: { package = pkgs.waybar.overrideAttrs (oldAttrs: {
postPatch = ''
# use hyprctl to switch workspaces
sed -i 's/zext_workspace_handle_v1_activate(workspace_handle_);/const std::string command = "hyprworkspace " + name_;\n\tsystem(command.c_str());/g' src/modules/wlr/workspace_manager.cpp
'';
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
}); });
settings = { settings = {
@ -331,6 +338,9 @@
"8" = [ ]; "8" = [ ];
"9" = [ ]; "9" = [ ];
}; };
"on-click" = "activate";
"on-scroll-up" = "hyprctl dispatch workspace e+1";
"on-scroll-down" = "hyprctl dispatch workspace e-1";
}; };
"idle_inhibitor" = { "idle_inhibitor" = {
@ -355,7 +365,6 @@
}; };
cpu = { cpu = {
"format" = "{usage}% "; "format" = "{usage}% ";
"tooltip" = false;
}; };
memory = { "format" = "{}% "; }; memory = { "format" = "{}% "; };
backlight = { backlight = {