Fix issues with db_path config arg

Part of #6

cmd/util.go

@@ -39,24 +39,22 @@ func initConfig() Cfg {
 		// Use config file from the flag.
 		viper.SetConfigFile(cfgFile)
 	} else {
-
+		viper.AddConfigPath(path.Join(home, ".config", "diary"))
-		// Search config in home directory with name ".diary" (without extension).
-		viper.AddConfigPath(home)
 		viper.SetConfigType("toml")
-		viper.SetConfigName(".diary")
+		viper.SetConfigName("diary.toml")
 	}
 
+	if viper.Get("db_path") == nil {
 		var db_path = path.Join(home, ".diary.sql")
 		viper.SetDefault("db_path", db_path)
+	}
 
 	viper.AutomaticEnv() // read in environment variables that match
 
-	// If a config file is found, read it in.
+	err = viper.ReadInConfig()
-	if err := viper.ReadInConfig(); err == nil {
+	cobra.CheckErr(err)
-		fmt.Fprintln(os.Stderr, "Using config file:", viper.ConfigFileUsed())
-	}
 
-	return Cfg{db_path}
+	return Cfg{viper.GetString("db_path")}
 }
 
 func InitApp() {
@@ -64,9 +62,7 @@ func InitApp() {
 
 	if _, err := os.Stat(cfg.DbPath); errors.Is(err, os.ErrNotExist) {
 		_, err := os.Create(cfg.DbPath)
-		if err != nil {
+		cobra.CheckErr(err)
-			log.Fatal(err.Error())
-		}
 	}
 
 	var app = model.NewApp(cfg.DbPath)