Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
Ivan Malison 2017-04-15 23:12:11 -07:00
commit 1c6c49bf26
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 22 additions and 6 deletions

View File

@ -707,12 +707,28 @@ shiftToNextScreen ws =
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 =
case W.visible ws of
newVisible:rest -> ws { W.current = newVisible
, W.visible = W.current ws:rest
}
_ -> ws
if screenEq nextScreen currScreen then ws
else ws { W.current = nextScreen
, W.visible = currScreen : trimmedVisible
}
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

View File

@ -12,7 +12,7 @@ ESSENTIAL=(
"rofi-pass" "xorg-xrandr" "spotify" "htop" "rcm" "networkmanager-applet"
"pulseaudio-ctl" "pasystray" "xclip" "copyq" "notification-daemon" "pass"
"pavucontrol" "xsettingsd-git" "udisks" "udiskie" "python-pip"
"gnome-keyring"
"gnome-keyring" "ntp"
)
NEEDED=(