holm/donovanglover-nix-config
1
0
Fork 0
forked from extern/nix-config
Code Pull Requests Activity

hyprland: Remove swapmaster script

Browse Source 
Although writing my own script to swap with the previous window was
cool, I ended up switching with the first child most of the time anyway.
This commit is contained in:
Donovan Glover 2023-05-26 02:53:47 -04:00
parent 6c782154d9
commit aac49c0f66
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
desktop/hyprland/default.nix
View File

@ -126,7 +126,7 @@
bind = SUPER, F1, exec, killall rofi || rofi -show drun bind = SUPER, F1, exec, killall rofi || rofi -show drun
bind = SUPER, F2, togglespecialworkspace bind = SUPER, F2, togglespecialworkspace
bind = SUPER, Return, exec, ~/.config/hypr/swapmaster.sh bind = SUPER, Return, layoutmsg, swapwithmaster master
bind = SUPER, J, layoutmsg, cyclenext bind = SUPER, J, layoutmsg, cyclenext
bind = SUPER, K, layoutmsg, cycleprev bind = SUPER, K, layoutmsg, cycleprev
bind = SUPER_SHIFT, J, layoutmsg, swapnext bind = SUPER_SHIFT, J, layoutmsg, swapnext
@ -195,7 +195,6 @@
focus_on_activate = yes focus_on_activate = yes
} }
''; '';
xdg.configFile."hypr/swapmaster.sh".source = ./swapmaster.sh;
xdg.configFile."hypr/tags.sh".source = ./tags.sh; xdg.configFile."hypr/tags.sh".source = ./tags.sh;
home.file.".icons/default/index.theme".text = '' home.file.".icons/default/index.theme".text = ''

61
desktop/hyprland/swapmaster.sh
View File

@ -1,61 +0,0 @@
#!/bin/sh
# Temporary make the animation a fade for effect
hyprctl keyword animation workspaces,1,12,default,fade
# Get the workspace ID of the current window
cw=`hyprctl activewindow -j`
oldWorkspaceID=`echo "$cw" | jq -r '.workspace.id'`
# Get the number of windows on the workspace (0 = do nothing, 2 or more = swap)
numWindowsOnWorkspace=`hyprctl workspaces -j | jq -r ".[] | select(.id==$oldWorkspaceID) | .windows"`
# If there are no windows yet, function as a program launcher
if [[ $numWindowsOnWorkspace -eq 0 ]]; then
kitty &
hyprctl keyword animation workspaces,1,6,default,slidevert
exit
fi
# Focus the master window
hyprctl dispatch layoutmsg focusmaster master
# Focus the last window
hyprctl dispatch focuscurrentorlast
# Get the workspace ID of the last window
newWorkspaceID=`hyprctl activewindow -j | jq -r '.workspace.id'`
# If the workspaces are the same, swap master with that last window.
if [[ "$oldWorkspaceID" == "$newWorkspaceID" ]]; then
hyprctl dispatch layoutmsg swapwithmaster master
oldFullscreen=`echo "$cw" | jq -r '.fullscreen'`
oldFullscreenMode=`echo "$cw" | jq -r '.fullscreenMode'`
if [[ "$oldFullscreen" == "true" ]]; then
hyprctl dispatch fullscreen "$oldFullscreenMode"
fi
else
# Otherwise, don't do anything.
hyprctl dispatch focuscurrentorlast
oldFullscreen=`echo "$cw" | jq -r '.fullscreen'`
oldFullscreenMode=`echo "$cw" | jq -r '.fullscreenMode'`
if [[ "$oldFullscreen" == "true" ]]; then
hyprctl dispatch fullscreen "$oldFullscreenMode"
fi
# If the new workspace is special, focus the last focused special window
if [[ "$newWorkspaceID" == "-99" ]]; then
hyprctl dispatch focuscurrentorlast
fi
# If there are more windows, swap
if [[ $numWindowsOnWorkspace -gt 1 ]]; then
hyprctl dispatch layoutmsg swapwithmaster
hyprctl dispatch layoutmsg focusmaster master
fi
fi
sleep 0.1
# Use the default animation once more.
hyprctl keyword animation workspaces,1,6,default,slidevert