Merge branch 'master' of github.com:IvanMalison/dotfiles
This commit is contained in:
commit
1c6c49bf26
@ -707,12 +707,28 @@ shiftToNextScreen ws =
|
|||||||
|
|
||||||
shiftToNextScreenX = windows shiftToNextScreen
|
shiftToNextScreenX = windows shiftToNextScreen
|
||||||
|
|
||||||
|
getNextScreen ws =
|
||||||
|
minimumBy compareScreen candidates
|
||||||
|
where currentId = W.screen $ W.current ws
|
||||||
|
otherScreens = W.visible ws
|
||||||
|
largerId = filter ((> currentId) . W.screen) $ otherScreens
|
||||||
|
compareScreen a b = compare (W.screen a) (W.screen b)
|
||||||
|
candidates =
|
||||||
|
case largerId of
|
||||||
|
[] -> W.current ws:otherScreens -- Ensure a value will be selected
|
||||||
|
_ -> largerId
|
||||||
|
|
||||||
goToNextScreen ws =
|
goToNextScreen ws =
|
||||||
case W.visible ws of
|
if screenEq nextScreen currScreen then ws
|
||||||
newVisible:rest -> ws { W.current = newVisible
|
else ws { W.current = nextScreen
|
||||||
, W.visible = W.current ws:rest
|
, W.visible = currScreen : trimmedVisible
|
||||||
}
|
}
|
||||||
_ -> ws
|
where
|
||||||
|
currScreen = W.current ws
|
||||||
|
nextScreen = getNextScreen ws
|
||||||
|
screenEq a b = W.screen a == W.screen b
|
||||||
|
trimmedVisible =
|
||||||
|
(filter (screenEq nextScreen) $ W.visible ws)
|
||||||
|
|
||||||
goToNextScreenX = windows goToNextScreen
|
goToNextScreenX = windows goToNextScreen
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ ESSENTIAL=(
|
|||||||
"rofi-pass" "xorg-xrandr" "spotify" "htop" "rcm" "networkmanager-applet"
|
"rofi-pass" "xorg-xrandr" "spotify" "htop" "rcm" "networkmanager-applet"
|
||||||
"pulseaudio-ctl" "pasystray" "xclip" "copyq" "notification-daemon" "pass"
|
"pulseaudio-ctl" "pasystray" "xclip" "copyq" "notification-daemon" "pass"
|
||||||
"pavucontrol" "xsettingsd-git" "udisks" "udiskie" "python-pip"
|
"pavucontrol" "xsettingsd-git" "udisks" "udiskie" "python-pip"
|
||||||
"gnome-keyring"
|
"gnome-keyring" "ntp"
|
||||||
)
|
)
|
||||||
|
|
||||||
NEEDED=(
|
NEEDED=(
|
||||||
|
Loading…
Reference in New Issue
Block a user