setup config default in load config

mistakenelf · Oct 9, 2021 · bd39661 · bd39661
1 parent 516bd18
commit bd39661
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -18,7 +18,6 @@ var rootCmd = &cobra.Command{
 	Version: "0.5.4",
 	Args:    cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		config.SetDefaults()
 		config.LoadConfig()
 
 		cfg := config.GetConfig()

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -30,6 +30,15 @@ func LoadConfig() {
 	viper.SetConfigName(".fm")
 	viper.SetConfigType("yml")
 
+	// Setup config default.
+	viper.SetDefault("settings.start_dir", ".")
+	viper.SetDefault("settings.show_icons", true)
+	viper.SetDefault("settings.enable_logging", false)
+	viper.SetDefault("settings.enable_mousewheel", true)
+	viper.SetDefault("settings.pretty_markdown", true)
+	viper.SetDefault("settings.borderless", false)
+	viper.SetDefault("settings.theme", "default")
+
 	if err := viper.SafeWriteConfig(); err != nil {
 		if os.IsNotExist(err) {
 			err = viper.WriteConfig()
@@ -54,15 +63,3 @@ func GetConfig() (config Config) {
 
 	return
 }
-
-// SetDefaults sets default values for the config.
-func SetDefaults() {
-	// App Settings.
-	viper.SetDefault("settings.start_dir", ".")
-	viper.SetDefault("settings.show_icons", true)
-	viper.SetDefault("settings.enable_logging", false)
-	viper.SetDefault("settings.enable_mousewheel", true)
-	viper.SetDefault("settings.pretty_markdown", true)
-	viper.SetDefault("settings.borderless", false)
-	viper.SetDefault("settings.theme", "default")
-}