Merge branch 'master' into autism-pride-flag

This commit is contained in:
Azalea 2025-10-21 20:27:17 +09:00 committed by GitHub
commit 1419c9d428
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 36 additions and 3 deletions

View File

@ -781,8 +781,11 @@ fn create_config(
// get distro string and convert it into the enum, neofetch friendly format, so we can check for small logos with the {distro}_small neofetch naming scheme.
let tmp_dst = get_distro_name(backend).or_else(|_| get_distro_name(Backend::Neofetch)).context("failed to get distro name")?;
let detected_dst = Some(distro.map_or_else(
|| format!("{:?}", Distro::detect(tmp_dst).unwrap()),
|d| d.to_string(),
|| {
Distro::detect(&tmp_dst)
.map_or("".to_string(), |d| format!("{:?}", d).to_lowercase())
},
|d| d.to_string().to_lowercase(),
));
// in case someone specified {distro}_small already in the --distro arg

View File

@ -234,7 +234,11 @@ pub enum Preset {
Fluidfluxa, Fluidfluxb,
Autism
Autism,
Cenelian,
Transneutral,
}
#[derive(Clone, Eq, PartialEq, Debug)]
@ -724,6 +728,14 @@ impl Preset {
Self::Autism => ColorProfile::from_hex_colors(vec![
"#c94a49", "#de7554", "#dbb667", "#6fa35d", "#2e7574", "#232828"
]),
Self::Cenelian => ColorProfile::from_hex_colors(vec![
"#ffe7b6", "#93554a", "#52203a", "#7e4a93", "#99afd6"
]),
Self::Transneutral => ColorProfile::from_hex_colors(vec![
"#74dfff", "#fffdb3", "#fffc75", "#fff200", "#fffc75", "#fffdb3", "#fe8cbf"
]),
})
.expect("preset color profiles should be valid")
}

View File

@ -1101,4 +1101,22 @@ PRESETS: dict[str, ColorProfile] = {
"#2e7574",
"#232828"
]),
'Cenelian': ColorProfile([
"#ffe7b6",
"#93554a",
"#52203a",
"#7e4a93",
"#99afd6"
]),
'Transneutral': ColorProfile([
"#74dfff",
"#fffdb3",
"#fffc75",
"#fff200",
"#fffc75",
"#fffdb3",
"#fe8cbf"
]),
}