diff --git a/src/QBar/Cli.hs b/src/QBar/Cli.hs index 13cee76bc3dd652dd2f405e1587b88c91c878225..4a30501aa8d6f0a91df79af12306b3abe6fa7857 100644 --- a/src/QBar/Cli.hs +++ b/src/QBar/Cli.hs @@ -77,8 +77,7 @@ blockParser = subparser ( commandGroup "Available presets:" <> metavar "CONFIG..." <> - command "default" (info (pure defaultBarConfig) (progDesc "Load default set of blocks.")) <> - command "legacy" (info (pure legacyBarConfig) (progDesc "Load the legacy configuration. Requires some custom block scripts.")) + command "default" (info (pure defaultBarConfig) (progDesc "Load default set of blocks.")) ) <|> subparser ( diff --git a/src/QBar/DefaultConfig.hs b/src/QBar/DefaultConfig.hs index 7891a7cc61b01acb4f74361fa2d969b4a2fca9b0..e51da6755d969e4f115d82782bd2c9376a3ec7c1 100644 --- a/src/QBar/DefaultConfig.hs +++ b/src/QBar/DefaultConfig.hs @@ -1,11 +1,8 @@ module QBar.DefaultConfig where import QBar.Blocks -import QBar.BlockOutput import QBar.Core -import Pipes - defaultBarConfig :: BarIO () defaultBarConfig = do -- TODO: commented-out blocks should be added as soon as they are implemented in qbar @@ -18,19 +15,3 @@ defaultBarConfig = do --addBlock cpuTemperatureBlock addBlock networkManagerBlock -legacyBarConfig :: BarIO () -legacyBarConfig = do - let ram = pollScriptBlock (blockLocation "memory") >-> modify (addIcon "ðŸ\xFE0E") >-> autoPadding - let temperature = (pollScriptBlock $ blockLocation "temperature") >-> autoPadding - let volumeBlock = scriptBlock $ blockLocation "volume-pulseaudio -S -F3" - - addBlock dateBlock - addBlock batteryBlock - addBlock volumeBlock - addBlock $ cpuUsageBlock 1 - addBlock ram - addBlock temperature - addBlock networkManagerBlock - where - blockLocation :: String -> FilePath - blockLocation name = "~/.config/qbar/blocks/" <> name