fix: remove duplication of gitbutler/gitbutler/settings.json

Author: TheGB0077

crates/but-settings/src/persistence.rs

@@ -14,12 +14,16 @@ impl AppSettings {
     /// Finally, merge all customizations from `config_path` into the default settings.
     pub fn load(config_path: &Path) -> Result<Self> {
         // If the file on config_path does not exist, create it empty
+
+        dbg!(&config_path);
+
         if !config_path.exists() {
             gitbutler_fs::create_dirs_then_write(config_path, "{}\n")?;
         }
 
         // merge customizations from disk into the defaults to get a complete set of settings.
         let customizations = serde_json_lenient::from_str(&std::fs::read_to_string(config_path)?)?;
+        dbg!(&customizations);
         let mut settings: serde_json::Value = serde_json_lenient::from_str(DEFAULTS)?;
 
         merge_non_null_json_value(customizations, &mut settings);

crates/gitbutler-tauri/src/main.rs

@@ -37,9 +37,7 @@ fn main() {
     let mut tauri_context = generate_context!();
     gitbutler_secret::secret::set_application_namespace(&tauri_context.config().identifier);
 
-    let config_dir = but_path::app_config_dir()
-        .expect("missing config dir")
-        .join("gitbutler");
+    let config_dir = but_path::app_config_dir().expect("missing config dir");
     std::fs::create_dir_all(&config_dir).expect("failed to create config dir");
     let mut app_settings =
         AppSettingsWithDiskSync::new(config_dir.clone()).expect("failed to create app settings");