summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-07-04 14:34:04 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-07-04 14:34:04 +0200
commit903cb3786747f04e01a6a5f35a6bd9f10a3ff14c (patch)
treeb21fa47574bcd42017ad74871df9bd36b5cc8d78
parent99bbf037e6966dd17c5dd1026b1dc5d1cedba13c (diff)
downloaddotfiles-903cb3786747f04e01a6a5f35a6bd9f10a3ff14c.tar
dotfiles-903cb3786747f04e01a6a5f35a6bd9f10a3ff14c.tar.gz
dotfiles-903cb3786747f04e01a6a5f35a6bd9f10a3ff14c.tar.bz2
dotfiles-903cb3786747f04e01a6a5f35a6bd9f10a3ff14c.tar.xz
dotfiles-903cb3786747f04e01a6a5f35a6bd9f10a3ff14c.zip
Removed per-host layout modifiers
-rw-r--r--.xmonad/xmonad.hs11
1 files 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
56 , hManageHook :: ManageHook 56 , hManageHook :: ManageHook
57 , hWsp :: Integer -> WorkspaceId 57 , hWsp :: Integer -> WorkspaceId
58 , hCoWsp :: String -> Maybe WorkspaceId 58 , hCoWsp :: String -> Maybe WorkspaceId
59 , hLayoutMod :: l1 -> l2
60 , hKeysMod :: XConfig Layout -> (KeyMap -> KeyMap) 59 , hKeysMod :: XConfig Layout -> (KeyMap -> KeyMap)
61 } 60 }
62 61
@@ -64,7 +63,6 @@ defaultHost = Host { hName = "unkown"
64 , hManageHook = composeOne [manageScratchTerm] 63 , hManageHook = composeOne [manageScratchTerm]
65 , hWsp = show 64 , hWsp = show
66 , hCoWsp = const Nothing 65 , hCoWsp = const Nothing
67 , hLayoutMod = id
68 , hKeysMod = const id 66 , hKeysMod = const id
69 } 67 }
70 68
@@ -76,7 +74,6 @@ hostFromName h@("vali") = defaultHost { hName = h
76 ] 74 ]
77 , hWsp = hWsp 75 , hWsp = hWsp
78 , hCoWsp = hCoWsp 76 , hCoWsp = hCoWsp
79 , hLayoutMod = onWorkspace (hWsp 1) (noBorders Full ||| tabbedLayout tabbedBottomAlways)
80 , hKeysMod = \conf -> Map.union $ Map.fromList $ join $ map (spawnBindings conf) [ (xK_d, ["dwb", "dwb $(xclip -o)"]) 77 , hKeysMod = \conf -> Map.union $ Map.fromList $ join $ map (spawnBindings conf) [ (xK_d, ["dwb", "dwb $(xclip -o)"])
81 ] 78 ]
82 } 79 }
@@ -131,7 +128,13 @@ main = do
131 , normalBorderColor = "#202020" 128 , normalBorderColor = "#202020"
132 , focusedBorderColor = "white" 129 , focusedBorderColor = "white"
133 } 130 }
134 layout' = hLayoutMod host $ defaultLayouts 131 -- We canĀ“t define per-host layout modifiers because we lack dependent types
132 layout' = onWorkspace (wsp 1) (noBorders Full ||| withIM (1%5) (Title "Buddy List") (tabbedLayout tabbedBottomAlways)) $
133 onWorkspace (wsp 10) (noBorders Full) $
134 onWorkspace (wsp 2) (noBorders Full ||| tabbedLayout tabbedBottomAlways) $
135 onWorkspace (wsp 5) (tabbedLayout tabbedBottomAlways) $
136 onWorkspace (wsp 8) (withIM (1%5) (Title "Friends") (tabbedLayout tabbedBottomAlways)) $
137 defaultLayouts
135 defaultLayouts = spiralWithDir East CW (1 % 2) ||| tabbedLayout tabbedBottom ||| noBorders Full ||| simplestFloat 138 defaultLayouts = spiralWithDir East CW (1 % 2) ||| tabbedLayout tabbedBottom ||| noBorders Full ||| simplestFloat
136 xmobarPP' = xmobarPP { ppOutput = hPutStrLn xmobarProc 139 xmobarPP' = xmobarPP { ppOutput = hPutStrLn xmobarProc
137 , ppTitle = shorten 50 140 , ppTitle = shorten 50