first pass of merging in warp (doesn't build)

2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
@@ -1,19 +1,20 @@
-use crate::settings::import::config::ThemeError;
+use std::env;
+use std::io::ErrorKind;
+use std::path::PathBuf;
+
 use async_recursion::async_recursion;
 use async_trait::async_trait;
-use galaxy_core::ui::{
-    color::hex_color::coloru_from_hex_string,
-    theme::{AnsiColor, AnsiColors, GalaxyTheme, TerminalColors},
-};
-use galaxyui::fonts::FontInfo;
+use pathfinder_color::ColorU;
 use serde::Deserialize;
-use std::{env, io::ErrorKind, path::PathBuf};
+use galaxy_core::ui::color::hex_color::coloru_from_hex_string;
+use galaxy_core::ui::theme::{AnsiColor, AnsiColors, TerminalColors, WarpTheme};
+use galaxyui::fonts::FontInfo;

 use super::config::{
    calculate_accent_color, Config, ConfigError, ImportableSetting, ParseableConfig, SettingType,
    ThemeType,
 };
-use pathfinder_color::ColorU;
+use crate::settings::import::config::ThemeError;

 type AlacrittyColor = String;
 const CONFIG_DEPTH_LIMIT: u8 = 5;