Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ivan Malison 2021-09-10 11:57:46 -06:00
commit 9bead9ced9
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 10 additions and 8 deletions

@ -1 +1 @@
Subproject commit c901f1f5d1ec7e885c15e349458faea7f26b6660 Subproject commit af67fdf4c5079770c2b1ebcb2c46697a9da42261

View File

@ -135,6 +135,8 @@ cssFilesByHostname =
] ]
main = do main = do
enableLogger "Graphics.UI.GIGtkStrut" DEBUG
hostName <- getHostName hostName <- getHostName
homeDirectory <- getHomeDirectory homeDirectory <- getHomeDirectory
let relativeFiles = fromMaybe ["taffybar.css"] $ lookup hostName cssFilesByHostname let relativeFiles = fromMaybe ["taffybar.css"] $ lookup hostName cssFilesByHostname
@ -201,10 +203,10 @@ main = do
defaultSimpleTaffyConfig defaultSimpleTaffyConfig
{ startWidgets = [myWorkspaces, myLayout, myWindows] { startWidgets = [myWorkspaces, myLayout, myWindows]
, endWidgets = fullEndWidgets , endWidgets = fullEndWidgets
, barPosition = Top , barPosition = Bottom
, widgetSpacing = 0 , widgetSpacing = 0
, barPadding = 0 , barPadding = 0
, barHeight = 50 , barHeight = ScreenRatio $ 1/27
, cssPaths = cssFiles , cssPaths = cssFiles
, startupHook = void $ setCMCAPIKey "f9e66366-9d42-4c6e-8d40-4194a0aaa329" , startupHook = void $ setCMCAPIKey "f9e66366-9d42-4c6e-8d40-4194a0aaa329"
} }
@ -214,19 +216,19 @@ main = do
, baseConfig { endWidgets = laptopEndWidgets } , baseConfig { endWidgets = laptopEndWidgets }
) )
, ( "imalison-home" , ( "imalison-home"
, baseConfig { endWidgets = fullEndWidgets, barHeight = 42 } , baseConfig { endWidgets = fullEndWidgets }
) )
, ( "ryzen-shine" , ( "ryzen-shine"
, baseConfig { endWidgets = fullEndWidgets, barHeight = 50 } , baseConfig { endWidgets = fullEndWidgets }
) )
, ( "ivanm-dfinity-razer" , ( "ivanm-dfinity-razer"
, baseConfig { endWidgets = laptopEndWidgets, barHeight = 42 } , baseConfig { endWidgets = laptopEndWidgets }
) )
, ( "adele" , ( "adele"
, baseConfig { endWidgets = laptopEndWidgets, barHeight = 45 } , baseConfig { endWidgets = laptopEndWidgets }
) )
, ( "stevie-nixos" , ( "stevie-nixos"
, baseConfig { endWidgets = laptopEndWidgets, barHeight = 70 } , baseConfig { endWidgets = laptopEndWidgets }
) )
] ]
simpleTaffyConfig = selectedConfig simpleTaffyConfig = selectedConfig