summaryrefslogtreecommitdiffstats
path: root/pkg/config
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2018-08-18 13:54:39 +1000
committerJesse Duffield <jessedduffield@gmail.com>2018-08-18 14:20:19 +1000
commit6b150a4be0e7712d8b8706f10bb80e34094f872b (patch)
tree68d351bdac16e9b1d1dddfe2f1b1908c39604a8e /pkg/config
parent284c53425102dba89164aa4363441caf71402114 (diff)
bump dependencies
Diffstat (limited to 'pkg/config')
-rw-r--r--pkg/config/app_config.go34
1 files changed, 19 insertions, 15 deletions
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index 6276a6afa..9f258d4a6 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -2,8 +2,6 @@ package config
import (
"bytes"
- "log"
- "os/user"
"github.com/shibukawa/configdir"
"github.com/spf13/viper"
@@ -117,7 +115,9 @@ func LoadUserConfigFromFile(v *viper.Viper) error {
if folder == nil {
// create the file as an empty config and load it
folders := configDirs.QueryFolders(configdir.Global)
- folders[0].WriteFile("config.yml", []byte{})
+ if err := folders[0].WriteFile("config.yml", []byte{}); err != nil {
+ return err
+ }
folder = configDirs.QueryFolderContainsFile("config.yml")
}
v.AddConfigPath(folder.Path)
@@ -150,11 +150,14 @@ func getDefaultConfig() []byte {
gui:
## stuff relating to the UI
scrollHeight: 2
- activeBorderColor:
- - white
- - bold
- inactiveBorderColor:
- - white
+ theme:
+ activeBorderColor:
+ - white
+ - bold
+ inactiveBorderColor:
+ - white
+ optionsTextColor:
+ - blue
git:
# stuff relating to git
os:
@@ -163,10 +166,11 @@ func getDefaultConfig() []byte {
`)
}
-func homeDirectory() string {
- usr, err := user.Current()
- if err != nil {
- log.Fatal(err)
- }
- return usr.HomeDir
-}
+// // commenting this out until we use it again
+// func homeDirectory() string {
+// usr, err := user.Current()
+// if err != nil {
+// log.Fatal(err)
+// }
+// return usr.HomeDir
+// }