diff options
| -rw-r--r-- | src/Xmobar/Plugins/Monitors.hs | 4 | ||||
| -rw-r--r-- | src/Xmobar/Plugins/Monitors/MultiCoreTemp.hs (renamed from src/Xmobar/Plugins/Monitors/CoreTemp.hs) | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/Xmobar/Plugins/Monitors.hs b/src/Xmobar/Plugins/Monitors.hs index 63bd0eb..d40f84d 100644 --- a/src/Xmobar/Plugins/Monitors.hs +++ b/src/Xmobar/Plugins/Monitors.hs @@ -34,6 +34,7 @@ import Xmobar.Plugins.Monitors.Thermal import Xmobar.Plugins.Monitors.ThermalZone import Xmobar.Plugins.Monitors.CpuFreq import Xmobar.Plugins.Monitors.CoreTemp +import Xmobar.Plugins.Monitors.MultiCoreTemp import Xmobar.Plugins.Monitors.Disk import Xmobar.Plugins.Monitors.Top import Xmobar.Plugins.Monitors.Uptime @@ -72,6 +73,7 @@ data Monitors = Network Interface Args Rate | Brightness Args Rate | CpuFreq Args Rate | CoreTemp Args Rate + | MultiCoreTemp Args Rate | TopProc Args Rate | TopMem Args Rate | Uptime Args Rate @@ -132,6 +134,7 @@ instance Exec Monitors where alias (TopProc _ _) = "top" alias (TopMem _ _) = "topmem" alias (CoreTemp _ _) = "coretemp" + alias (MultiCoreTemp _ _) = "multicoretemp" alias DiskU {} = "disku" alias DiskIO {} = "diskio" alias (Uptime _ _) = "uptime" @@ -175,6 +178,7 @@ instance Exec Monitors where start (Brightness a r) = runM a brightConfig runBright r start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r start (CoreTemp a r) = startCoreTemp a r + start (MultiCoreTemp a r) = startMultiCoreTemp a r start (DiskU s a r) = runM a diskUConfig (runDiskU s) r start (DiskIO s a r) = startDiskIO s a r start (Uptime a r) = runM a uptimeConfig runUptime r diff --git a/src/Xmobar/Plugins/Monitors/CoreTemp.hs b/src/Xmobar/Plugins/Monitors/MultiCoreTemp.hs index 7a6bdfd..b0325dc 100644 --- a/src/Xmobar/Plugins/Monitors/CoreTemp.hs +++ b/src/Xmobar/Plugins/Monitors/MultiCoreTemp.hs @@ -1,6 +1,6 @@ ----------------------------------------------------------------------------- -- | --- Module : Plugins.Monitors.CoreTemp +-- Module : Plugins.Monitors.MultiCoreTemp -- Copyright : (c) 2019 Felix Springer -- License : BSD-style (see LICENSE) -- @@ -12,7 +12,7 @@ -- ----------------------------------------------------------------------------- -module Xmobar.Plugins.Monitors.CoreTemp (startCoreTemp) where +module Xmobar.Plugins.Monitors.MultiCoreTemp (startMultiCoreTemp) where import Xmobar.Plugins.Monitors.Common import Control.Monad (filterM) @@ -23,9 +23,9 @@ import System.Directory ( doesDirectoryExist -- | Declare Options. data CTOpts = CTOpts { loadIconPattern :: Maybe IconPattern - , mintemp :: Float - , maxtemp :: Float - } + , mintemp :: Float + , maxtemp :: Float + } -- | Set default Options. defaultOpts :: CTOpts @@ -154,5 +154,5 @@ runCT argv = do cTs <- io parseCT l <- formatCT opts cTs parseTemplate l -startCoreTemp :: [String] -> Int -> (String -> IO ()) -> IO () -startCoreTemp a = runM a cTConfig runCT +startMultiCoreTemp :: [String] -> Int -> (String -> IO ()) -> IO () +startMultiCoreTemp a = runM a cTConfig runCT |