merge xmonad desktop/laptop settings, settle on lock shortcut