From b80d487285cf7dd05075de4dc2fa669a703016b0 Mon Sep 17 00:00:00 2001
From: Josh Rahm <joshuarahm@gmail.com>
Date: Sun, 24 Apr 2022 21:06:10 -0600
Subject: Roll Windows.hs into R.D.StackSet

---
 src/Rahm/Desktop/Layout/ConsistentMosaic.hs | 3 +--
 src/Rahm/Desktop/Layout/Hole.hs             | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/Rahm/Desktop/Layout')

diff --git a/src/Rahm/Desktop/Layout/ConsistentMosaic.hs b/src/Rahm/Desktop/Layout/ConsistentMosaic.hs
index 0a6215a..3dbc44c 100644
--- a/src/Rahm/Desktop/Layout/ConsistentMosaic.hs
+++ b/src/Rahm/Desktop/Layout/ConsistentMosaic.hs
@@ -13,7 +13,6 @@ import Data.Maybe (mapMaybe)
 
 import XMonad.Layout.MosaicAlt
 
-import Rahm.Desktop.Windows
 import Rahm.Desktop.Logger
 
 
@@ -40,7 +39,7 @@ instance (LayoutClass l a, Show a, Ord a, Enum a, Num a) => LayoutClass (MosaicW
 
   runLayout (W.Workspace t (MosaicWrap l) (id -> Just s)) rect = do
     let zs = zipStack [100..] s
-        s' = mapStack fst zs
+        s' = fmap fst zs
         m = Map.fromList (W.integrate zs)
 
     (rects, maybeNewLayout) <- runLayout (W.Workspace t l (Just s')) rect
diff --git a/src/Rahm/Desktop/Layout/Hole.hs b/src/Rahm/Desktop/Layout/Hole.hs
index f6632d5..fe48340 100644
--- a/src/Rahm/Desktop/Layout/Hole.hs
+++ b/src/Rahm/Desktop/Layout/Hole.hs
@@ -3,11 +3,10 @@
 -- Delegates to a lower layout, but leaves a hole where the next window will go.
 module Rahm.Desktop.Layout.Hole (hole, toggleHole) where
 
-import qualified Rahm.Desktop.StackSet as W
 import XMonad
 import Data.Maybe (mapMaybe)
 
-import Rahm.Desktop.Windows
+import qualified Rahm.Desktop.StackSet as W
 
 data Hole (l :: * -> *) (a :: *) = Hole Bool (l a)
 
-- 
cgit