diff --git a/dotfiles/config/taffybar/flake.lock b/dotfiles/config/taffybar/flake.lock index 9a3cfb11..a24a07f8 100644 --- a/dotfiles/config/taffybar/flake.lock +++ b/dotfiles/config/taffybar/flake.lock @@ -317,8 +317,8 @@ "xmonad-contrib": "xmonad-contrib" }, "locked": { - "lastModified": 1772010218, - "narHash": "sha256-UvV+Ea516CC9Q98LalEGh6xWdd/RVGOo2cYYSbq1+Go=", + "lastModified": 1772138985, + "narHash": "sha256-5nv2ZcQW+lqTO7Idri1Zd5uZI6DS3t5OSVOAqWvg5D4=", "path": "/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar", "type": "path" }, diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index ae239216..85802248 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit ae239216a480df31cec420647f0443b6c5eae687 +Subproject commit 85802248df4e803fa3c90a1a3f6e93905e0f28ec diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index c52cfbd6..fe32ed55 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -44,6 +44,8 @@ import System.Taffybar.SimpleConfig import System.Taffybar.Util (getPixbufFromFilePath, maybeTCombine, postGUIASync, (<|||>)) import System.Taffybar.Widget import qualified System.Taffybar.Widget.ASUS as ASUS +import System.Taffybar.Widget.CPUMonitor (cpuMonitorNew) +import System.Taffybar.Widget.Generic.Graph (GraphConfig (..), GraphDirection (..), GraphStyle (..), defaultGraphConfig) import qualified System.Taffybar.Widget.NetworkManager as NetworkManager import qualified System.Taffybar.Widget.PulseAudio as PulseAudio import System.Taffybar.Widget.SNIMenu (withNmAppletMenu) @@ -482,6 +484,20 @@ sunLockWidget :: TaffyIO Gtk.Widget sunLockWidget = stackInPill "sun-lock" [simplifiedWlsunsetWidget, simplifiedScreenLockWidget] +cpuWidget :: TaffyIO Gtk.Widget +cpuWidget = + decorateWithClassAndBoxM "cpu" $ + liftIO $ + cpuMonitorNew + defaultGraphConfig + { graphDataColors = [(0, 1, 0.5, 0.8), (1, 0, 0, 0.5)], + graphLabel = Just "CPU", + graphWidth = 50, + graphDirection = LEFT_TO_RIGHT + } + 1.0 + "cpu" + wakeupDebugWidget :: TaffyIO Gtk.Widget wakeupDebugWidget = decorateWithClassAndBoxM "wakeup-debug" wakeupDebugWidgetNew @@ -544,6 +560,7 @@ endWidgetsForHost hostName = let baseEndWidgets = [ sniTrayWidget, audioWidget, + cpuWidget, ramSwapWidget, diskUsageWidget, networkWidget, @@ -555,6 +572,7 @@ endWidgetsForHost hostName = sniTrayWidget, asusDiskUsageWidget, audioBacklightWidget, + cpuWidget, ramSwapWidget, sunLockWidget, mprisWidget