[taffybar] Fix laptop widgets, spacing on adele

This commit is contained in:
Ivan Malison 2021-08-14 03:17:33 -06:00
parent 40ffbea4c9
commit 4c828723e5

View File

@ -175,28 +175,20 @@ main = do
, updatePlayerWidget = , updatePlayerWidget =
simplePlayerWidget simplePlayerWidget
defaultPlayerConfig defaultPlayerConfig
{ setNowPlayingLabel = playingText 10 10 } { setNowPlayingLabel = playingText 20 20 }
} }
myBatteryIcon = deocrateWithSetClassAndBoxes "battery-icon" batteryIconNew myBatteryIcon = deocrateWithSetClassAndBoxes "battery-icon" batteryIconNew
myBatteryText = myBatteryText =
deocrateWithSetClassAndBoxes "battery-text" $ textBatteryNew "$percentage$%" deocrateWithSetClassAndBoxes "battery-text" $ textBatteryNew "$percentage$%"
fullEndWidgets = batteryWidgets = [myBatteryIcon, myBatteryText]
baseEndWidgets =
[ myTray [ myTray
, myICP , myICP
, myBTC , myBTC
, myETH , myETH
, myCPU
, myMem
, myNet
, myMpris
]
shortLaptopEndWidgets =
[ myBatteryIcon
, myBatteryText
, myTray
, myICP
, myMpris
] ]
fullEndWidgets = baseEndWidgets ++ [ myCPU, myMem, myNet, myMpris ]
laptopEndWidgets = batteryWidgets ++ baseEndWidgets ++ [ myMpris ]
baseConfig = baseConfig =
defaultSimpleTaffyConfig defaultSimpleTaffyConfig
{ startWidgets = [myWorkspaces, myLayout, myWindows] { startWidgets = [myWorkspaces, myLayout, myWindows]
@ -204,14 +196,14 @@ main = do
, barPosition = Top , barPosition = Top
, widgetSpacing = 0 , widgetSpacing = 0
, barPadding = 0 , barPadding = 0
, barHeight = 60 , barHeight = 50
, cssPath = cssFilePath , cssPath = cssFilePath
, startupHook = void $ setCMCAPIKey "f9e66366-9d42-4c6e-8d40-4194a0aaa329" , startupHook = void $ setCMCAPIKey "f9e66366-9d42-4c6e-8d40-4194a0aaa329"
} }
selectedConfig = selectedConfig =
fromMaybe baseConfig $ lookup hostName fromMaybe baseConfig $ lookup hostName
[ ( "uber-loaner" [ ( "uber-loaner"
, baseConfig { endWidgets = shortLaptopEndWidgets } , baseConfig { endWidgets = laptopEndWidgets }
) )
, ( "imalison-home" , ( "imalison-home"
, baseConfig { endWidgets = fullEndWidgets, barHeight = 42 } , baseConfig { endWidgets = fullEndWidgets, barHeight = 42 }
@ -220,7 +212,10 @@ main = do
, baseConfig { endWidgets = fullEndWidgets, barHeight = 50 } , baseConfig { endWidgets = fullEndWidgets, barHeight = 50 }
) )
, ( "ivanm-dfinity-razer" , ( "ivanm-dfinity-razer"
, baseConfig { endWidgets = shortLaptopEndWidgets, barHeight = 42 } , baseConfig { endWidgets = laptopEndWidgets, barHeight = 42 }
)
, ( "adele"
, baseConfig { endWidgets = laptopEndWidgets, barHeight = 45 }
) )
] ]
simpleTaffyConfig = selectedConfig simpleTaffyConfig = selectedConfig