From 34af6add9dd6122bea9a17674c653b384d74d877 Mon Sep 17 00:00:00 2001
From: Trey Blancher <trey@blancher.net>
Date: Sat, 11 Feb 2023 15:52:28 -0500
Subject: [PATCH] Fixed gaps in single monitor mode, and virtual workspace
 names in logHook

---
 xmonad.hs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xmonad.hs b/xmonad.hs
index 807e460..2da23f7 100755
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -33,10 +33,12 @@ import XMonad.Layout.IM as IM  -- GIMP stuff
 import qualified XMonad.Layout.IndependentScreens as IS
 import XMonad.Layout.LayoutHints (layoutHints)
 import XMonad.Layout.NoBorders (smartBorders, noBorders)
+import XMonad.Layout.PerScreen
 import XMonad.Layout.PerWorkspace
 import XMonad.Layout.Reflect  -- GIMP stuff
 import XMonad.Layout.ResizableTile
 import XMonad.Layout.SimpleFloat
+import XMonad.Layout.Spacing
 import XMonad.Layout.Tabbed
 import XMonad.Layout.TrackFloating  -- GIMP stuff
 
@@ -299,6 +301,7 @@ main = do  sc <- IS.countScreens
                 , manageHook = manageDocks <+> myManageHook -- <+> manageHook desktopConfig
                 , handleEventHook = handleEventHook desktopConfig
                 , layoutHook = avoidStruts $ gaps [(D,108)] $ layoutH 
+                --, layoutHook = avoidStruts $ layoutH 
                 , logHook = myLogHook dzenTopBar >> fadeHook >> updatePointer (0.5, 0.5) (0, 0)
                 , borderWidth = 1
                 , normalBorderColor = "#282828"
@@ -352,7 +355,7 @@ myBitmapsDir = "/home/trey/.xmonad/dzen2"
 
 myLogHook :: Handle -> X ()
 --myLogHook h = dynamicLogWithPP $ defaultPP 
-myLogHook h = dynamicLogWithPP $ def
+myLogHook h = dynamicLogWithPP $ IS.marshallPP (S 0) $ def
     {
         ppCurrent             =   dzenColor "#8AE234" "#282828" . pad
         , ppVisible           =   dzenColor "#555753" "#282828" . pad
@@ -460,6 +463,7 @@ myKeys =    [
                                                         spawnHere "pkill trayer"
                                                         sendMessage $ ToggleStruts
                                                         sendMessage $ ToggleGaps)
+                                                        --sendMessage $ ToggleStruts)
   , ((lAlt ,        xK_g),                          spawnHere "~/bin/google_selection.sh")
   --, ((winKey ,                                            xK_g),                                              ifWindows (className =? "Google-chrome") (mapM_ focus) (spawnHere "google-chrome"))
   , ((winKey ,                                            xK_g), do