Move cpu block icon into block

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 =

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