From 47a4a723f34f54a180e8e0e0e775e6262ef752b0 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 4 Jul 2015 14:23:45 +0200 Subject: Type finangling --- .xmonad/xmonad.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 2877be1..fadc49a 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -76,7 +76,7 @@ hostFromName h@("vali") = defaultHost { hName = h ] , hWsp = hWsp , hCoWsp = hCoWsp - , hLayoutMod = mkMod [ (\wsp -> onWorkspace wsp $ noBorders Full ||| tabbedLayout tabbedBottomAlways) <$> hCoWsp "web" + , hLayoutMod = mkMod [ (\wsp -> onWorkspace wsp (noBorders Full ||| tabbedLayout tabbedBottomAlways)) <$> hCoWsp "web" ] , hKeysMod = \conf -> Map.union $ Map.fromList $ join $ map (spawnBindings conf) [ (xK_d, ["dwb", "dwb $(xclip -o)"]) ] @@ -86,6 +86,7 @@ hostFromName h@("vali") = defaultHost { hName = h ] hWsp = wspFromMap workspaceNames hCoWsp = coWspFromMap workspaceNames + mkMod = foldl (.) id . catMaybes hostFromName _ = defaultHost wspFromMap workspaceNames = \i -> case Map.lookup i workspaceNames of @@ -97,8 +98,6 @@ coWspFromMap workspaceNames = \str -> case filter ((== str) . snd) $ Map.toList [(i, _)] -> Just $ wspFromMap workspaceNames i _ -> Nothing -mkMod = foldl (.) id . catMaybes - spawnModifiers = [0, controlMask, shiftMask .|. controlMask] spawnBindings conf (k, cmds) = zipWith (\m cmd -> ((modm .|. mod1Mask .|. m, k), spawn cmd)) spawnModifiers cmds where -- cgit v1.2.3