[taffybar] Multiple cssPaths

This commit is contained in:
Ivan Malison 2021-08-14 02:14:25 -06:00
parent 574313fec5
commit 00be078bc6
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
3 changed files with 19 additions and 20 deletions

View File

@ -8,12 +8,6 @@ final: prev: {
["taffybar.hs" "imalison-taffybar.cabal"] ["taffybar.hs" "imalison-taffybar.cabal"]
) )
{ }; { };
coinbase-pro = hself.callCabal2nix "coinbase-pro" (final.fetchFromGitHub {
owner = "IvanMalison";
repo = "coinbase-pro";
rev = "8ac93b7905150c8cbd6957102a730ecceb8b4dba";
sha256 = "0v0xw593xczvvalh24bz37v2zbfz92dhz71f04m08abgphqmjvxq";
}) { };
}); });
}); });
} }

@ -1 +1 @@
Subproject commit 054689aabb596a0c1eb59e10501a4cd2ca4dc8c7 Subproject commit eab3b26dee4158154644f1a7e0cd1e72249f048b

View File

@ -124,24 +124,29 @@ logDebug = do
-- enableLogger "System.Taffybar.WindowIcon" DEBUG -- enableLogger "System.Taffybar.WindowIcon" DEBUG
-- enableLogger "System.Taffybar.Widget.Generic.PollingLabel" DEBUG -- enableLogger "System.Taffybar.Widget.Generic.PollingLabel" DEBUG
cssFileByHostname = cssFilesByHostname =
[ ("uber-loaner", "uber-loaner.css") [ ("uber-loaner", ["uber-loaner.css"])
, ("imalison-home", "taffybar.css") , ("imalison-home", ["taffybar.css"])
, ("ivanm-dfinity-razer", "taffybar.css") , ("ivanm-dfinity-razer", ["taffybar.css"])
, ("ryzen-shine", "taffybar.css") , ("ryzen-shine", ["taffybar.css"])
] ]
main = do main = do
hostName <- getHostName hostName <- getHostName
homeDirectory <- getHomeDirectory homeDirectory <- getHomeDirectory
cssFilePath <- cssFiles <-
traverse (getUserConfigFile "taffybar") $ lookup hostName cssFileByHostname traverse (getUserConfigFile "taffybar") $ lookup hostName cssFilesByHostname
let myCPU = deocrateWithSetClassAndBoxes "cpu" $ pollingGraphNew cpuCfg 5 cpuCallback let myCPU = deocrateWithSetClassAndBoxes "cpu" $
myMem = deocrateWithSetClassAndBoxes "mem" $ pollingGraphNew memCfg 5 memCallback pollingGraphNew cpuCfg 5 cpuCallback
myNet = deocrateWithSetClassAndBoxes "net" $ networkGraphNew netCfg Nothing myMem = deocrateWithSetClassAndBoxes "mem" $
myLayout = deocrateWithSetClassAndBoxes "layout" $ layoutNew defaultLayoutConfig pollingGraphNew memCfg 5 memCallback
myWindows = deocrateWithSetClassAndBoxes "windows" $ windowsNew defaultWindowsConfig myNet = deocrateWithSetClassAndBoxes "net" $
networkGraphNew netCfg Nothing
myLayout = deocrateWithSetClassAndBoxes "layout" $
layoutNew defaultLayoutConfig
myWindows = deocrateWithSetClassAndBoxes "windows" $
windowsNew defaultWindowsConfig
myWorkspaces = myWorkspaces =
flip widgetSetClassGI "workspaces" =<< flip widgetSetClassGI "workspaces" =<<
workspacesNew defaultWorkspacesConfig workspacesNew defaultWorkspacesConfig
@ -205,7 +210,7 @@ main = do
, widgetSpacing = 0 , widgetSpacing = 0
, barPadding = 0 , barPadding = 0
, barHeight = 60 , barHeight = 60
, cssPath = cssFilePath , cssPaths = cssFiles
, startupHook = void $ setCMCAPIKey "f9e66366-9d42-4c6e-8d40-4194a0aaa329" , startupHook = void $ setCMCAPIKey "f9e66366-9d42-4c6e-8d40-4194a0aaa329"
} }
selectedConfig = selectedConfig =