diff --git a/src/QBar/Blocks/CpuUsage.hs b/src/QBar/Blocks/CpuUsage.hs index 12fc773effdf5abe98a0c2a53e55753b83dfc140..ac31b7883d91ff9e22fe98198cd451760699060e 100644 --- a/src/QBar/Blocks/CpuUsage.hs +++ b/src/QBar/Blocks/CpuUsage.hs @@ -4,7 +4,7 @@ module QBar.Blocks.CpuUsage where import Control.Applicative ((<|>)) import Control.Lens -import Control.Monad.State +import Control.Monad.State (StateT, evalStateT) import qualified Data.Attoparsec.Text.Lazy as AT import qualified Data.Text.Lazy as T import QBar.BlockOutput @@ -119,7 +119,7 @@ cpuUsageBlock decimalPlaces = evalStateT cpuUsageBlock' createState cpuUsageBlock' = do updateState importance <- cpuUsageImportance - updateBlock . mkBlockOutput . importantText importance =<< cpuUsageText + updateBlock . mkBlockOutput . importantText importance =<< ("💻\xFE0E " <>) <$> cpuUsageText cpuUsageBlock' createState :: CpuBlockState createState = diff --git a/src/QBar/DefaultConfig.hs b/src/QBar/DefaultConfig.hs index a4865e9dea97ceefcbbb4af9bc7ef8e876adb7c7..e7ce594a0d4f596a53a1ba666398eee4d4da5c0c 100644 --- a/src/QBar/DefaultConfig.hs +++ b/src/QBar/DefaultConfig.hs @@ -8,13 +8,11 @@ import Pipes defaultBarConfig :: BarIO () defaultBarConfig = do - let cpuUsage = cpuUsageBlock 1 >-> modify (addIcon "💻\xFE0E") - -- TODO: commented-out blocks should be added as soon as they are implemented in qbar addBlock dateBlock addBlock batteryBlock --addBlock volumeBlock - addBlock cpuUsage + addBlock $ cpuUsageBlock 1 --addBlock ramUsageBlock --addBlock cpuTemperatureBlock --addBlock networkBlock @@ -27,14 +25,13 @@ legacyBarConfig = do let ram = (scriptBlock $ blockLocation "memory") >-> modify (addIcon "ðŸ\xFE0E") >-> autoPadding let temperature = (scriptBlock $ blockLocation "temperature") >-> autoPadding let volumeBlock = persistentScriptBlock $ blockLocation "volume-pulseaudio -S -F3" - let cpuUsage = cpuUsageBlock 1 >-> modify (addIcon "💻\xFE0E") addBlock dateBlock addBlock batteryBlock addBlock volumeBlock addBlock temperature addBlock ram - addBlock cpuUsage + addBlock $ cpuUsageBlock 1 addBlock networkEnvironment addBlock wifi addBlock todo