Move some exports from Control.Monad to Prelude

src/Prelude.hs

@@ -2,20 +2,24 @@
 
 module Prelude
   ( module BasePrelude,
-    head,
+    ByteString.ByteString,
+    Text.Text,
+    Maybe.listToMaybe,
     error,
     errorWithoutStackTrace,
-    undefined,
-    Text.Text,
-    ByteString.ByteString,
+    forever,
+    head,
+    intercalate,
     trace,
     traceId,
     traceShow,
     traceShowId,
     traceM,
     traceShowM,
-    Maybe.listToMaybe,
-    intercalate
+    undefined,
+    unless,
+    void,
+    when
   )
 where
 
@@ -26,6 +30,7 @@ import BasePrelude hiding
     undefined,
   )
 import qualified BasePrelude as P
+import Control.Monad (forever, void, when, unless)
 import qualified Data.ByteString as ByteString
 import qualified Data.Maybe as Maybe
 import qualified Data.Text.Lazy as Text

src/QBar/ControlSocket.hs

@@ -14,7 +14,6 @@ import QBar.Host
 import QBar.Util
 
 import Control.Exception (SomeException, handle)
-import Control.Monad (forever, void, when)
 import Control.Concurrent (forkFinally)
 import Control.Concurrent.Async
 import Data.Aeson (FromJSON, ToJSON)

src/QBar/Core.hs

@@ -12,7 +12,6 @@ import Control.Concurrent.MVar
 import Control.Concurrent.STM.TChan (TChan, writeTChan)
 import Control.Exception (IOException)
 import Control.Lens
-import Control.Monad (forever, when)
 import Control.Monad.Reader (ReaderT, runReaderT, ask)
 import Control.Monad.State (StateT)
 import Control.Monad.Writer (WriterT)

src/QBar/Host.hs

@@ -11,7 +11,6 @@ import Control.Concurrent.Event as Event
 import Control.Concurrent.STM.TChan (TChan, newTChanIO, tryReadTChan)
 import Control.Exception (SomeException, catch)
 import Control.Lens hiding (each, (.=))
-import Control.Monad (when)
 import Control.Monad.STM (atomically)
 import Data.IORef (IORef, newIORef, readIORef, writeIORef)
 import Data.Maybe (catMaybes, mapMaybe)

src/QBar/Server.hs

@@ -11,7 +11,7 @@ import QBar.Pango
 import QBar.Theme
 import QBar.Util
 
-import Control.Monad (when, unless, forM_)
+import Control.Monad (forM_)
 import Control.Concurrent.Async (async, link)
 import Control.Concurrent.Event as Event
 import Control.Concurrent.MVar (MVar, newMVar, modifyMVar, modifyMVar_)

src/QBar/Time.hs

 module QBar.Time (sleepUntil, nextMinute) where
 
 import Control.Concurrent (threadDelay)
-import Control.Monad (when)
 import Data.Time.Clock (UTCTime, getCurrentTime, diffUTCTime, utctDayTime)
 
 sleepUntil :: UTCTime -> IO ()