Tweaked layouts on vali

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
 import XMonad.Layout.OnHost
 import XMonad.Layout.Combo
 import XMonad.Layout.TwoPane
+import XMonad.Layout.LayoutBuilder
 import XMonad.Layout.WindowNavigation
 import System.Process
 import System.Directory (removeFile)
@@ -93,7 +94,6 @@ hostFromName h@("vali") = defaultHost { hName = h
   where
     workspaceNames = Map.fromList [ (2, "web")
                                   , (3, "work")
-                                  , (5, "read")
                                   , (10, "media")
                                   ]
     hWsp = wspFromMap workspaceNames
@@ -157,14 +157,19 @@ main = do
                                   onWorkspace (wsp 8) (withIM (1%5) (Title "Friends") tabbedLayout') $
                                   defaultLayouts
                                 ) $
-                onHost "vali"   ( onWorkspace (wsp 2) (noBorders Full ||| tabbedLayout' ||| combineTwo twoPane tabbedLayout' tabbedLayout') $
-                                  onWorkspace (wsp 3) (spiralWithDir East CW (1 % 2) ||| combineTwo (TwoPane 0.1 0.65) (noBorders Full) tabbedLayout') $
+                onHost "vali"   ( onWorkspace (wsp 2) (noBorders Full ||| tabbedLayout' ||| combineTwo (TwoPane 0.01 0.57) Full tabbedLayout') $
+                                  onWorkspace (wsp 3) workLayouts $ 
                                   defaultLayouts
                                 ) $
                 defaultLayouts
-      twoPane = TwoPane 0.01 0.5
       tabbedLayout' = tabbedLayout tabbedBottomAlways
       defaultLayouts = spiralWithDir East CW (1 % 2) ||| tabbedLayout' ||| noBorders Full
+      workLayouts = spiralWithDir East CW (1 % 2)
+                    ||| combineTwo (TwoPane 0.1 0.65) Full (
+        tabbedLayout'
+        ||| (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')
+        )
+      sqrtTwo = approxRational (sqrt 2) (1 / 2560)
       xmobarPP' = xmobarPP { ppOutput = hPutStrLn xmobarProc
                            , ppTitle = shorten 50
                            , ppSort = (liftM2 (.)) getSortByIndex $ return scratchpadFilterOutWorkspace