From caf6dfb8ec9b032017f9bf1675238be3f6179e16 Mon Sep 17 00:00:00 2001
From: Josh Rahm <rahm@google.com>
Date: Fri, 7 Jan 2022 14:59:52 -0700
Subject: Fix fullscreen issues.

---
 src/Internal/Layout.hs | 33 ++++++++++++++++++---------------
 src/Main.hs            |  2 ++
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/Internal/Layout.hs b/src/Internal/Layout.hs
index fed0fd9..a077872 100644
--- a/src/Internal/Layout.hs
+++ b/src/Internal/Layout.hs
@@ -14,31 +14,34 @@ import XMonad.Layout.ThreeColumns
 import XMonad.Layout.Grid
 import XMonad.Layout.Dishes
 import XMonad.Layout.MosaicAlt
+import XMonad.Layout.Fullscreen
 import qualified XMonad.Layout.Dwindle as D
 import XMonad.Layout
 import XMonad.Layout.LayoutModifier
 import XMonad
 import XMonad.Core
+import XMonad.Layout.NoBorders (smartBorders, noBorders)
 
 import qualified Data.Map as M
 import qualified XMonad.StackSet as W
 
 myLayout =
-  avoidStruts $ 
-    spacingRaw True (Border 5 5 5 5) True (Border 5 5 5 5) True $
-      ModifiedLayout (Zoomable False 0.05 0.05) $
-        ModifiedLayout (Flippable False) $
-          ModifiedLayout (HFlippable False) $
-            ModifiedLayout (Rotateable False) $
-              spiral (6/7) |||
-              (Corner (3/4) (3/100) :: Corner Window) |||
-              ModifyDescription TallDescriptionModifier (Tall 1 (3/100) (1/2)) |||
-              ModifyDescription ThreeColDescMod (ThreeCol 1 (3/100) (1/2)) |||
-              Full |||
-              Grid |||
-              Dishes 2 (1/6) |||
-              (MosaicAlt M.empty :: MosaicAlt Window) |||
-              D.Dwindle D.R D.CW 1.5 1.1
+  fullscreenFull $
+    avoidStruts $ 
+      spacingRaw True (Border 5 5 5 5) True (Border 5 5 5 5) True $
+        ModifiedLayout (Zoomable False 0.05 0.05) $
+          ModifiedLayout (Flippable False) $
+            ModifiedLayout (HFlippable False) $
+              ModifiedLayout (Rotateable False) $
+                spiral (6/7) |||
+                (Corner (3/4) (3/100) :: Corner Window) |||
+                ModifyDescription TallDescriptionModifier (Tall 1 (3/100) (1/2)) |||
+                ModifyDescription ThreeColDescMod (ThreeCol 1 (3/100) (1/2)) |||
+                Full |||
+                Grid |||
+                Dishes 2 (1/6) |||
+                (MosaicAlt M.empty :: MosaicAlt Window) |||
+                D.Dwindle D.R D.CW 1.5 1.1
 
 data ModifyDescription m l a = ModifyDescription m (l a)
   deriving (Show, Read)
diff --git a/src/Main.hs b/src/Main.hs
index 2b9baf3..da3b4f1 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,5 +1,6 @@
 import XMonad
 
+import Control.Monad.Trans.Class
 import XMonad.Hooks.ManageDocks (docks)
 import System.Directory (getHomeDirectory)
 import System.FilePath ((</>))
@@ -7,6 +8,7 @@ import XMonad.Hooks.EwmhDesktops (ewmh)
 import XMonad.Hooks.ManageHelpers (isFullscreen, doFullFloat)
 import XMonad.Layout.Fullscreen (fullscreenEventHook)
 import System.Environment (setEnv)
+import Data.Monoid
 
 import Internal.XMobarLog
 import Internal.Keys
-- 
cgit