Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
Ivan Malison 2019-04-10 16:37:37 -07:00
commit 5acfd38cec
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 10 additions and 6 deletions

@ -1 +1 @@
Subproject commit e58efd030328aea6dc808749edcd5a3fabfee3e3 Subproject commit 0393c3b01d057855bf927ac279dacc5550c27268

View File

@ -165,10 +165,14 @@ main = do
, barHeight = 30 , barHeight = 30
, cssPath = cssFilePath , cssPath = cssFilePath
} }
selectedConfig = fromMaybe baseConfig $ selectedConfig =
lookup hostName fromMaybe baseConfig $ lookup hostName
[ ("uber-loaner", baseConfig { endWidgets = shortLaptopEndWidgets } ) [ ( "uber-loaner"
, ("imalison-home", baseConfig { endWidgets = fullEndWidgets, barHeight = 42 } ) , baseConfig { endWidgets = shortLaptopEndWidgets }
)
, ( "imalison-home"
, baseConfig { endWidgets = fullEndWidgets, barHeight = 42 }
)
] ]
simpleTaffyConfig = selectedConfig simpleTaffyConfig = selectedConfig
{ centerWidgets = map (>>= buildContentsBox) [] { centerWidgets = map (>>= buildContentsBox) []