Skip to content
Snippets Groups Projects
Commit d7213c90 authored by jktr's avatar jktr
Browse files

Apply ImportQualifiedPost transformation

parent 4f97166d
No related branches found
No related tags found
1 merge request!8bump deps and build tooling
Showing
with 103 additions and 77 deletions
...@@ -23,7 +23,7 @@ import QBar.Prelude ...@@ -23,7 +23,7 @@ import QBar.Prelude
import QBar.Time import QBar.Time
import Control.Concurrent.Async 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.TChan
import Control.Concurrent.STM.TVar import Control.Concurrent.STM.TVar
import Control.Monad.Reader (ReaderT) import Control.Monad.Reader (ReaderT)
......
...@@ -45,7 +45,7 @@ import QBar.Prelude ...@@ -45,7 +45,7 @@ import QBar.Prelude
import Control.Lens import Control.Lens
import Data.Aeson import Data.Aeson
import Data.Int (Int64) import Data.Int (Int64)
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
import GHC.Generics import GHC.Generics
......
...@@ -12,11 +12,11 @@ module QBar.Blocks ( ...@@ -12,11 +12,11 @@ module QBar.Blocks (
QBar.Blocks.Squeekboard.squeekboardBlock, QBar.Blocks.Squeekboard.squeekboardBlock,
) where ) where
import qualified QBar.Blocks.Battery import QBar.Blocks.Battery qualified
import qualified QBar.Blocks.CpuUsage import QBar.Blocks.CpuUsage qualified
import qualified QBar.Blocks.Date import QBar.Blocks.Date qualified
import qualified QBar.Blocks.DiskUsage import QBar.Blocks.DiskUsage qualified
import qualified QBar.Blocks.NetworkManager import QBar.Blocks.NetworkManager qualified
import qualified QBar.Blocks.Qubes import QBar.Blocks.Qubes qualified
import qualified QBar.Blocks.Script import QBar.Blocks.Script qualified
import qualified QBar.Blocks.Squeekboard import QBar.Blocks.Squeekboard qualified
...@@ -10,8 +10,8 @@ import QBar.Prelude ...@@ -10,8 +10,8 @@ import QBar.Prelude
import Control.Lens import Control.Lens
import Data.Maybe (catMaybes, mapMaybe) import Data.Maybe (catMaybes, mapMaybe)
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
import qualified Data.Text.Lazy.IO as TIO import Data.Text.Lazy.IO qualified as TIO
import System.Directory import System.Directory
data BatteryStatus = BatteryCharging | BatteryDischarging | BatteryOther data BatteryStatus = BatteryCharging | BatteryDischarging | BatteryOther
......
...@@ -13,8 +13,8 @@ import QBar.Prelude ...@@ -13,8 +13,8 @@ import QBar.Prelude
import Control.Applicative ((<|>)) import Control.Applicative ((<|>))
import Control.Lens import Control.Lens
import Control.Monad.State (StateT, evalStateT, lift) import Control.Monad.State (StateT, evalStateT, lift)
import qualified Data.Attoparsec.Text.Lazy as AT import Data.Attoparsec.Text.Lazy qualified as AT
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
{- {-
For time accounting the guest fields need to be ignored according to the kernel source code For time accounting the guest fields need to be ignored according to the kernel source code
......
...@@ -8,9 +8,9 @@ import QBar.Core ...@@ -8,9 +8,9 @@ import QBar.Core
import QBar.Prelude import QBar.Prelude
import QBar.Time import QBar.Time
import qualified Data.Text.Lazy as T
import Data.Time.Format import Data.Time.Format
import Data.Time.LocalTime import Data.Time.LocalTime
import Data.Text.Lazy qualified as T
dateBlock :: Block dateBlock :: Block
......
...@@ -7,9 +7,9 @@ import QBar.BlockOutput ...@@ -7,9 +7,9 @@ import QBar.BlockOutput
import QBar.Core import QBar.Core
import QBar.Prelude import QBar.Prelude
import qualified Data.ByteString.Lazy.Char8 as C8 import Data.ByteString.Lazy.Char8 qualified as C8
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
import qualified Data.Text.Lazy.Encoding as T import Data.Text.Lazy.Encoding qualified as T
import System.Exit import System.Exit
import System.Process.Typed (shell, readProcessStdout) import System.Process.Typed (shell, readProcessStdout)
......
...@@ -5,10 +5,10 @@ module QBar.Blocks.NetworkManager ( ...@@ -5,10 +5,10 @@ module QBar.Blocks.NetworkManager (
) where ) where
import Control.Monad.Except (ExceptT, MonadError, runExceptT, throwError) import Control.Monad.Except (ExceptT, MonadError, runExceptT, throwError)
import qualified DBus import DBus qualified
import qualified DBus.Client as DBus import DBus.Client qualified as DBus
import qualified Data.Map as Map import Data.Map qualified as Map
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
import Data.Word (Word32, Word8) import Data.Word (Word32, Word8)
import QBar.BlockHelper import QBar.BlockHelper
import QBar.BlockOutput import QBar.BlockOutput
......
...@@ -9,11 +9,11 @@ import QBar.TagParser ...@@ -9,11 +9,11 @@ import QBar.TagParser
import Control.Concurrent.Async import Control.Concurrent.Async
import Data.Aeson (encode) import Data.Aeson (encode)
import qualified Data.ByteString.Lazy.Char8 as BSC import Data.ByteString.Lazy.Char8 qualified as BSC
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
import Pipes import Pipes
import Pipes.Concurrent import Pipes.Concurrent
import qualified Pipes.Prelude as PP import Pipes.Prelude qualified as PP
import System.IO import System.IO
runPipeClient :: Bool -> MainOptions -> IO () runPipeClient :: Bool -> MainOptions -> IO ()
......
...@@ -8,13 +8,24 @@ import QBar.BlockHelper ...@@ -8,13 +8,24 @@ import QBar.BlockHelper
import QBar.BlockOutput import QBar.BlockOutput
import QBar.Core import QBar.Core
import QBar.Prelude 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 Data.ByteString.Lazy qualified as BL
import qualified Data.Map as M import Data.Map qualified as M
import qualified Data.Text.Lazy as T
import Data.Text.Lazy.Encoding (decodeUtf8With)
import Data.Text.Encoding.Error (lenientDecode) 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 as P
import Pipes.Core as P import Pipes.Core as P
......
...@@ -10,21 +10,34 @@ import QBar.Prelude ...@@ -10,21 +10,34 @@ import QBar.Prelude
import QBar.TagParser import QBar.TagParser
import QBar.Time import QBar.Time
import Control.Exception (IOException, handle)
import Control.Concurrent (threadDelay) import Control.Concurrent (threadDelay)
import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar) import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar)
import Control.Exception (IOException, handle)
import Data.Aeson (encode) import Data.Aeson (encode)
import qualified Data.ByteString.Lazy.Char8 as C8 import Data.ByteString.Lazy.Char8 qualified as C8
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
import qualified Data.Text.Lazy.Encoding as E import Data.Text.Lazy.Encoding qualified as E
import qualified Data.Text.Lazy.IO as TIO import Data.Text.Lazy.IO qualified as TIO
import Pipes import Pipes
import Pipes.Safe (catchP) import Pipes.Safe (catchP)
import System.Exit import System.Exit
import System.IO hiding (stdin, stdout) import System.IO hiding (stdin, stdout)
import System.IO.Error (isEOFError) import System.IO.Error (isEOFError)
import System.Process.Typed (Process, shell, setStdin, setStdout, import System.Process.Typed (
getStdin, getStdout, closed, createPipe, readProcessStdout, startProcess, stopProcess, getExitCode) Process,
ProcessConfig,
closed,
createPipe,
getExitCode,
getStdin,
getStdout,
readProcessStdout,
setStdin,
setStdout,
shell,
startProcess,
stopProcess,
)
pollScriptBlock :: Interval -> FilePath -> Block pollScriptBlock :: Interval -> FilePath -> Block
......
...@@ -2,18 +2,19 @@ module QBar.Blocks.Squeekboard ( ...@@ -2,18 +2,19 @@ module QBar.Blocks.Squeekboard (
squeekboardBlock, squeekboardBlock,
) where ) 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.BlockHelper
import QBar.BlockOutput import QBar.BlockOutput
import QBar.Blocks.NetworkManager (getDBusProperty, runExceptT_) import QBar.Blocks.NetworkManager (getDBusProperty, runExceptT_)
import QBar.Core import QBar.Core
import QBar.Prelude 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 :: Bool -> Block
squeekboardBlock autoHide = runSignalBlockConfiguration $ SignalBlockConfiguration { squeekboardBlock autoHide = runSignalBlockConfiguration $ SignalBlockConfiguration {
aquire, aquire,
......
...@@ -9,9 +9,9 @@ module QBar.Blocks.Utils ( ...@@ -9,9 +9,9 @@ module QBar.Blocks.Utils (
import QBar.Prelude import QBar.Prelude
import Control.Exception (SomeException, catch) import Control.Exception (SomeException, catch)
import qualified Data.Attoparsec.Text.Lazy as AT import Data.Attoparsec.Text.Lazy qualified as AT
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
import qualified Data.Text.Lazy.IO as TIO import Data.Text.Lazy.IO qualified as TIO
import Numeric (showFFloat) import Numeric (showFFloat)
formatFloatN :: RealFloat a => Int -> a -> T.Text formatFloatN :: RealFloat a => Int -> a -> T.Text
......
...@@ -10,14 +10,14 @@ import QBar.ControlSocket ...@@ -10,14 +10,14 @@ import QBar.ControlSocket
import QBar.Core import QBar.Core
import QBar.DefaultConfig import QBar.DefaultConfig
import QBar.Prelude import QBar.Prelude
import QBar.Qubes.AdminAPI (printEvents, qubesVMStats, qubesEvents)
import QBar.Server import QBar.Server
import QBar.Theme import QBar.Theme
import QBar.Time import QBar.Time
import QBar.Qubes.AdminAPI (printEvents, qubesVMStats, qubesEvents)
import Control.Monad (join) import Control.Monad (join)
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
import Development.GitRev import Development.GitRev
import Options.Applicative import Options.Applicative
......
...@@ -7,11 +7,12 @@ module QBar.Color ( ...@@ -7,11 +7,12 @@ module QBar.Color (
import QBar.Prelude import QBar.Prelude
import Data.Aeson import Data.Aeson
import Data.Aeson.Types qualified as AT
import Data.Attoparsec.Text.Lazy as A
import Data.Bits ((.|.), shiftL) import Data.Bits ((.|.), shiftL)
import Data.Char (ord) import Data.Char (ord)
import Data.Attoparsec.Text.Lazy as A
import Data.Colour.RGBSpace import Data.Colour.RGBSpace
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
import Numeric (showHex) import Numeric (showHex)
data Color = ColorRGB (RGB Double) | ColorRGBA (RGB Double) Double data Color = ColorRGB (RGB Double) | ColorRGBA (RGB Double) Double
......
...@@ -24,22 +24,22 @@ import Control.Concurrent (forkFinally) ...@@ -24,22 +24,22 @@ import Control.Concurrent (forkFinally)
import Control.Concurrent.Async import Control.Concurrent.Async
import Control.Exception (SomeException, IOException, handle, onException) import Control.Exception (SomeException, IOException, handle, onException)
import Data.Aeson (FromJSON, ToJSON) import Data.Aeson (FromJSON, ToJSON)
import qualified Data.ByteString as BS import Data.ByteString qualified as BS
import qualified Data.ByteString.Char8 as BSC import Data.ByteString.Char8 qualified as BSC
import Data.Text.Lazy (pack) 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 Data.Time.Clock (getCurrentTime, addUTCTime)
import qualified Data.Text.Lazy as T
import qualified Data.Text.Lazy.IO as T
import GHC.Generics import GHC.Generics
import Network.Socket import Network.Socket
import Pipes 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 (decode, DecodingError)
import Pipes.Aeson.Unchecked (encode) 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.Network.TCP (fromSocket, toSocket)
import Pipes.Parse
import Pipes.Prelude qualified as PP
import Pipes.Safe (catch)
import System.Directory (removeFile, doesFileExist) import System.Directory (removeFile, doesFileExist)
import System.Environment (getEnv) import System.Environment (getEnv)
import System.Exit (exitSuccess) import System.Exit (exitSuccess)
......
...@@ -47,7 +47,7 @@ import QBar.Time ...@@ -47,7 +47,7 @@ import QBar.Time
import QBar.Utils import QBar.Utils
import Control.Concurrent.Async 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.MVar
import Control.Concurrent.STM.TChan import Control.Concurrent.STM.TChan
import Control.Lens import Control.Lens
...@@ -57,12 +57,12 @@ import Control.Monad.Writer (WriterT) ...@@ -57,12 +57,12 @@ import Control.Monad.Writer (WriterT)
import Data.Aeson import Data.Aeson
import Data.Int (Int64) import Data.Int (Int64)
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
import GHC.Generics import GHC.Generics
import Pipes import Pipes
import Pipes.Concurrent import Pipes.Concurrent
import Pipes.Prelude qualified as PP
import Pipes.Safe (SafeT, runSafeT) import Pipes.Safe (SafeT, runSafeT)
import qualified Pipes.Prelude as PP
data MainOptions = MainOptions { data MainOptions = MainOptions {
verbose :: Bool, verbose :: Bool,
......
...@@ -18,7 +18,7 @@ import QBar.Utils ...@@ -18,7 +18,7 @@ import QBar.Utils
import Control.Concurrent (forkIO, forkFinally, threadDelay) import Control.Concurrent (forkIO, forkFinally, threadDelay)
import Control.Concurrent.Async (async, wait, waitAny) 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.MVar
import Control.Concurrent.STM.TChan import Control.Concurrent.STM.TChan
import Control.Exception (SomeException, catch, fromException) import Control.Exception (SomeException, catch, fromException)
...@@ -26,7 +26,7 @@ import Control.Lens hiding (each, (.=)) ...@@ -26,7 +26,7 @@ import Control.Lens hiding (each, (.=))
import Control.Monad.STM (atomically) import Control.Monad.STM (atomically)
import Data.IORef (IORef, newIORef, readIORef, writeIORef) import Data.IORef (IORef, newIORef, readIORef, writeIORef)
import Data.Maybe (catMaybes, mapMaybe) import Data.Maybe (catMaybes, mapMaybe)
import qualified Data.Text.Lazy as T import Data.Text.Lazy qualified as T
import Pipes import Pipes
import Pipes.Concurrent (spawn, unbounded, toOutput, fromInput) import Pipes.Concurrent (spawn, unbounded, toOutput, fromInput)
import System.Exit (ExitCode, exitWith) import System.Exit (ExitCode, exitWith)
......
...@@ -33,15 +33,15 @@ import Prelude hiding ...@@ -33,15 +33,15 @@ import Prelude hiding
head, head,
undefined, undefined,
) )
import qualified Prelude as P
import qualified Control.Monad
import Control.Monad ((>=>), (<=<)) import Control.Monad ((>=>), (<=<))
import qualified Control.Monad.IO.Class import Control.Monad qualified
import qualified Data.ByteString as ByteString import Control.Monad.IO.Class qualified
import qualified Data.Maybe as Maybe import Data.ByteString qualified as ByteString
import qualified Data.Text.Lazy as Text import Data.Maybe qualified as Maybe
import qualified Debug.Trace as Trace import Data.Text.Lazy qualified as Text
import qualified GHC.Stack.Types import Debug.Trace qualified as Trace
import GHC.Stack.Types
import Prelude qualified as P
{-# DEPRECATED head "Partial Function." #-} {-# DEPRECATED head "Partial Function." #-}
head :: [a] -> a head :: [a] -> a
......
...@@ -21,18 +21,18 @@ import Control.Monad (forM_, guard) ...@@ -21,18 +21,18 @@ import Control.Monad (forM_, guard)
import Data.Binary import Data.Binary
import Data.Binary.Get import Data.Binary.Get
import Data.Binary.Put import Data.Binary.Put
import qualified Data.ByteString as BS import Data.ByteString qualified as BS
import qualified Data.ByteString.Lazy as BL import Data.ByteString.Lazy qualified as BL
import qualified Data.ByteString.Lazy.Char8 as BLC import Data.ByteString.Lazy.Char8 qualified as BLC
import Data.Char (isAlphaNum) import Data.Char (isAlphaNum)
import Data.Function ((&)) import Data.Function ((&))
import qualified Data.Map as Map import Data.Map qualified as Map
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import Network.HostName import Network.HostName
import Numeric (showHex, readHex) import Numeric (showHex, readHex)
import Pipes import Pipes
import qualified Pipes.Prelude as P import Pipes.Prelude qualified as P
import qualified Pipes.Safe as P import Pipes.Safe qualified as P
import System.IO (Handle, hSetBinaryMode) import System.IO (Handle, hSetBinaryMode)
import System.Process.Typed import System.Process.Typed
import Text.Read (readMaybe) import Text.Read (readMaybe)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment