wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

[taffybar] Handle module renames

Browse Source
This commit is contained in:
Ivan Malison 2018-04-24 14:19:52 -07:00
parent 17f347b153
commit ad4ad35bd4
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/config/taffybar/taffybar

@ -1 +1 @@
Subproject commit accf7df727f20f030dc91d7648f9b6f2cd68ca9a Subproject commit 1e0b575e6b8ca58ff5f3ecf44f6d9951761520ea

15
dotfiles/config/taffybar/taffybar.hs
View File

@ -42,10 +42,10 @@ import System.Taffybar.NetMonitor
import System.Taffybar.SNITray import System.Taffybar.SNITray
import System.Taffybar.SimpleClock import System.Taffybar.SimpleClock
import System.Taffybar.SimpleConfig import System.Taffybar.SimpleConfig
import System.Taffybar.ToggleMonitor import System.Taffybar.DBus.Toggle
import System.Taffybar.Widgets.PollingGraph import System.Taffybar.Widgets.PollingGraph
import System.Taffybar.WindowSwitcher import System.Taffybar.WindowSwitcher
import System.Taffybar.WorkspaceHUD import System.Taffybar.Workspaces
import Text.Printf import Text.Printf
import Text.Read hiding (lift) import Text.Read hiding (lift)
import Unsafe.Coerce import Unsafe.Coerce
@ -199,8 +199,8 @@ main = do
mpris = mpris2New mpris = mpris2New
cpu = pollingGraphNew cpuCfg 0.5 cpuCallback cpu = pollingGraphNew cpuCfg 0.5 cpuCallback
mem = pollingGraphNew memCfg 1 memCallback mem = pollingGraphNew memCfg 1 memCallback
myHUDConfig = myWorkspacesConfig =
defaultWorkspaceHUDConfig defaultWorkspacesConfig
{ underlineHeight = 3 { underlineHeight = 3
, underlinePadding = 2 , underlinePadding = 2
, minWSWidgetSize = Nothing , minWSWidgetSize = Nothing
@ -222,15 +222,14 @@ main = do
, labelSetter = workspaceNamesLabelSetter , labelSetter = workspaceNamesLabelSetter
} }
netMonitor = netMonitorMultiNew 1.5 interfaceNames netMonitor = netMonitorMultiNew 1.5 interfaceNames
-- makeUnderline = underlineWidget myHUDConfig
-- pgr <- pagerNew pagerConfig -- pgr <- pagerNew pagerConfig
-- tray2 <- movableWidget tray -- tray2 <- movableWidget tray
let hud = buildWorkspaceHUD myHUDConfig let workspaces = workspacesNew myWorkspacesConfig
los = layoutSwitcherNew defaultLayoutSwitcherConfig los = layoutSwitcherNew defaultLayoutSwitcherConfig
wnd = windowSwitcherNew defaultWindowSwitcherConfig wnd = windowSwitcherNew defaultWindowSwitcherConfig
simpleTaffyConfig = simpleTaffyConfig =
defaultSimpleTaffyConfig defaultSimpleTaffyConfig
{ startWidgets = [hud, los, addClass "WindowSwitcher" wnd] { startWidgets = [workspaces, los, addClass "WindowSwitcher" wnd]
, endWidgets = , endWidgets =
[ batteryBarNewWithFormat defaultBatteryConfig "$percentage$% ($time$) - $status$" 1.0 [ batteryBarNewWithFormat defaultBatteryConfig "$percentage$% ($time$) - $status$" 1.0
, makeContents buildSNITray "Cpu" , makeContents buildSNITray "Cpu"
@ -243,7 +242,7 @@ main = do
] ]
, barPosition = Top , barPosition = Top
, barPadding = 5 , barPadding = 5
, barHeight = (underlineHeight myHUDConfig + windowIconSize myHUDConfig + 15) , barHeight = (underlineHeight myWorkspacesConfig + windowIconSize myWorkspacesConfig + 15)
, widgetSpacing = 0 , widgetSpacing = 0
} }
dyreTaffybar $ handleDBusToggles $ toTaffyConfig simpleTaffyConfig dyreTaffybar $ handleDBusToggles $ toTaffyConfig simpleTaffyConfig