Revert "settings: Remove auxiliary Content types where possible (#16744)" (#17768)

This breaks setting `{"scrollbar": {"show":"never"}}`
Release Notes:

- N/A

crates/welcome/src/base_keymap_picker.rs

@@ -177,7 +177,7 @@ impl PickerDelegate for BaseKeymapSelectorDelegate {
                 .report_setting_event("keymap", base_keymap.to_string());
 
             update_settings_file::<BaseKeymap>(self.fs.clone(), cx, move |setting, _| {
-                *setting = base_keymap;
+                *setting = Some(base_keymap)
             });
         }
 

crates/welcome/src/base_keymap_setting.rs

@@ -87,15 +87,15 @@ impl BaseKeymap {
 impl Settings for BaseKeymap {
     const KEY: Option<&'static str> = Some("base_keymap");
 
-    type FileContent = Self;
+    type FileContent = Option<Self>;
 
     fn load(
         sources: SettingsSources<Self::FileContent>,
         _: &mut gpui::AppContext,
     ) -> anyhow::Result<Self> {
-        if let Some(user_value) = sources.user.copied() {
+        if let Some(Some(user_value)) = sources.user.copied() {
             return Ok(user_value);
         }
-        Ok(*sources.default)
+        sources.default.ok_or_else(Self::missing_default)
     }
 }

crates/welcome/src/welcome.rs

@@ -188,7 +188,7 @@ impl Render for WelcomePage {
                                     this.update_settings::<VimModeSetting>(
                                         selection,
                                         cx,
-                                        |setting, value| *setting = VimModeSetting(value),
+                                        |setting, value| *setting = Some(value),
                                     );
                                 }),
                             ))