From 903cb3786747f04e01a6a5f35a6bd9f10a3ff14c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 4 Jul 2015 14:34:04 +0200 Subject: Removed per-host layout modifiers --- .xmonad/xmonad.hs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index e1ed49b..4cc7f63 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -56,7 +56,6 @@ data Host l1 l2 = Host , hManageHook :: ManageHook , hWsp :: Integer -> WorkspaceId , hCoWsp :: String -> Maybe WorkspaceId - , hLayoutMod :: l1 -> l2 , hKeysMod :: XConfig Layout -> (KeyMap -> KeyMap) } @@ -64,7 +63,6 @@ defaultHost = Host { hName = "unkown" , hManageHook = composeOne [manageScratchTerm] , hWsp = show , hCoWsp = const Nothing - , hLayoutMod = id , hKeysMod = const id } @@ -76,7 +74,6 @@ hostFromName h@("vali") = defaultHost { hName = h ] , hWsp = hWsp , hCoWsp = hCoWsp - , hLayoutMod = onWorkspace (hWsp 1) (noBorders Full ||| tabbedLayout tabbedBottomAlways) , hKeysMod = \conf -> Map.union $ Map.fromList $ join $ map (spawnBindings conf) [ (xK_d, ["dwb", "dwb $(xclip -o)"]) ] } @@ -131,7 +128,13 @@ main = do , normalBorderColor = "#202020" , focusedBorderColor = "white" } - layout' = hLayoutMod host $ defaultLayouts + -- We canĀ“t define per-host layout modifiers because we lack dependent types + layout' = onWorkspace (wsp 1) (noBorders Full ||| withIM (1%5) (Title "Buddy List") (tabbedLayout tabbedBottomAlways)) $ + onWorkspace (wsp 10) (noBorders Full) $ + onWorkspace (wsp 2) (noBorders Full ||| tabbedLayout tabbedBottomAlways) $ + onWorkspace (wsp 5) (tabbedLayout tabbedBottomAlways) $ + onWorkspace (wsp 8) (withIM (1%5) (Title "Friends") (tabbedLayout tabbedBottomAlways)) $ + defaultLayouts defaultLayouts = spiralWithDir East CW (1 % 2) ||| tabbedLayout tabbedBottom ||| noBorders Full ||| simplestFloat xmobarPP' = xmobarPP { ppOutput = hPutStrLn xmobarProc , ppTitle = shorten 50 -- cgit v1.2.3