utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-13 09:06:27 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

use yaml for config file rather than json

Browse source
This commit is contained in:
Jesse Duffield 2018-08-16 18:43:46 +10:00
parent 29ed971558
commit fd3ce21576
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkg/config/app_config.go
View file

@ -82,7 +82,7 @@ func (c *AppConfig) GetUserConfig() *viper.Viper {
// LoadUserConfig gets the user's config
func LoadUserConfig() (*viper.Viper, error) {
v := viper.New()
v.SetConfigType("json")
v.SetConfigType("yaml")
defaults := getDefaultConfig()
err := v.ReadConfig(bytes.NewBuffer(defaults))
if err != nil {
@ -90,7 +90,7 @@ func LoadUserConfig() (*viper.Viper, error) {
}
v.SetConfigName("config")
configPath := homeDirectory() + "/lazygit/"
if _, err := os.Stat(filepath.FromSlash(configPath + "config.json")); !os.IsNotExist(err) {
if _, err := os.Stat(filepath.FromSlash(configPath + "config.yaml")); !os.IsNotExist(err) {
v.AddConfigPath(configPath)
err = v.MergeInConfig()
if err != nil {
@ -103,13 +103,14 @@ func LoadUserConfig() (*viper.Viper, error) {
func getDefaultConfig() []byte {
return []byte(`
{
"gui": {
"scrollHeight": 1
},
"git": {},
"os": {}
}
gui:
## stuff relating to the UI
scrollHeight: 2
git:
# stuff relating to git
os:
# stuff relating to the OS
`)
}