Decouple modules from global config

Rather than referencing wtc.Config, instead pass the global config
Also, look up config for the module early and pass that in sooner, to deal with fewer long paths and get rid of the
ConfigKey variable

modules/bamboohr/settings.go

@@ -16,14 +16,13 @@ type Settings struct {
 	subdomain string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:    localConfig.UString("apiKey", os.Getenv("WTF_BAMBOO_HR_TOKEN")),
-		subdomain: localConfig.UString("subdomain", os.Getenv("WTF_BAMBOO_HR_SUBDOMAIN")),
+		apiKey:    ymlConfig.UString("apiKey", os.Getenv("WTF_BAMBOO_HR_TOKEN")),
+		subdomain: ymlConfig.UString("subdomain", os.Getenv("WTF_BAMBOO_HR_SUBDOMAIN")),
 	}
 
 	return &settings

modules/circleci/settings.go

@@ -15,13 +15,12 @@ type Settings struct {
 	apiKey string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey: localConfig.UString("apiKey", os.Getenv("WTF_CIRCLE_API_KEY")),
+		apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_CIRCLE_API_KEY")),
 	}
 
 	return &settings

modules/clocks/setting.go

@@ -25,20 +25,19 @@ type Settings struct {
 	sort       string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		dateFormat: localConfig.UString("dateFormat", wtf.SimpleDateFormat),
-		timeFormat: localConfig.UString("timeFormat", wtf.SimpleTimeFormat),
-		locations:  localConfig.UMap("locations"),
-		sort:       localConfig.UString("sort"),
+		dateFormat: ymlConfig.UString("dateFormat", wtf.SimpleDateFormat),
+		timeFormat: ymlConfig.UString("timeFormat", wtf.SimpleTimeFormat),
+		locations:  ymlConfig.UMap("locations"),
+		sort:       ymlConfig.UString("sort"),
 	}
 
-	settings.colors.rows.even = localConfig.UString("colors.rows.even", "white")
-	settings.colors.rows.odd = localConfig.UString("colors.rows.odd", "blue")
+	settings.colors.rows.even = ymlConfig.UString("colors.rows.even", "white")
+	settings.colors.rows.odd = ymlConfig.UString("colors.rows.odd", "blue")
 
 	return &settings
 }

modules/cmdrunner/settings.go

@@ -15,14 +15,13 @@ type Settings struct {
 	cmd  string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		args: wtf.ToStrs(localConfig.UList("args")),
-		cmd:  localConfig.UString("cmd"),
+		args: wtf.ToStrs(ymlConfig.UList("args")),
+		cmd:  ymlConfig.UString("cmd"),
 	}
 
 	return &settings

modules/cryptoexchanges/bittrex/settings.go

@@ -34,22 +34,21 @@ type Settings struct {
 	summary
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
-	settings.colors.base.name = localConfig.UString("colors.base.name")
-	settings.colors.base.displayName = localConfig.UString("colors.base.displayName")
+	settings.colors.base.name = ymlConfig.UString("colors.base.name")
+	settings.colors.base.displayName = ymlConfig.UString("colors.base.displayName")
 
-	settings.colors.market.name = localConfig.UString("colors.market.name")
-	settings.colors.market.field = localConfig.UString("colors.market.field")
-	settings.colors.market.value = localConfig.UString("colors.market.value")
+	settings.colors.market.name = ymlConfig.UString("colors.market.name")
+	settings.colors.market.field = ymlConfig.UString("colors.market.field")
+	settings.colors.market.value = ymlConfig.UString("colors.market.value")
 
 	settings.summary.currencies = make(map[string]*currency)
-	for key, val := range localConfig.UMap("summary") {
+	for key, val := range ymlConfig.UMap("summary") {
 		coercedVal := val.(map[string]interface{})
 
 		currency := &currency{

modules/cryptoexchanges/blockfolio/settings.go

@@ -21,14 +21,13 @@ type Settings struct {
 	displayHoldings bool
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		deviceToken:     localConfig.UString("device_token"),
-		displayHoldings: localConfig.UBool("displayHoldings", true),
+		deviceToken:     ymlConfig.UString("device_token"),
+		displayHoldings: ymlConfig.UBool("displayHoldings", true),
 	}
 
 	return &settings

modules/cryptoexchanges/cryptolive/price/settings.go

@@ -40,29 +40,28 @@ type Settings struct {
 	currencies map[string]*currency
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
-	settings.colors.from.name = localConfig.UString("colors.from.name")
-	settings.colors.from.displayName = localConfig.UString("colors.from.displayName")
+	settings.colors.from.name = ymlConfig.UString("colors.from.name")
+	settings.colors.from.displayName = ymlConfig.UString("colors.from.displayName")
 
-	settings.colors.to.name = localConfig.UString("colors.to.name")
-	settings.colors.to.price = localConfig.UString("colors.to.price")
+	settings.colors.to.name = ymlConfig.UString("colors.to.name")
+	settings.colors.to.price = ymlConfig.UString("colors.to.price")
 
-	settings.colors.top.from.name = localConfig.UString("colors.top.from.name")
-	settings.colors.top.from.displayName = localConfig.UString("colors.top.from.displayName")
+	settings.colors.top.from.name = ymlConfig.UString("colors.top.from.name")
+	settings.colors.top.from.displayName = ymlConfig.UString("colors.top.from.displayName")
 
-	settings.colors.top.to.name = localConfig.UString("colors.top.to.name")
-	settings.colors.top.to.field = localConfig.UString("colors.top.to.field")
-	settings.colors.top.to.value = localConfig.UString("colors.top.to.value")
+	settings.colors.top.to.name = ymlConfig.UString("colors.top.to.name")
+	settings.colors.top.to.field = ymlConfig.UString("colors.top.to.field")
+	settings.colors.top.to.value = ymlConfig.UString("colors.top.to.value")
 
 	settings.currencies = make(map[string]*currency)
 
-	for key, val := range localConfig.UMap("currencies") {
+	for key, val := range ymlConfig.UMap("currencies") {
 		coercedVal := val.(map[string]interface{})
 
 		currency := &currency{

modules/cryptoexchanges/cryptolive/settings.go

@@ -42,34 +42,33 @@ type Settings struct {
 	toplistSettings *toplist.Settings
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
-	currencies, _ := localConfig.Map("currencies")
-	top, _ := localConfig.Map("top")
+	currencies, _ := ymlConfig.Map("currencies")
+	top, _ := ymlConfig.Map("top")
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
 		currencies: currencies,
 		top:        top,
 
-		priceSettings:   price.NewSettingsFromYAML(name, ymlConfig),
-		toplistSettings: toplist.NewSettingsFromYAML(name, ymlConfig),
+		priceSettings:   price.NewSettingsFromYAML(name, ymlConfig, globalConfig),
+		toplistSettings: toplist.NewSettingsFromYAML(name, ymlConfig, globalConfig),
 	}
 
-	settings.colors.from.name = localConfig.UString("colors.from.name")
-	settings.colors.from.displayName = localConfig.UString("colors.from.displayName")
+	settings.colors.from.name = ymlConfig.UString("colors.from.name")
+	settings.colors.from.displayName = ymlConfig.UString("colors.from.displayName")
 
-	settings.colors.to.name = localConfig.UString("colors.to.name")
-	settings.colors.to.price = localConfig.UString("colors.to.price")
+	settings.colors.to.name = ymlConfig.UString("colors.to.name")
+	settings.colors.to.price = ymlConfig.UString("colors.to.price")
 
-	settings.colors.top.from.name = localConfig.UString("colors.top.from.name")
-	settings.colors.top.from.displayName = localConfig.UString("colors.top.from.displayName")
+	settings.colors.top.from.name = ymlConfig.UString("colors.top.from.name")
+	settings.colors.top.from.displayName = ymlConfig.UString("colors.top.from.displayName")
 
-	settings.colors.top.to.name = localConfig.UString("colors.top.to.name")
-	settings.colors.top.to.field = localConfig.UString("colors.top.to.field")
-	settings.colors.top.to.value = localConfig.UString("colors.top.to.value")
+	settings.colors.top.to.name = ymlConfig.UString("colors.top.to.name")
+	settings.colors.top.to.field = ymlConfig.UString("colors.top.to.field")
+	settings.colors.top.to.value = ymlConfig.UString("colors.top.to.value")
 
 	return &settings
 }

modules/cryptoexchanges/cryptolive/toplist/settings.go

@@ -42,29 +42,28 @@ type Settings struct {
 	top        map[string]*currency
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
-	settings.colors.from.name = localConfig.UString("colors.from.name")
-	settings.colors.from.displayName = localConfig.UString("colors.from.displayName")
+	settings.colors.from.name = ymlConfig.UString("colors.from.name")
+	settings.colors.from.displayName = ymlConfig.UString("colors.from.displayName")
 
-	settings.colors.to.name = localConfig.UString("colors.to.name")
-	settings.colors.to.price = localConfig.UString("colors.to.price")
+	settings.colors.to.name = ymlConfig.UString("colors.to.name")
+	settings.colors.to.price = ymlConfig.UString("colors.to.price")
 
-	settings.colors.top.from.name = localConfig.UString("colors.top.from.name")
-	settings.colors.top.from.displayName = localConfig.UString("colors.top.from.displayName")
+	settings.colors.top.from.name = ymlConfig.UString("colors.top.from.name")
+	settings.colors.top.from.displayName = ymlConfig.UString("colors.top.from.displayName")
 
-	settings.colors.top.to.name = localConfig.UString("colors.top.to.name")
-	settings.colors.top.to.field = localConfig.UString("colors.top.to.field")
-	settings.colors.top.to.value = localConfig.UString("colors.top.to.value")
+	settings.colors.top.to.name = ymlConfig.UString("colors.top.to.name")
+	settings.colors.top.to.field = ymlConfig.UString("colors.top.to.field")
+	settings.colors.top.to.value = ymlConfig.UString("colors.top.to.value")
 
 	settings.currencies = make(map[string]*currency)
 
-	for key, val := range localConfig.UMap("currencies") {
+	for key, val := range ymlConfig.UMap("currencies") {
 		coercedVal := val.(map[string]interface{})
 
 		limit, _ := coercedVal["limit"].(int)
@@ -78,7 +77,7 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
 		settings.currencies[key] = currency
 	}
 
-	for key, val := range localConfig.UMap("top") {
+	for key, val := range ymlConfig.UMap("top") {
 		coercedVal := val.(map[string]interface{})
 
 		limit, _ := coercedVal["limit"].(int)

modules/datadog/settings.go

@@ -17,15 +17,14 @@ type Settings struct {
 	tags           []interface{}
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:         localConfig.UString("apiKey", os.Getenv("WTF_DATADOG_API_KEY")),
-		applicationKey: localConfig.UString("applicationKey", os.Getenv("WTF_DATADOG_APPLICATION_KEY")),
-		tags:           localConfig.UList("monitors.tags"),
+		apiKey:         ymlConfig.UString("apiKey", os.Getenv("WTF_DATADOG_API_KEY")),
+		applicationKey: ymlConfig.UString("applicationKey", os.Getenv("WTF_DATADOG_APPLICATION_KEY")),
+		tags:           ymlConfig.UList("monitors.tags"),
 	}
 
 	return &settings

modules/gcal/settings.go

@@ -32,28 +32,27 @@ type Settings struct {
 	withLocation          bool
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		conflictIcon:          localConfig.UString("conflictIcon", "🚨"),
-		currentIcon:           localConfig.UString("currentIcon", "🔸"),
-		displayResponseStatus: localConfig.UBool("displayResponseStatus", true),
-		email:                 localConfig.UString("email", ""),
-		eventCount:            localConfig.UInt("eventCount", 10),
-		multiCalendar:         localConfig.UBool("multiCalendar", false),
-		secretFile:            localConfig.UString("secretFile", ""),
-		showDeclined:          localConfig.UBool("showDeclined", false),
-		textInterval:          localConfig.UInt("textInterval", 30),
-		withLocation:          localConfig.UBool("withLocation", true),
+		conflictIcon:          ymlConfig.UString("conflictIcon", "🚨"),
+		currentIcon:           ymlConfig.UString("currentIcon", "🔸"),
+		displayResponseStatus: ymlConfig.UBool("displayResponseStatus", true),
+		email:                 ymlConfig.UString("email", ""),
+		eventCount:            ymlConfig.UInt("eventCount", 10),
+		multiCalendar:         ymlConfig.UBool("multiCalendar", false),
+		secretFile:            ymlConfig.UString("secretFile", ""),
+		showDeclined:          ymlConfig.UBool("showDeclined", false),
+		textInterval:          ymlConfig.UInt("textInterval", 30),
+		withLocation:          ymlConfig.UBool("withLocation", true),
 	}
 
-	settings.colors.day = localConfig.UString("colors.day", "forestgreen")
-	settings.colors.description = localConfig.UString("colors.description", "white")
-	settings.colors.past = localConfig.UString("colors.past", "gray")
-	settings.colors.title = localConfig.UString("colors.title", "white")
+	settings.colors.day = ymlConfig.UString("colors.day", "forestgreen")
+	settings.colors.description = ymlConfig.UString("colors.description", "white")
+	settings.colors.past = ymlConfig.UString("colors.past", "gray")
+	settings.colors.title = ymlConfig.UString("colors.title", "white")
 
 	return &settings
 }

modules/gerrit/settings.go

@@ -27,21 +27,20 @@ type Settings struct {
 	verifyServerCertificate bool
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		domain:                  localConfig.UString("domain", ""),
-		password:                localConfig.UString("password", os.Getenv("WTF_GERRIT_PASSWORD")),
-		projects:                localConfig.UList("projects"),
-		username:                localConfig.UString("username", ""),
-		verifyServerCertificate: localConfig.UBool("verifyServerCertificate", true),
+		domain:                  ymlConfig.UString("domain", ""),
+		password:                ymlConfig.UString("password", os.Getenv("WTF_GERRIT_PASSWORD")),
+		projects:                ymlConfig.UList("projects"),
+		username:                ymlConfig.UString("username", ""),
+		verifyServerCertificate: ymlConfig.UBool("verifyServerCertificate", true),
 	}
 
-	settings.colors.rows.even = localConfig.UString("colors.rows.even", "white")
-	settings.colors.rows.odd = localConfig.UString("colors.rows.odd", "blue")
+	settings.colors.rows.even = ymlConfig.UString("colors.rows.even", "white")
+	settings.colors.rows.odd = ymlConfig.UString("colors.rows.odd", "blue")
 
 	return &settings
 }

modules/git/settings.go

@@ -16,16 +16,15 @@ type Settings struct {
 	repositories []interface{}
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		commitCount:  localConfig.UInt("commitCount", 10),
-		commitFormat: localConfig.UString("commitFormat", "[forestgreen]%h [white]%s [grey]%an on %cd[white]"),
-		dateFormat:   localConfig.UString("dateFormat", "%b %d, %Y"),
-		repositories: localConfig.UList("repositories"),
+		commitCount:  ymlConfig.UInt("commitCount", 10),
+		commitFormat: ymlConfig.UString("commitFormat", "[forestgreen]%h [white]%s [grey]%an on %cd[white]"),
+		dateFormat:   ymlConfig.UString("dateFormat", "%b %d, %Y"),
+		repositories: ymlConfig.UList("repositories"),
 	}
 
 	return &settings

modules/git/widget.go

@@ -42,7 +42,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
-		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "repository", "repositories"),
+		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.Name, "repository", "repositories"),
 		TextWidget:        wtf.NewTextWidget(app, settings.common, true),
 
 		app:      app,

modules/github/settings.go

@@ -20,18 +20,17 @@ type Settings struct {
 	username     string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:       localConfig.UString("apiKey", os.Getenv("WTF_GITHUB_TOKEN")),
-		baseURL:      localConfig.UString("baseURL", os.Getenv("WTF_GITHUB_BASE_URL")),
-		enableStatus: localConfig.UBool("enableStatus", false),
-		repositories: localConfig.UMap("repositories"),
-		uploadURL:    localConfig.UString("uploadURL", os.Getenv("WTF_GITHUB_UPLOAD_URL")),
-		username:     localConfig.UString("username"),
+		apiKey:       ymlConfig.UString("apiKey", os.Getenv("WTF_GITHUB_TOKEN")),
+		baseURL:      ymlConfig.UString("baseURL", os.Getenv("WTF_GITHUB_BASE_URL")),
+		enableStatus: ymlConfig.UBool("enableStatus", false),
+		repositories: ymlConfig.UMap("repositories"),
+		uploadURL:    ymlConfig.UString("uploadURL", os.Getenv("WTF_GITHUB_UPLOAD_URL")),
+		username:     ymlConfig.UString("username"),
 	}
 
 	return &settings

modules/gitlab/settings.go

@@ -18,16 +18,15 @@ type Settings struct {
 	username string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:   localConfig.UString("apiKey", os.Getenv("WTF_GITLAB_TOKEN")),
-		domain:   localConfig.UString("domain"),
-		projects: localConfig.UMap("projects"),
-		username: localConfig.UString("username"),
+		apiKey:   ymlConfig.UString("apiKey", os.Getenv("WTF_GITLAB_TOKEN")),
+		domain:   ymlConfig.UString("domain"),
+		projects: ymlConfig.UMap("projects"),
+		username: ymlConfig.UString("username"),
 	}
 
 	return &settings

modules/gitter/settings.go

@@ -17,15 +17,14 @@ type Settings struct {
 	roomURI          string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiToken:         localConfig.UString("apiToken", os.Getenv("WTF_GITTER_API_TOKEN")),
-		numberOfMessages: localConfig.UInt("numberOfMessages", 10),
-		roomURI:          localConfig.UString("roomUri", "wtfutil/Lobby"),
+		apiToken:         ymlConfig.UString("apiToken", os.Getenv("WTF_GITTER_API_TOKEN")),
+		numberOfMessages: ymlConfig.UInt("numberOfMessages", 10),
+		roomURI:          ymlConfig.UString("roomUri", "wtfutil/Lobby"),
 	}
 
 	return &settings

modules/gspreadsheets/settings.go

@@ -21,18 +21,17 @@ type Settings struct {
 	sheetID       string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		cellNames:  localConfig.UList("cells.names"),
-		secretFile: localConfig.UString("secretFile"),
-		sheetID:    localConfig.UString("sheetId"),
+		cellNames:  ymlConfig.UList("cells.names"),
+		secretFile: ymlConfig.UString("secretFile"),
+		sheetID:    ymlConfig.UString("sheetId"),
 	}
 
-	settings.colors.values = localConfig.UString("colors.values", "green")
+	settings.colors.values = ymlConfig.UString("colors.values", "green")
 
 	return &settings
 }

modules/hackernews/settings.go

@@ -14,14 +14,13 @@ type Settings struct {
 	storyType       string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		numberOfStories: localConfig.UInt("numberOfStories", 10),
-		storyType:       localConfig.UString("storyType", "top"),
+		numberOfStories: ymlConfig.UInt("numberOfStories", 10),
+		storyType:       ymlConfig.UString("storyType", "top"),
 	}
 
 	return &settings

modules/ipaddresses/ipapi/settings.go

@@ -17,15 +17,14 @@ type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
-	settings.colors.name = localConfig.UString("colors.name", "red")
-	settings.colors.value = localConfig.UString("colors.value", "white")
+	settings.colors.name = ymlConfig.UString("colors.name", "red")
+	settings.colors.value = ymlConfig.UString("colors.value", "white")
 
 	return &settings
 }

modules/ipaddresses/ipinfo/settings.go

@@ -17,15 +17,14 @@ type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
-	settings.colors.name = localConfig.UString("colors.name", "red")
-	settings.colors.value = localConfig.UString("colors.value", "white")
+	settings.colors.name = ymlConfig.UString("colors.name", "red")
+	settings.colors.value = ymlConfig.UString("colors.value", "white")
 
 	return &settings
 }

modules/jenkins/settings.go

@@ -20,18 +20,17 @@ type Settings struct {
 	verifyServerCertificate bool
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:                  localConfig.UString("apiKey", os.Getenv("WTF_JENKINS_API_KEY")),
-		jobNameRegex:            localConfig.UString("jobNameRegex", ".*"),
-		successBallColor:        localConfig.UString("successBallColor", "blue"),
-		url:                     localConfig.UString("url"),
-		user:                    localConfig.UString("user"),
-		verifyServerCertificate: localConfig.UBool("verifyServerCertificate", true),
+		apiKey:                  ymlConfig.UString("apiKey", os.Getenv("WTF_JENKINS_API_KEY")),
+		jobNameRegex:            ymlConfig.UString("jobNameRegex", ".*"),
+		successBallColor:        ymlConfig.UString("successBallColor", "blue"),
+		url:                     ymlConfig.UString("url"),
+		user:                    ymlConfig.UString("user"),
+		verifyServerCertificate: ymlConfig.UBool("verifyServerCertificate", true),
 	}
 
 	return &settings

modules/jira/settings.go

@@ -29,24 +29,23 @@ type Settings struct {
 	verifyServerCertificate bool
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:                  localConfig.UString("apiKey", os.Getenv("WTF_JIRA_API_KEY")),
-		domain:                  localConfig.UString("domain"),
-		email:                   localConfig.UString("email"),
-		jql:                     localConfig.UString("jql"),
-		username:                localConfig.UString("username"),
-		verifyServerCertificate: localConfig.UBool("verifyServerCertificate", true),
+		apiKey:                  ymlConfig.UString("apiKey", os.Getenv("WTF_JIRA_API_KEY")),
+		domain:                  ymlConfig.UString("domain"),
+		email:                   ymlConfig.UString("email"),
+		jql:                     ymlConfig.UString("jql"),
+		username:                ymlConfig.UString("username"),
+		verifyServerCertificate: ymlConfig.UBool("verifyServerCertificate", true),
 	}
 
-	settings.colors.rows.even = localConfig.UString("colors.even", "lightblue")
-	settings.colors.rows.odd = localConfig.UString("colors.odd", "white")
+	settings.colors.rows.even = ymlConfig.UString("colors.even", "lightblue")
+	settings.colors.rows.odd = ymlConfig.UString("colors.odd", "white")
 
-	settings.projects = settings.arrayifyProjects(localConfig)
+	settings.projects = settings.arrayifyProjects(ymlConfig, globalConfig)
 
 	return &settings
 }
@@ -54,18 +53,18 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
 /* -------------------- Unexported functions -------------------- */
 
 // arrayifyProjects figures out if we're dealing with a single project or an array of projects
-func (settings *Settings) arrayifyProjects(localConfig *config.Config) []string {
+func (settings *Settings) arrayifyProjects(ymlConfig *config.Config, globalConfig *config.Config) []string {
 	projects := []string{}
 
 	// Single project
-	project, err := localConfig.String("project")
+	project, err := ymlConfig.String("project")
 	if err == nil {
 		projects = append(projects, project)
 		return projects
 	}
 
 	// Array of projects
-	projectList := localConfig.UList("project")
+	projectList := ymlConfig.UList("project")
 	for _, projectName := range projectList {
 		if project, ok := projectName.(string); ok {
 			projects = append(projects, project)

modules/mercurial/settings.go

@@ -15,15 +15,14 @@ type Settings struct {
 	repositories []interface{}
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		commitCount:  localConfig.UInt("commitCount", 10),
-		commitFormat: localConfig.UString("commitFormat", "[forestgreen]{rev}:{phase} [white]{desc|firstline|strip} [grey]{author|person} {date|age}[white]"),
-		repositories: localConfig.UList("repositories"),
+		commitCount:  ymlConfig.UInt("commitCount", 10),
+		commitFormat: ymlConfig.UString("commitFormat", "[forestgreen]{rev}:{phase} [white]{desc|firstline|strip} [grey]{author|person} {date|age}[white]"),
+		repositories: ymlConfig.UList("repositories"),
 	}
 
 	return &settings

modules/mercurial/widget.go

@@ -37,7 +37,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
-		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "repository", "repositories"),
+		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.Name, "repository", "repositories"),
 		TextWidget:        wtf.NewTextWidget(app, settings.common, true),
 
 		app:      app,

modules/nbascore/settings.go

@@ -11,9 +11,9 @@ type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
 	return &settings

modules/newrelic/settings.go

@@ -17,15 +17,14 @@ type Settings struct {
 	deployCount   int
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:        localConfig.UString("apiKey", os.Getenv("WTF_NEW_RELIC_API_KEY")),
-		applicationID: localConfig.UInt("applicationID"),
-		deployCount:   localConfig.UInt("deployCount", 5),
+		apiKey:        ymlConfig.UString("apiKey", os.Getenv("WTF_NEW_RELIC_API_KEY")),
+		applicationID: ymlConfig.UInt("applicationID"),
+		deployCount:   ymlConfig.UInt("deployCount", 5),
 	}
 
 	return &settings

modules/opsgenie/settings.go

@@ -18,35 +18,34 @@ type Settings struct {
 	scheduleIdentifierType string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:                 localConfig.UString("apiKey", os.Getenv("WTF_OPS_GENIE_API_KEY")),
-		displayEmpty:           localConfig.UBool("displayEmpty", true),
-		scheduleIdentifierType: localConfig.UString("scheduleIdentifierType", "id"),
+		apiKey:                 ymlConfig.UString("apiKey", os.Getenv("WTF_OPS_GENIE_API_KEY")),
+		displayEmpty:           ymlConfig.UBool("displayEmpty", true),
+		scheduleIdentifierType: ymlConfig.UString("scheduleIdentifierType", "id"),
 	}
 
-	settings.schedule = settings.arrayifySchedules(localConfig)
+	settings.schedule = settings.arrayifySchedules(ymlConfig, globalConfig)
 
 	return &settings
 }
 
 // arrayifySchedules figures out if we're dealing with a single project or an array of projects
-func (settings *Settings) arrayifySchedules(localConfig *config.Config) []string {
+func (settings *Settings) arrayifySchedules(ymlConfig *config.Config, globalConfig *config.Config) []string {
 	schedules := []string{}
 
 	// Single schedule
-	schedule, err := localConfig.String("schedule")
+	schedule, err := ymlConfig.String("schedule")
 	if err == nil {
 		schedules = append(schedules, schedule)
 		return schedules
 	}
 
 	// Array of schedules
-	scheduleList := localConfig.UList("schedule")
+	scheduleList := ymlConfig.UList("schedule")
 	for _, scheduleName := range scheduleList {
 		if schedule, ok := scheduleName.(string); ok {
 			schedules = append(schedules, schedule)

modules/pagerduty/settings.go

@@ -18,16 +18,15 @@ type Settings struct {
 	showSchedules    bool
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:           localConfig.UString("apiKey", os.Getenv("WTF_PAGERDUTY_API_KEY")),
-		escalationFilter: localConfig.UList("escalationFilter"),
-		showIncidents:    localConfig.UBool("showIncidents", true),
-		showSchedules:    localConfig.UBool("showSchedules", true),
+		apiKey:           ymlConfig.UString("apiKey", os.Getenv("WTF_PAGERDUTY_API_KEY")),
+		escalationFilter: ymlConfig.UList("escalationFilter"),
+		showIncidents:    ymlConfig.UBool("showIncidents", true),
+		showSchedules:    ymlConfig.UBool("showSchedules", true),
 	}
 
 	return &settings

modules/power/settings.go

@@ -13,9 +13,9 @@ type Settings struct {
 	filePath string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
 	return &settings

modules/resourceusage/settings.go

@@ -11,9 +11,9 @@ type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
 	return &settings

modules/resourceusage/widget.go

@@ -25,7 +25,7 @@ type Widget struct {
 // NewWidget Make new instance of widget
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		BarGraph: wtf.NewBarGraph(app, settings.common.Name, settings.common.ConfigKey, false),
+		BarGraph: wtf.NewBarGraph(app, settings.common.Name, settings.common.Name, false),
 
 		app:      app,
 		settings: settings,

modules/rollbar/settings.go

@@ -18,18 +18,17 @@ type Settings struct {
 	projectOwner   string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		accessToken:    localConfig.UString("accessToken"),
-		activeOnly:     localConfig.UBool("activeOnly", false),
-		assignedToName: localConfig.UString("assignedToName"),
-		count:          localConfig.UInt("count", 10),
-		projectName:    localConfig.UString("projectName", "Items"),
-		projectOwner:   localConfig.UString("projectOwner"),
+		accessToken:    ymlConfig.UString("accessToken"),
+		activeOnly:     ymlConfig.UBool("activeOnly", false),
+		assignedToName: ymlConfig.UString("assignedToName"),
+		count:          ymlConfig.UInt("count", 10),
+		projectName:    ymlConfig.UString("projectName", "Items"),
+		projectOwner:   ymlConfig.UString("projectOwner"),
 	}
 
 	return &settings

modules/security/settings.go

@@ -11,9 +11,9 @@ type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
 	return &settings

modules/spotify/settings.go

@@ -11,9 +11,9 @@ type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
 	return &settings

modules/spotifyweb/settings.go

@@ -17,15 +17,14 @@ type Settings struct {
 	secretKey    string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		callbackPort: localConfig.UString("callbackPort", "8080"),
-		clientID:     localConfig.UString("clientID", os.Getenv("SPOTIFY_ID")),
-		secretKey:    localConfig.UString("secretKey", os.Getenv("SPOTIFY_SECRET")),
+		callbackPort: ymlConfig.UString("callbackPort", "8080"),
+		clientID:     ymlConfig.UString("clientID", os.Getenv("SPOTIFY_ID")),
+		secretKey:    ymlConfig.UString("secretKey", os.Getenv("SPOTIFY_SECRET")),
 	}
 
 	return &settings

modules/status/settings.go

@@ -11,9 +11,9 @@ type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
 	return &settings

modules/system/settings.go

@@ -11,9 +11,9 @@ type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
 	return &settings

modules/textfile/settings.go

@@ -15,15 +15,14 @@ type Settings struct {
 	formatStyle string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		filePaths:   localConfig.UList("filePaths"),
-		format:      localConfig.UBool("format", false),
-		formatStyle: localConfig.UString("formatStyle", "vim"),
+		filePaths:   ymlConfig.UList("filePaths"),
+		format:      ymlConfig.UBool("format", false),
+		formatStyle: ymlConfig.UString("formatStyle", "vim"),
 	}
 
 	return &settings

modules/textfile/widget.go

@@ -42,7 +42,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
-		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "filePath", "filePaths"),
+		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.Name, "filePath", "filePaths"),
 		TextWidget:        wtf.NewTextWidget(app, settings.common, true),
 
 		app:      app,

modules/todo/settings.go

@@ -13,13 +13,12 @@ type Settings struct {
 	filePath string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		filePath: localConfig.UString("filename"),
+		filePath: ymlConfig.UString("filename"),
 	}
 
 	return &settings

modules/todoist/settings.go

@@ -16,14 +16,13 @@ type Settings struct {
 	projects []interface{}
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:   localConfig.UString("apiKey", os.Getenv("WTF_TODOIST_TOKEN")),
-		projects: localConfig.UList("projects"),
+		apiKey:   ymlConfig.UString("apiKey", os.Getenv("WTF_TODOIST_TOKEN")),
+		projects: ymlConfig.UList("projects"),
 	}
 
 	return &settings

modules/travisci/settings.go

@@ -16,14 +16,13 @@ type Settings struct {
 	pro    bool
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey: localConfig.UString("apiKey", os.Getenv("WTF_TRAVIS_API_TOKEN")),
-		pro:    localConfig.UBool("pro", false),
+		apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_TRAVIS_API_TOKEN")),
+		pro:    ymlConfig.UBool("pro", false),
 	}
 
 	return &settings

modules/trello/settings.go

@@ -19,35 +19,34 @@ type Settings struct {
 	username    string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		accessToken: localConfig.UString("accessToken", os.Getenv("WTF_TRELLO_ACCESS_TOKEN")),
-		apiKey:      localConfig.UString("apiKey", os.Getenv("WTF_TRELLO_APP_KEY")),
-		board:       localConfig.UString("board"),
-		username:    localConfig.UString("username"),
+		accessToken: ymlConfig.UString("accessToken", os.Getenv("WTF_TRELLO_ACCESS_TOKEN")),
+		apiKey:      ymlConfig.UString("apiKey", os.Getenv("WTF_TRELLO_APP_KEY")),
+		board:       ymlConfig.UString("board"),
+		username:    ymlConfig.UString("username"),
 	}
 
-	settings.list = mapifyList(localConfig)
+	settings.list = mapifyList(ymlConfig, globalConfig)
 
 	return &settings
 }
 
-func mapifyList(localConfig *config.Config) map[string]string {
+func mapifyList(ymlConfig *config.Config, globalConfig *config.Config) map[string]string {
 	lists := make(map[string]string)
 
 	// Single list
-	list, err := localConfig.String("list")
+	list, err := ymlConfig.String("list")
 	if err == nil {
 		lists[list] = ""
 		return lists
 	}
 
 	// Array of lists
-	listList := localConfig.UList("project")
+	listList := ymlConfig.UList("project")
 	for _, listName := range listList {
 		if list, ok := listName.(string); ok {
 			lists[list] = ""

modules/twitter/settings.go

@@ -17,15 +17,14 @@ type Settings struct {
 	screenNames []interface{}
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		bearerToken: localConfig.UString("bearerToken", os.Getenv("WTF_TWITTER_BEARER_TOKEN")),
-		count:       localConfig.UInt("count", 5),
-		screenNames: localConfig.UList("screenName"),
+		bearerToken: ymlConfig.UString("bearerToken", os.Getenv("WTF_TWITTER_BEARER_TOKEN")),
+		count:       ymlConfig.UInt("count", 5),
+		screenNames: ymlConfig.UList("screenName"),
 	}
 
 	return &settings

modules/twitter/widget.go

@@ -38,7 +38,7 @@ type Widget struct {
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
 		HelpfulWidget:     wtf.NewHelpfulWidget(app, pages, HelpText),
-		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.ConfigKey, "screenName", "screenNames"),
+		MultiSourceWidget: wtf.NewMultiSourceWidget(settings.common.Name, "screenName", "screenNames"),
 		TextWidget:        wtf.NewTextWidget(app, settings.common, true),
 
 		app:      app,

modules/unknown/settings.go

@@ -11,9 +11,9 @@ type Settings struct {
 	common *cfg.Common
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 	}
 
 	return &settings

modules/victorops/settings.go

@@ -17,15 +17,14 @@ type Settings struct {
 	team   string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiID:  localConfig.UString("apiID", os.Getenv("WTF_VICTOROPS_API_ID")),
-		apiKey: localConfig.UString("apiKey", os.Getenv("WTF_VICTOROPS_API_KEY")),
-		team:   localConfig.UString("team"),
+		apiID:  ymlConfig.UString("apiID", os.Getenv("WTF_VICTOROPS_API_ID")),
+		apiKey: ymlConfig.UString("apiKey", os.Getenv("WTF_VICTOROPS_API_KEY")),
+		team:   ymlConfig.UString("team"),
 	}
 
 	return &settings

modules/weatherservices/prettyweather/settings.go

@@ -16,16 +16,15 @@ type Settings struct {
 	language string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		city:     localConfig.UString("city", "Barcelona"),
-		language: localConfig.UString("language", "en"),
-		unit:     localConfig.UString("unit", "m"),
-		view:     localConfig.UString("view", "0"),
+		city:     ymlConfig.UString("city", "Barcelona"),
+		language: ymlConfig.UString("language", "en"),
+		unit:     ymlConfig.UString("unit", "m"),
+		view:     ymlConfig.UString("view", "0"),
 	}
 
 	return &settings

modules/weatherservices/weather/settings.go

@@ -23,19 +23,18 @@ type Settings struct {
 	tempUnit string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:   localConfig.UString("apiKey", os.Getenv("WTF_OWM_API_KEY")),
-		cityIDs:  localConfig.UList("cityids"),
-		language: localConfig.UString("language", "EN"),
-		tempUnit: localConfig.UString("tempUnit", "C"),
+		apiKey:   ymlConfig.UString("apiKey", os.Getenv("WTF_OWM_API_KEY")),
+		cityIDs:  ymlConfig.UList("cityids"),
+		language: ymlConfig.UString("language", "EN"),
+		tempUnit: ymlConfig.UString("tempUnit", "C"),
 	}
 
-	settings.colors.current = localConfig.UString("colors.current", "green")
+	settings.colors.current = ymlConfig.UString("colors.current", "green")
 
 	return &settings
 }

modules/zendesk/settings.go

@@ -18,16 +18,15 @@ type Settings struct {
 	username  string
 }
 
-func NewSettingsFromYAML(name string, ymlConfig *config.Config) *Settings {
-	localConfig, _ := ymlConfig.Get("wtf.mods." + configKey)
+func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 
 	settings := Settings{
-		common: cfg.NewCommonSettingsFromYAML(name, configKey, ymlConfig),
+		common: cfg.NewCommonSettingsFromModule(name, ymlConfig, globalConfig),
 
-		apiKey:    localConfig.UString("apiKey", os.Getenv("ZENDESK_API")),
-		status:    localConfig.UString("status"),
-		subdomain: localConfig.UString("subdomain", os.Getenv("ZENDESK_SUBDOMAIN")),
-		username:  localConfig.UString("username"),
+		apiKey:    ymlConfig.UString("apiKey", os.Getenv("ZENDESK_API")),
+		status:    ymlConfig.UString("status"),
+		subdomain: ymlConfig.UString("subdomain", os.Getenv("ZENDESK_SUBDOMAIN")),
+		username:  ymlConfig.UString("username"),
 	}
 
 	return &settings