diff options
Diffstat (limited to '.xmonad/xmonad.hs')
-rw-r--r-- | .xmonad/xmonad.hs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 664627f..4d0ee8e 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs | |||
@@ -28,6 +28,7 @@ import XMonad.Layout.Reflect | |||
28 | import XMonad.Layout.OnHost | 28 | import XMonad.Layout.OnHost |
29 | import XMonad.Layout.Combo | 29 | import XMonad.Layout.Combo |
30 | import XMonad.Layout.TwoPane | 30 | import XMonad.Layout.TwoPane |
31 | import XMonad.Layout.LayoutBuilder | ||
31 | import XMonad.Layout.WindowNavigation | 32 | import XMonad.Layout.WindowNavigation |
32 | import System.Process | 33 | import System.Process |
33 | import System.Directory (removeFile) | 34 | import System.Directory (removeFile) |
@@ -93,7 +94,6 @@ hostFromName h@("vali") = defaultHost { hName = h | |||
93 | where | 94 | where |
94 | workspaceNames = Map.fromList [ (2, "web") | 95 | workspaceNames = Map.fromList [ (2, "web") |
95 | , (3, "work") | 96 | , (3, "work") |
96 | , (5, "read") | ||
97 | , (10, "media") | 97 | , (10, "media") |
98 | ] | 98 | ] |
99 | hWsp = wspFromMap workspaceNames | 99 | hWsp = wspFromMap workspaceNames |
@@ -157,14 +157,19 @@ main = do | |||
157 | onWorkspace (wsp 8) (withIM (1%5) (Title "Friends") tabbedLayout') $ | 157 | onWorkspace (wsp 8) (withIM (1%5) (Title "Friends") tabbedLayout') $ |
158 | defaultLayouts | 158 | defaultLayouts |
159 | ) $ | 159 | ) $ |
160 | onHost "vali" ( onWorkspace (wsp 2) (noBorders Full ||| tabbedLayout' ||| combineTwo twoPane tabbedLayout' tabbedLayout') $ | 160 | onHost "vali" ( onWorkspace (wsp 2) (noBorders Full ||| tabbedLayout' ||| combineTwo (TwoPane 0.01 0.57) Full tabbedLayout') $ |
161 | onWorkspace (wsp 3) (spiralWithDir East CW (1 % 2) ||| combineTwo (TwoPane 0.1 0.65) (noBorders Full) tabbedLayout') $ | 161 | onWorkspace (wsp 3) workLayouts $ |
162 | defaultLayouts | 162 | defaultLayouts |
163 | ) $ | 163 | ) $ |
164 | defaultLayouts | 164 | defaultLayouts |
165 | twoPane = TwoPane 0.01 0.5 | ||
166 | tabbedLayout' = tabbedLayout tabbedBottomAlways | 165 | tabbedLayout' = tabbedLayout tabbedBottomAlways |
167 | defaultLayouts = spiralWithDir East CW (1 % 2) ||| tabbedLayout' ||| noBorders Full | 166 | defaultLayouts = spiralWithDir East CW (1 % 2) ||| tabbedLayout' ||| noBorders Full |
167 | workLayouts = spiralWithDir East CW (1 % 2) | ||
168 | ||| combineTwo (TwoPane 0.1 0.65) Full ( | ||
169 | tabbedLayout' | ||
170 | ||| (layoutN 1 (SubBox (Abs 0) (Abs 0) (Rel 1) (Rel $ 2 % 3)) Nothing Full $ layoutAll (SubBox (Abs 0) (Abs 0) (Rel 1) (Rel 1)) tabbedLayout') | ||
171 | ) | ||
172 | sqrtTwo = approxRational (sqrt 2) (1 / 2560) | ||
168 | xmobarPP' = xmobarPP { ppOutput = hPutStrLn xmobarProc | 173 | xmobarPP' = xmobarPP { ppOutput = hPutStrLn xmobarProc |
169 | , ppTitle = shorten 50 | 174 | , ppTitle = shorten 50 |
170 | , ppSort = (liftM2 (.)) getSortByIndex $ return scratchpadFilterOutWorkspace | 175 | , ppSort = (liftM2 (.)) getSortByIndex $ return scratchpadFilterOutWorkspace |