summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Plugins/Monitors/MultiCpu.hs11
-rw-r--r--README9
2 files changed, 5 insertions, 15 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)
diff --git a/README b/README
index 628055d..1ed9567 100644
--- a/README
+++ b/README
@@ -371,12 +371,11 @@ Monitors have default aliases.
- Args: default monitor arguments (see below)
- Variables that can be used with the `-t`/`--template` argument:
`autototal`, `autobar`, `autouser`, `autonice`,
- `autosystem`, `autoidle`, `autototal%`, `autobar%`,
- `autouser%`, `autonice%`, `autosystem%`, `autoidle%`,
- `total`, `bar`, `user`, `nice`, `system`, `idle`,
- `total0`, `bar0`, `user0`, `nice0`, `system0`, `idle0`, ...
+ `autosystem`, `autoidle`, `total`, `bar`, `user`, `nice`,
+ `system`, `idle`, `total0`, `bar0`, `user0`, `nice0`,
+ `system0`, `idle0`, ...
- The auto* variables automatically detect the number of CPUs on the system
- and displays one entry for each, with or without a trailing '%'.
+ and displays one entry for each.
- Default template: `Cpu: <total>%`
`Battery Args RefreshRate`