diff --git a/src/QBar/ControlSocket.hs b/src/QBar/ControlSocket.hs index 56e5ab1a470f2d5e75638250c9bec3ba693401b4..6a6328bd527c4212ba053154ced189ad73459581 100644 --- a/src/QBar/ControlSocket.hs +++ b/src/QBar/ControlSocket.hs @@ -55,7 +55,7 @@ class (ToJSON (Up s), FromJSON (Up s), ToJSON (Down s), FromJSON (Down s)) => Is return (up, down) where verbosePrintP :: Pipe ByteString ByteString IO () - verbosePrintP = if verbose then (PP.chain $ BSC.hPutStrLn stderr) else cat + verbosePrintP = if verbose then PP.chain $ BSC.hPutStrLn stderr else cat handleByteStream :: s -> MainOptions -> Producer ByteString IO () -> Consumer ByteString IO () -> BarIO () handleByteStream s options up down = do (handleUp, handleDown, cleanup) <- streamHandler s diff --git a/src/QBar/DefaultConfig.hs b/src/QBar/DefaultConfig.hs index 6fd5c8428a5a80c2a23674a89bb42b010e7485b9..ff9fa26476cb48c52d1adc45ceff0d0dea0da955 100644 --- a/src/QBar/DefaultConfig.hs +++ b/src/QBar/DefaultConfig.hs @@ -21,7 +21,7 @@ legacyBarConfig :: BarIO () legacyBarConfig = do let todo = pollScriptBlock $ blockLocation "todo" let networkEnvironment = pollScriptBlock $ blockLocation "network-environment" - let ram = (pollScriptBlock $ blockLocation "memory") >-> modify (addIcon "ðŸ\xFE0E") >-> autoPadding + let ram = pollScriptBlock (blockLocation "memory") >-> modify (addIcon "ðŸ\xFE0E") >-> autoPadding let temperature = (pollScriptBlock $ blockLocation "temperature") >-> autoPadding let volumeBlock = scriptBlock $ blockLocation "volume-pulseaudio -S -F3" diff --git a/src/QBar/TagParser.hs b/src/QBar/TagParser.hs index 75c11270f1c3baf70f10356fb317b0a0695c736a..8a9ea1468a7b161a579cf05aeb57d71bc4a5ce27 100644 --- a/src/QBar/TagParser.hs +++ b/src/QBar/TagParser.hs @@ -55,7 +55,7 @@ tagParser = parser (False, normalImportant) let background = listToMaybe . catMaybes $ backgrounds void $ char '>' content <- T.fromStrict <$> A.takeWhile1 (notInClass "<>") - void $ string $ "</span>" + void $ string "</span>" return $ mkStyledText color background content where colorAttributeParser :: Text -> Parser Color @@ -65,11 +65,8 @@ tagParser = parser (False, normalImportant) skipSpace void $ char '=' skipSpace - value <- ( - char '\'' *> colorParser <* char '\'' - <|> char '"' *> colorParser <* char '"' - ) - return value + char '\'' *> colorParser <* char '\'' <|> + char '"' *> colorParser <* char '"' colorAttribute :: Parser (Maybe Color, Maybe Color) colorAttribute = do