diff --git a/qbar/src/QBar/BlockHelper.hs b/qbar/src/QBar/BlockHelper.hs index 8d512741355f83e52969905c9d2404c9502ae264..102ec89a440216459fa49ad07e8dd6d3bcd7ee54 100644 --- a/qbar/src/QBar/BlockHelper.hs +++ b/qbar/src/QBar/BlockHelper.hs @@ -23,7 +23,7 @@ import QBar.Prelude import QBar.Time import Control.Concurrent.Async -import qualified Control.Concurrent.Event as Event +import Control.Concurrent.Event qualified as Event import Control.Concurrent.STM.TChan import Control.Concurrent.STM.TVar import Control.Monad.Reader (ReaderT) diff --git a/qbar/src/QBar/BlockOutput.hs b/qbar/src/QBar/BlockOutput.hs index 6f28926c07b8575c4e8f4f31b95c3d83f2a49250..26bdec8d96614078a8582d611fa223716e907025 100644 --- a/qbar/src/QBar/BlockOutput.hs +++ b/qbar/src/QBar/BlockOutput.hs @@ -45,7 +45,7 @@ import QBar.Prelude import Control.Lens import Data.Aeson import Data.Int (Int64) -import qualified Data.Text.Lazy as T +import Data.Text.Lazy qualified as T import GHC.Generics diff --git a/qbar/src/QBar/Blocks.hs b/qbar/src/QBar/Blocks.hs index 03db1c674330da7400a01b817e12bb54e80b070f..0fb55d9f58dd1509f68c56db8ee73e9e5791619f 100644 --- a/qbar/src/QBar/Blocks.hs +++ b/qbar/src/QBar/Blocks.hs @@ -12,11 +12,11 @@ module QBar.Blocks ( QBar.Blocks.Squeekboard.squeekboardBlock, ) where -import qualified QBar.Blocks.Battery -import qualified QBar.Blocks.CpuUsage -import qualified QBar.Blocks.Date -import qualified QBar.Blocks.DiskUsage -import qualified QBar.Blocks.NetworkManager -import qualified QBar.Blocks.Qubes -import qualified QBar.Blocks.Script -import qualified QBar.Blocks.Squeekboard +import QBar.Blocks.Battery qualified +import QBar.Blocks.CpuUsage qualified +import QBar.Blocks.Date qualified +import QBar.Blocks.DiskUsage qualified +import QBar.Blocks.NetworkManager qualified +import QBar.Blocks.Qubes qualified +import QBar.Blocks.Script qualified +import QBar.Blocks.Squeekboard qualified diff --git a/qbar/src/QBar/Blocks/Battery.hs b/qbar/src/QBar/Blocks/Battery.hs index 302fe4061ba8b91f21023732a6698ad01b51753f..3779bbc5be5ea2de7382aed9572afeaf5eb19326 100644 --- a/qbar/src/QBar/Blocks/Battery.hs +++ b/qbar/src/QBar/Blocks/Battery.hs @@ -10,8 +10,8 @@ import QBar.Prelude import Control.Lens import Data.Maybe (catMaybes, mapMaybe) -import qualified Data.Text.Lazy as T -import qualified Data.Text.Lazy.IO as TIO +import Data.Text.Lazy qualified as T +import Data.Text.Lazy.IO qualified as TIO import System.Directory data BatteryStatus = BatteryCharging | BatteryDischarging | BatteryOther diff --git a/qbar/src/QBar/Blocks/CpuUsage.hs b/qbar/src/QBar/Blocks/CpuUsage.hs index a3ffb0ad680cbda831fb83d08c299c560b71c454..ad54bc9d1912d7c2cb7be1e1b4118c3f9a63ff78 100644 --- a/qbar/src/QBar/Blocks/CpuUsage.hs +++ b/qbar/src/QBar/Blocks/CpuUsage.hs @@ -13,8 +13,8 @@ import QBar.Prelude import Control.Applicative ((<|>)) import Control.Lens import Control.Monad.State (StateT, evalStateT, lift) -import qualified Data.Attoparsec.Text.Lazy as AT -import qualified Data.Text.Lazy as T +import Data.Attoparsec.Text.Lazy qualified as AT +import Data.Text.Lazy qualified as T {- For time accounting the guest fields need to be ignored according to the kernel source code diff --git a/qbar/src/QBar/Blocks/Date.hs b/qbar/src/QBar/Blocks/Date.hs index dcafa7e8b6389b51f504ea735ff34cf2bf644c09..29d46fe576e2f3437cf71da749ce47f7836e8ae2 100644 --- a/qbar/src/QBar/Blocks/Date.hs +++ b/qbar/src/QBar/Blocks/Date.hs @@ -8,9 +8,9 @@ import QBar.Core import QBar.Prelude import QBar.Time -import qualified Data.Text.Lazy as T import Data.Time.Format import Data.Time.LocalTime +import Data.Text.Lazy qualified as T dateBlock :: Block diff --git a/qbar/src/QBar/Blocks/DiskUsage.hs b/qbar/src/QBar/Blocks/DiskUsage.hs index c6247786c123c2d51fe89237747c66a6b8297117..2417f35dcb971130ef5067b83192bb6a19056c81 100644 --- a/qbar/src/QBar/Blocks/DiskUsage.hs +++ b/qbar/src/QBar/Blocks/DiskUsage.hs @@ -7,9 +7,9 @@ import QBar.BlockOutput import QBar.Core import QBar.Prelude -import qualified Data.ByteString.Lazy.Char8 as C8 -import qualified Data.Text.Lazy as T -import qualified Data.Text.Lazy.Encoding as T +import Data.ByteString.Lazy.Char8 qualified as C8 +import Data.Text.Lazy qualified as T +import Data.Text.Lazy.Encoding qualified as T import System.Exit import System.Process.Typed (shell, readProcessStdout) diff --git a/qbar/src/QBar/Blocks/NetworkManager.hs b/qbar/src/QBar/Blocks/NetworkManager.hs index 6aa7c15f7aeb3322e36e57c8eba8dc6bf0a1602f..dd9eeb5d08aa4780aa35af50e99835323c7bfab5 100644 --- a/qbar/src/QBar/Blocks/NetworkManager.hs +++ b/qbar/src/QBar/Blocks/NetworkManager.hs @@ -5,10 +5,10 @@ module QBar.Blocks.NetworkManager ( ) where import Control.Monad.Except (ExceptT, MonadError, runExceptT, throwError) -import qualified DBus -import qualified DBus.Client as DBus -import qualified Data.Map as Map -import qualified Data.Text.Lazy as T +import DBus qualified +import DBus.Client qualified as DBus +import Data.Map qualified as Map +import Data.Text.Lazy qualified as T import Data.Word (Word32, Word8) import QBar.BlockHelper import QBar.BlockOutput diff --git a/qbar/src/QBar/Blocks/Pipe.hs b/qbar/src/QBar/Blocks/Pipe.hs index 9643d25e5993e5af341e20ab1c1cbfaa39baaeb8..f485be37c4da4b1f62491cf8db0fbe4fdc4edc15 100644 --- a/qbar/src/QBar/Blocks/Pipe.hs +++ b/qbar/src/QBar/Blocks/Pipe.hs @@ -9,11 +9,11 @@ import QBar.TagParser import Control.Concurrent.Async import Data.Aeson (encode) -import qualified Data.ByteString.Lazy.Char8 as BSC -import qualified Data.Text.Lazy as T +import Data.ByteString.Lazy.Char8 qualified as BSC +import Data.Text.Lazy qualified as T import Pipes import Pipes.Concurrent -import qualified Pipes.Prelude as PP +import Pipes.Prelude qualified as PP import System.IO runPipeClient :: Bool -> MainOptions -> IO () diff --git a/qbar/src/QBar/Blocks/Qubes.hs b/qbar/src/QBar/Blocks/Qubes.hs index 14dd6d4883511d38ee4dc1202f9eb24a0d50d820..45c88a9aed096be5dbf6647854fdb52c00a97d01 100644 --- a/qbar/src/QBar/Blocks/Qubes.hs +++ b/qbar/src/QBar/Blocks/Qubes.hs @@ -8,13 +8,24 @@ import QBar.BlockHelper import QBar.BlockOutput import QBar.Core import QBar.Prelude -import QBar.Qubes.AdminAPI (qubesUsageOfDefaultPool, qubesMonitorProperty, qubesGetProperty, qubesEvents, QubesPropertyInfo (..), qubesListVMs, qubesListVMsP, QubesVMState (..), vmState) +import QBar.Qubes.AdminAPI ( + QubesPropertyInfo(..), + QubesVMState(..), + QubesVMInfo(..), + qubesEvents, + qubesGetProperty, + qubesListVMs, + qubesListVMsP, + qubesMonitorProperty, + qubesUsageOfDefaultPool, + vmState, + ) -import qualified Data.ByteString.Lazy as BL -import qualified Data.Map as M -import qualified Data.Text.Lazy as T -import Data.Text.Lazy.Encoding (decodeUtf8With) +import Data.ByteString.Lazy qualified as BL +import Data.Map qualified as M import Data.Text.Encoding.Error (lenientDecode) +import Data.Text.Lazy qualified as T +import Data.Text.Lazy.Encoding (decodeUtf8With) import Pipes as P import Pipes.Core as P diff --git a/qbar/src/QBar/Blocks/Script.hs b/qbar/src/QBar/Blocks/Script.hs index 37b799ef48fb143117554a2fdca3e6a74fc64089..3f5d2ac7f243e953e318d00bd446c1f914d21508 100644 --- a/qbar/src/QBar/Blocks/Script.hs +++ b/qbar/src/QBar/Blocks/Script.hs @@ -10,21 +10,34 @@ import QBar.Prelude import QBar.TagParser import QBar.Time -import Control.Exception (IOException, handle) import Control.Concurrent (threadDelay) import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar) +import Control.Exception (IOException, handle) import Data.Aeson (encode) -import qualified Data.ByteString.Lazy.Char8 as C8 -import qualified Data.Text.Lazy as T -import qualified Data.Text.Lazy.Encoding as E -import qualified Data.Text.Lazy.IO as TIO +import Data.ByteString.Lazy.Char8 qualified as C8 +import Data.Text.Lazy qualified as T +import Data.Text.Lazy.Encoding qualified as E +import Data.Text.Lazy.IO qualified as TIO import Pipes import Pipes.Safe (catchP) import System.Exit import System.IO hiding (stdin, stdout) import System.IO.Error (isEOFError) -import System.Process.Typed (Process, shell, setStdin, setStdout, - getStdin, getStdout, closed, createPipe, readProcessStdout, startProcess, stopProcess, getExitCode) +import System.Process.Typed ( + Process, + ProcessConfig, + closed, + createPipe, + getExitCode, + getStdin, + getStdout, + readProcessStdout, + setStdin, + setStdout, + shell, + startProcess, + stopProcess, + ) pollScriptBlock :: Interval -> FilePath -> Block diff --git a/qbar/src/QBar/Blocks/Squeekboard.hs b/qbar/src/QBar/Blocks/Squeekboard.hs index 3b8262e80ba26f8917eaed2aa9eedc6097a0df1e..b96b0690576f169837fc7fcbbb23ced742808049 100644 --- a/qbar/src/QBar/Blocks/Squeekboard.hs +++ b/qbar/src/QBar/Blocks/Squeekboard.hs @@ -2,18 +2,19 @@ module QBar.Blocks.Squeekboard ( squeekboardBlock, ) where -import Control.Monad.Except (MonadError) -import Data.Either (isRight) -import qualified DBus -import qualified DBus.Client as DBus -import DBus.Internal.Message (signalBody) -import Pipes.Core import QBar.BlockHelper import QBar.BlockOutput import QBar.Blocks.NetworkManager (getDBusProperty, runExceptT_) import QBar.Core import QBar.Prelude +import Control.Monad.Except (MonadError) +import DBus qualified +import DBus.Client qualified as DBus +import DBus.Internal.Message (signalBody) +import Data.Either (isRight) +import Pipes.Core + squeekboardBlock :: Bool -> Block squeekboardBlock autoHide = runSignalBlockConfiguration $ SignalBlockConfiguration { aquire, diff --git a/qbar/src/QBar/Blocks/Utils.hs b/qbar/src/QBar/Blocks/Utils.hs index 2a3b3be70c342984a9c43a8b4da5fd2f05a7e7c2..23c04992d80610959bc44eee0ff6ad6bd3a9d521 100644 --- a/qbar/src/QBar/Blocks/Utils.hs +++ b/qbar/src/QBar/Blocks/Utils.hs @@ -9,9 +9,9 @@ module QBar.Blocks.Utils ( import QBar.Prelude import Control.Exception (SomeException, catch) -import qualified Data.Attoparsec.Text.Lazy as AT -import qualified Data.Text.Lazy as T -import qualified Data.Text.Lazy.IO as TIO +import Data.Attoparsec.Text.Lazy qualified as AT +import Data.Text.Lazy qualified as T +import Data.Text.Lazy.IO qualified as TIO import Numeric (showFFloat) formatFloatN :: RealFloat a => Int -> a -> T.Text diff --git a/qbar/src/QBar/Cli.hs b/qbar/src/QBar/Cli.hs index 900eabfa1b0eae0e9f669ef6dcd6ad095e41fa1e..26a9d9bbe4ca1589db66224b1dfdfa24244d600b 100644 --- a/qbar/src/QBar/Cli.hs +++ b/qbar/src/QBar/Cli.hs @@ -10,14 +10,14 @@ import QBar.ControlSocket import QBar.Core import QBar.DefaultConfig import QBar.Prelude +import QBar.Qubes.AdminAPI (printEvents, qubesVMStats, qubesEvents) import QBar.Server import QBar.Theme import QBar.Time -import QBar.Qubes.AdminAPI (printEvents, qubesVMStats, qubesEvents) import Control.Monad (join) import Data.Maybe (fromMaybe) -import qualified Data.Text.Lazy as T +import Data.Text.Lazy qualified as T import Development.GitRev import Options.Applicative diff --git a/qbar/src/QBar/Color.hs b/qbar/src/QBar/Color.hs index fa45c5497c2173e3cd583272b1c532a8bfbbe973..806803a15d523728ab27cc97768bb2386251a687 100644 --- a/qbar/src/QBar/Color.hs +++ b/qbar/src/QBar/Color.hs @@ -7,11 +7,12 @@ module QBar.Color ( import QBar.Prelude import Data.Aeson +import Data.Aeson.Types qualified as AT +import Data.Attoparsec.Text.Lazy as A import Data.Bits ((.|.), shiftL) import Data.Char (ord) -import Data.Attoparsec.Text.Lazy as A import Data.Colour.RGBSpace -import qualified Data.Text.Lazy as T +import Data.Text.Lazy qualified as T import Numeric (showHex) data Color = ColorRGB (RGB Double) | ColorRGBA (RGB Double) Double diff --git a/qbar/src/QBar/ControlSocket.hs b/qbar/src/QBar/ControlSocket.hs index 989923559032f4dacd717593c496f28a547b0f1a..80ee0204b29862a4a7b12063393e29afbc8c26da 100644 --- a/qbar/src/QBar/ControlSocket.hs +++ b/qbar/src/QBar/ControlSocket.hs @@ -24,22 +24,22 @@ import Control.Concurrent (forkFinally) import Control.Concurrent.Async import Control.Exception (SomeException, IOException, handle, onException) import Data.Aeson (FromJSON, ToJSON) -import qualified Data.ByteString as BS -import qualified Data.ByteString.Char8 as BSC +import Data.ByteString qualified as BS +import Data.ByteString.Char8 qualified as BSC import Data.Text.Lazy (pack) +import Data.Text.Lazy qualified as T +import Data.Text.Lazy.IO qualified as T import Data.Time.Clock (getCurrentTime, addUTCTime) -import qualified Data.Text.Lazy as T -import qualified Data.Text.Lazy.IO as T import GHC.Generics import Network.Socket import Pipes -import Pipes.Concurrent as PC (Output, spawn, spawn', unbounded, newest, toOutput, fromInput, send, atomically) -import Pipes.Parse -import qualified Pipes.Prelude as PP -import Pipes.Safe (catch) import Pipes.Aeson (decode, DecodingError) import Pipes.Aeson.Unchecked (encode) +import Pipes.Concurrent as PC (Output, spawn, spawn', unbounded, newest, toOutput, fromInput, send, atomically) import Pipes.Network.TCP (fromSocket, toSocket) +import Pipes.Parse +import Pipes.Prelude qualified as PP +import Pipes.Safe (catch) import System.Directory (removeFile, doesFileExist) import System.Environment (getEnv) import System.Exit (exitSuccess) diff --git a/qbar/src/QBar/Core.hs b/qbar/src/QBar/Core.hs index 92f7b67f6fe64d50e64dae8beb30b348e31d2bb0..5ccc60cbf38e0688071d78718ab9bf36fdb8b0d7 100644 --- a/qbar/src/QBar/Core.hs +++ b/qbar/src/QBar/Core.hs @@ -47,7 +47,7 @@ import QBar.Time import QBar.Utils import Control.Concurrent.Async -import qualified Control.Concurrent.Event as Event +import Control.Concurrent.Event qualified as Event import Control.Concurrent.MVar import Control.Concurrent.STM.TChan import Control.Lens @@ -57,12 +57,12 @@ import Control.Monad.Writer (WriterT) import Data.Aeson import Data.Int (Int64) import Data.Maybe (fromMaybe) -import qualified Data.Text.Lazy as T +import Data.Text.Lazy qualified as T import GHC.Generics import Pipes import Pipes.Concurrent +import Pipes.Prelude qualified as PP import Pipes.Safe (SafeT, runSafeT) -import qualified Pipes.Prelude as PP data MainOptions = MainOptions { verbose :: Bool, diff --git a/qbar/src/QBar/Host.hs b/qbar/src/QBar/Host.hs index 75f01fd41f78cc7cfa15492797a28d84b6f91bab..4bfa6f1bb26fc2517f7e79d7eb839bed1cec5a8a 100644 --- a/qbar/src/QBar/Host.hs +++ b/qbar/src/QBar/Host.hs @@ -18,7 +18,7 @@ import QBar.Utils import Control.Concurrent (forkIO, forkFinally, threadDelay) import Control.Concurrent.Async (async, wait, waitAny) -import qualified Control.Concurrent.Event as Event +import Control.Concurrent.Event qualified as Event import Control.Concurrent.MVar import Control.Concurrent.STM.TChan import Control.Exception (SomeException, catch, fromException) @@ -26,7 +26,7 @@ import Control.Lens hiding (each, (.=)) import Control.Monad.STM (atomically) import Data.IORef (IORef, newIORef, readIORef, writeIORef) import Data.Maybe (catMaybes, mapMaybe) -import qualified Data.Text.Lazy as T +import Data.Text.Lazy qualified as T import Pipes import Pipes.Concurrent (spawn, unbounded, toOutput, fromInput) import System.Exit (ExitCode, exitWith) diff --git a/qbar/src/QBar/Prelude.hs b/qbar/src/QBar/Prelude.hs index 5fcd403aedf0ae294958e70607d179d0c9192fa2..ff966db660225353fae1fa6c9fed2de9ee0e1097 100644 --- a/qbar/src/QBar/Prelude.hs +++ b/qbar/src/QBar/Prelude.hs @@ -33,15 +33,15 @@ import Prelude hiding head, undefined, ) -import qualified Prelude as P -import qualified Control.Monad import Control.Monad ((>=>), (<=<)) -import qualified Control.Monad.IO.Class -import qualified Data.ByteString as ByteString -import qualified Data.Maybe as Maybe -import qualified Data.Text.Lazy as Text -import qualified Debug.Trace as Trace -import qualified GHC.Stack.Types +import Control.Monad qualified +import Control.Monad.IO.Class qualified +import Data.ByteString qualified as ByteString +import Data.Maybe qualified as Maybe +import Data.Text.Lazy qualified as Text +import Debug.Trace qualified as Trace +import GHC.Stack.Types +import Prelude qualified as P {-# DEPRECATED head "Partial Function." #-} head :: [a] -> a diff --git a/qbar/src/QBar/Qubes/AdminAPI.hs b/qbar/src/QBar/Qubes/AdminAPI.hs index 649779dbe03a30ffa5761376e2ea444e9ab1b1c1..375fe47a02f7f0007f5cb1e9c2ffe668ddd74516 100644 --- a/qbar/src/QBar/Qubes/AdminAPI.hs +++ b/qbar/src/QBar/Qubes/AdminAPI.hs @@ -21,18 +21,18 @@ import Control.Monad (forM_, guard) import Data.Binary import Data.Binary.Get import Data.Binary.Put -import qualified Data.ByteString as BS -import qualified Data.ByteString.Lazy as BL -import qualified Data.ByteString.Lazy.Char8 as BLC +import Data.ByteString qualified as BS +import Data.ByteString.Lazy qualified as BL +import Data.ByteString.Lazy.Char8 qualified as BLC import Data.Char (isAlphaNum) import Data.Function ((&)) -import qualified Data.Map as Map +import Data.Map qualified as Map import Data.Maybe (fromMaybe) import Network.HostName import Numeric (showHex, readHex) import Pipes -import qualified Pipes.Prelude as P -import qualified Pipes.Safe as P +import Pipes.Prelude qualified as P +import Pipes.Safe qualified as P import System.IO (Handle, hSetBinaryMode) import System.Process.Typed import Text.Read (readMaybe) diff --git a/qbar/src/QBar/Server.hs b/qbar/src/QBar/Server.hs index bd1821353bcbd4927f071b4215e168138703bf4f..73c6f9ca2a6c95326e30a4ace68762effa2e15de 100644 --- a/qbar/src/QBar/Server.hs +++ b/qbar/src/QBar/Server.hs @@ -4,29 +4,30 @@ module QBar.Server ( ) where import QBar.BlockOutput -import QBar.Core import QBar.ControlSocket +import QBar.Core import QBar.Host -import QBar.Prelude import QBar.Pango +import QBar.Prelude import QBar.Theme import QBar.Utils -import Control.Monad (forM_) import Control.Concurrent.Async (async, link) import Control.Concurrent.Event as Event import Control.Concurrent.MVar (MVar, newMVar, modifyMVar, modifyMVar_) import Control.Exception (throw) +import Control.Monad (forM_) import Data.Aeson (encode, decode, ToJSON, toJSON, object, (.=)) +import Data.Aeson.Types qualified as AT +import Data.ByteString.Char8 qualified as BSSC8 import Data.ByteString.Lazy (hPut) -import qualified Data.ByteString.Char8 as BSSC8 -import qualified Data.ByteString.Lazy as BS -import qualified Data.ByteString.Lazy.Char8 as C8 +import Data.ByteString.Lazy qualified as BS +import Data.ByteString.Lazy.Char8 qualified as C8 import Data.Maybe (fromMaybe) -import qualified Data.Text.Lazy as T +import Data.Text.Lazy qualified as T import Pipes import Pipes.Concurrent (Input, spawn, latest, toOutput, fromInput) -import qualified Pipes.Prelude as PP +import Pipes.Prelude qualified as PP import System.IO (stdin, stdout, stderr, hFlush) data ServerMode = Host | Mirror diff --git a/qbar/src/QBar/TagParser.hs b/qbar/src/QBar/TagParser.hs index 0ec71d3e79eb3884d9229df692dff14ecbcc3f12..f029a097a9edcf7e000ea2eb0add5e089f24499d 100644 --- a/qbar/src/QBar/TagParser.hs +++ b/qbar/src/QBar/TagParser.hs @@ -13,8 +13,8 @@ import Control.Applicative ((<|>)) import Data.Attoparsec.Text.Lazy as A import Data.Functor (($>)) import Data.Maybe (catMaybes) -import qualified Data.Text as TS -import qualified Data.Text.Lazy as T +import Data.Text qualified as TS +import Data.Text.Lazy qualified as T type TagState = (Bool, Importance) diff --git a/qbar/src/QBar/Theme.hs b/qbar/src/QBar/Theme.hs index d1c20a928517cf3b63bd4e8e2099cb5aa815511e..cf70679f16bf8454725236e1ba4f6262c46560c8 100644 --- a/qbar/src/QBar/Theme.hs +++ b/qbar/src/QBar/Theme.hs @@ -22,9 +22,9 @@ import Control.Lens ((^.)) import Control.Monad.State.Lazy (State, evalState, get, put) import Data.Colour.RGBSpace import Data.Colour.RGBSpace.HSV (hsv) -import qualified Data.HashMap.Lazy as HM +import Data.HashMap.Lazy qualified as HM import Data.Maybe (fromMaybe) -import qualified Data.Text.Lazy as T +import Data.Text.Lazy qualified as T import Data.Time.Clock.POSIX (getPOSIXTime) import Pipes diff --git a/qbar/src/QBar/Time.hs b/qbar/src/QBar/Time.hs index af315a234cc56a9f9cb62d2875af90bd75711b7a..2a97cd15030f8c34fc2de02f1fb91facb2f0fcfb 100644 --- a/qbar/src/QBar/Time.hs +++ b/qbar/src/QBar/Time.hs @@ -18,11 +18,11 @@ module QBar.Time ( import QBar.Prelude import Control.Concurrent.Async +import Control.Concurrent.Event qualified as Event import Control.Concurrent.MVar -import qualified Control.Concurrent.Event as Event -import Data.Time.Clock (UTCTime, getCurrentTime, diffUTCTime, utctDayTime, addUTCTime) -import Data.SortedList (SortedList, toSortedList, fromSortedList, singleton, partition, insert) import Data.Ord (comparing) +import Data.SortedList (SortedList, toSortedList, fromSortedList, singleton, partition, insert) +import Data.Time.Clock (UTCTime, getCurrentTime, diffUTCTime, utctDayTime, addUTCTime) newtype Interval = IntervalSeconds Integer deriving (Read, Show) diff --git a/qbar/src/QBar/Utils.hs b/qbar/src/QBar/Utils.hs index b5442e67eeef3e2d9b876f47e2ea13513c0133d4..ca6848f6578c4cbf2e4013e77ae96e77c3272de7 100644 --- a/qbar/src/QBar/Utils.hs +++ b/qbar/src/QBar/Utils.hs @@ -12,7 +12,7 @@ import Control.Concurrent.STM (atomically) import Control.Concurrent.STM.TChan import Control.Concurrent.STM.TVar import Control.Monad (replicateM) -import qualified Data.Text.Lazy as T +import Data.Text.Lazy qualified as T import Pipes import System.Random