Reconfigure layouts

2 files changed, 20 insertions, 6 deletions

diff --git a/xmonad-config.cabal b/xmonad-config.cabal
index 7d2a5c0..6b890b8 100644
--- a/xmonad-config.cabal
+++ b/xmonad-config.cabal
@@ -6,6 +6,6 @@ cabal-version:       >=1.10
 
 executable xmonad-config-exe
   main-is:             xmonad.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N -W -Wall -O2
   build-depends:       base, xmonad, xmonad-contrib
   default-language:    Haskell2010
diff --git a/xmonad.hs b/xmonad.hs
index 19089f0..b26e45c 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -1,10 +1,24 @@
-import XMonad
-import XMonad.Config.Gnome
-import XMonad.Layout.NoBorders
+import           XMonad
+import           XMonad.Config.Desktop
+import           XMonad.Layout.NoBorders
+import           XMonad.Layout.Tabbed
+
+main :: IO ()
 main = xmonad
-    gnomeConfig {
+    desktopConfig {
             terminal = "xterm"
-          , layoutHook  = smartBorders (layoutHook gnomeConfig)
+--        , layoutHook = noBorders Full ||| noBorders (tabbed shrinkText def) ||| layoutHook desktopConfig
+          , layoutHook = desktopLayoutModifiers layouts
           , modMask = mod4Mask
     }
 
+  where
+
+    layouts = noBorders Full
+              ||| noBorders (tabbed shrinkText def)
+              ||| smartBorders tiled
+              ||| smartBorders (Mirror tiled)
+    tiled = Tall nmaster delta ratio
+    nmaster = 1 -- The default number of windows in the master pane
+    ratio = 1 / 2 -- Default proportion of screen occupied by master pane
+    delta = 3 / 100 -- Percent of screen to increment by when resizing panes