summaryrefslogtreecommitdiffhomepage
path: root/Plugins
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2010-12-08 20:29:59 -0500
committerBen Boeckel <MathStuf@gmail.com>2010-12-08 20:29:59 -0500
commit0054cc5beec8fe7673443f3a4a6a7a878a7f400d (patch)
treec689a82a4a25e37fae72932a947386ced8e66bb0 /Plugins
parent73ac9faa18b948242ada9b90a365fdf0d238d2d2 (diff)
downloadxmobar-0054cc5beec8fe7673443f3a4a6a7a878a7f400d.tar.gz
xmobar-0054cc5beec8fe7673443f3a4a6a7a878a7f400d.tar.bz2
Remove auto*% options
The -P option now covers this case.
Diffstat (limited to 'Plugins')
-rw-r--r--Plugins/Monitors/MultiCpu.hs11
1 files changed, 1 insertions, 10 deletions
diff --git a/Plugins/Monitors/MultiCpu.hs b/Plugins/Monitors/MultiCpu.hs
index f32c966..17620d5 100644
--- a/Plugins/Monitors/MultiCpu.hs
+++ b/Plugins/Monitors/MultiCpu.hs
@@ -22,7 +22,6 @@ multiCpuConfig :: IO MConfig
multiCpuConfig =
mkMConfig "Cpu: <total>%" $
map ("auto" ++) monitors
- ++ map ((++ "%") . ("auto" ++)) monitors
++ [ k ++ n | n <- "" : map show [0 :: Int ..]
, k <- monitors]
where monitors = ["bar","total","user","nice","system","idle"]
@@ -73,17 +72,9 @@ formatAutoCpus :: [String] -> Monitor [String]
formatAutoCpus [] = return $ replicate 6 ""
formatAutoCpus xs = return $ map concat . map (intersperse " ") $ groupData xs
-formatAutoCpusPercents :: [String] -> Monitor [String]
-formatAutoCpusPercents [] = return $ replicate 6 ""
-formatAutoCpusPercents xs = return $ map concat . map (intersperse " ") $ withPercents groups
- where groups = groupData xs
- withPercents [] = []
- withPercents (y:ys) = y : (map (map (++ "%")) (tail ys))
-
runMultiCpu :: [String] -> Monitor String
runMultiCpu _ =
do c <- io parseCpuData
l <- formatMultiCpus c
a <- formatAutoCpus l
- p <- formatAutoCpusPercents l
- parseTemplate (a ++ p ++ l)
+ parseTemplate (a ++ l)