From 71443cfbc153d6be7a2b4a939c0be79d25f11a0a Mon Sep 17 00:00:00 2001 From: soraefir Date: Sun, 8 Jun 2025 19:54:44 +0200 Subject: [PATCH] updated colors --- modules/home/gui/theme/gtk-theme-gen.nix | 50 ++++++++--------- modules/shared/colors/default.nix | 2 +- modules/shared/colors/sorahiro.nix | 70 ++++++++++++++++++++++++ modules/shared/colors/sorahiro_hard.nix | 45 --------------- modules/shared/colors/sorahiro_soft.nix | 44 --------------- 5 files changed, 96 insertions(+), 115 deletions(-) create mode 100755 modules/shared/colors/sorahiro.nix delete mode 100755 modules/shared/colors/sorahiro_hard.nix delete mode 100755 modules/shared/colors/sorahiro_soft.nix diff --git a/modules/home/gui/theme/gtk-theme-gen.nix b/modules/home/gui/theme/gtk-theme-gen.nix index a9ed78a..5db2995 100755 --- a/modules/home/gui/theme/gtk-theme-gen.nix +++ b/modules/home/gui/theme/gtk-theme-gen.nix @@ -11,8 +11,8 @@ in pkgs.stdenv.mkDerivation rec { src = pkgs.fetchFromGitHub { owner = "vinceliuice"; repo = "Orchis-theme"; - rev = "be8b0aff92ed0741174b74c2ee10c74b15be0474"; - sha256 = "sha256-m7xh/1uIDh2BM0hTPA5QymXQt6yV7mM7Ivg5VaF2PvM="; + rev = "5b73376721cf307101e22d7031c1f4b1344d1f63"; + sha256 = "sha256-+2/CsgJ+rdDpCp+r5B/zys3PtFgtnu+ohTEUOtJNd1Y="; }; nativeBuildInputs = with pkgs; [ gtk3 sassc ]; @@ -22,43 +22,43 @@ in pkgs.stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/share/themes cat > src/_sass/_color-palette-${scheme.slug}.scss << 'EOF' - $red-light: #${scheme.palette.base0F}; - $red-dark: #${scheme.palette.base0F}; + $red-light: #${scheme.palette.low0F}; + $red-dark: #${scheme.palette.high0F}; - $pink-light: #${scheme.palette.base0E}; - $pink-dark: #${scheme.palette.base0E}; + $pink-light: #${scheme.palette.low0E}; + $pink-dark: #${scheme.palette.high0E}; - $purple-light: #${scheme.palette.base0D}; - $purple-dark: #${scheme.palette.base0D}; + $purple-light: #${scheme.palette.low0D}; + $purple-dark: #${scheme.palette.high0D}; - $blue-light: #${scheme.palette.base0C}; - $blue-dark: #${scheme.palette.base0C}; + $blue-light: #${scheme.palette.low0C}; + $blue-dark: #${scheme.palette.high0C}; - $teal-light: #${scheme.palette.base0B}; - $teal-dark: #${scheme.palette.base0B}; + $teal-light: #${scheme.palette.low0B}; + $teal-dark: #${scheme.palette.high0B}; - $green-light: #${scheme.palette.base0A}; - $green-dark: #${scheme.palette.base0A}; - $sea-light: #${scheme.palette.base0B}; - $sea-dark: #${scheme.palette.base0B}; + $green-light: #${scheme.palette.low0A}; + $green-dark: #${scheme.palette.high0A}; + $sea-light: #${scheme.palette.alt_low0B}; + $sea-dark: #${scheme.palette.alt_high0B}; - $yellow-light: #${scheme.palette.base09}; - $yellow-dark: #${scheme.palette.base09}; + $yellow-light: #${scheme.palette.low09}; + $yellow-dark: #${scheme.palette.low09}; - $orange-light: #${scheme.palette.base08}; - $orange-dark: #${scheme.palette.base08}; + $orange-light: #${scheme.palette.low08}; + $orange-dark: #${scheme.palette.high08}; $grey-050: #${scheme.palette.base07}; $grey-100: #${scheme.palette.base07}; - $grey-150: #${scheme.palette.base07}; + $grey-150: #${scheme.palette.base06}; $grey-200: #${scheme.palette.base06}; - $grey-250: #${scheme.palette.base06}; + $grey-250: #${scheme.palette.base05}; $grey-300: #${scheme.palette.base05}; - $grey-350: #${scheme.palette.base05}; + $grey-350: #${scheme.palette.base04}; $grey-400: #${scheme.palette.base04}; - $grey-450: #${scheme.palette.base04}; + $grey-450: #${scheme.palette.base03}; $grey-500: #${scheme.palette.base03}; - $grey-550: #${scheme.palette.base03}; + $grey-550: #${scheme.palette.base02}; $grey-600: #${scheme.palette.base02}; $grey-650: #${scheme.palette.base02}; $grey-700: #${scheme.palette.base01}; diff --git a/modules/shared/colors/default.nix b/modules/shared/colors/default.nix index 24076a6..0a270a3 100755 --- a/modules/shared/colors/default.nix +++ b/modules/shared/colors/default.nix @@ -1,5 +1,5 @@ { config, ... }: { - imports = [ ./sorahiro_soft.nix ]; + imports = [ ./sorahiro.nix ]; colorScheme.palette.border-radius = "#8"; colorScheme.palette.border-width = "#2"; diff --git a/modules/shared/colors/sorahiro.nix b/modules/shared/colors/sorahiro.nix new file mode 100755 index 0000000..531dbd4 --- /dev/null +++ b/modules/shared/colors/sorahiro.nix @@ -0,0 +1,70 @@ +{ nix-colors, ... }: +let use_pastelle = false; +in{ + # usage: a = "#${config.colorScheme.palette.base00}"; + + colorScheme = { + slug = "sorahiro"; + name = "sorahiro"; + author = "Soraefir @ Helcel"; + variant = "dark"; + palette = rec { + # Format: Name, Pantone, RAL + base00 = "#000000"; # Black / 419C / 9005 + base01 = "#060a0f"; # Rich Black / 532C / 9005 + base02 = "#212c38"; # Yankees Blue / 433C / 5011 + base03 = "#3f5268"; # Police Blue / 432C / 5000 + base04 = "#617b9a"; # Slate Gray / 5415C / 5014 + base05 = "#90a7c1"; # Pewter Blue / 535C / 5024 + base06 = "#c9d3df"; # Columbia Blue / 538C / 7047 + base07 = "#fcfcfc"; # Lotion / 663C / 9016 + + base08 = if use_pastelle then low08 else high08; + base09 = if use_pastelle then low09 else high09; + base0A = if use_pastelle then low0A else high0A; + base0B = if use_pastelle then low0B else high0B; + base0C = if use_pastelle then low0C else high0C; + base0D = if use_pastelle then low0D else high0D; + base0E = if use_pastelle then low0E else high0E; + base0F = if use_pastelle then low0F else high0F; + + alt00 = "#000000"; # Black / 419C / 9005 + alt01 = "#0c0906"; # Vampire Black / 419C / 9005 + alt02 = "#312920"; # Pine Tree / 440C / 6022 + alt03 = "#5b4e3e"; # Olive Drab Camouflage / 411C / 7013 + alt04 = "#887660"; # Shadow / 404C / 7002 + alt05 = "#b8a083"; # Pale Taupe / 480C / 1019 + alt06 = "#e1cfb9"; # Desert Sand / 482C / 1015 + alt07 = "#fcfcfc"; # Lotion / 663C / 9016 + + high08 = "#f09732"; # Deep Saffron / 804C / 1033 + high09 = "#f2d831"; # Dandelion / 114C / 1016 + high0A = "#98f12f"; # Green Lizard / 375C / 6038 + high0B = "#34f4f0"; # Fluorescent Blue / 3252C / 6027 + high0C = "#3193f5"; # Brilliant Azure / 2727C / 5015 + high0D = "#c156f6"; # Blue-Violet / 2592C / 4006 + high0E = "#f62ac0"; # Royal Pink / 807C / 4010 + high0F = "#f42060"; # Deep Carmine Pink / 1925C / 3018 + + alt_high08 = "#f66824"; # Orange-Red / 165C / 2008 + alt_high0B = "#41f3a4"; # Eucalyptus / 3395C / 6037 + alt_high0C = "#2abef8"; # Spiro Disco Ball / 298C / 5012 + alt_high0D = "#837ff5"; # Violets Are Blue / 814C / 4005 + + low08 = "#ffac56"; # Rajah / 150C / 1017 + low09 = "#feea74"; # Shandy / 127C / 1016 + low0A = "#bffe8a"; # Menthol / 374C / 6018 + low0B = "#4cfefa"; # Electric Blue / 3252C / 6027 + low0C = "#62acfd"; # Blue Jeans / 279C / 5012 + low0D = "#9b9bfd"; # Maximum Blue Purple / 2715C / 4005 + low0E = "#fe9bda"; # Lavender Rose / 223C / 4003 + low0F = "#fc8999"; # Tulip / 1775C / 3014 + + alt_low08 = "#fe946a"; # Atomic Tangerine / 811C / 1034 + alt_low0B = "#87febf"; # Aquamarine / 353C / 6019 + alt_low0C = "#38c3fd"; # Picton Blue / 298C / 5012 + alt_low0D = "#dca2ff"; # Mauve / 2572C / 4005 + + }; + }; +} diff --git a/modules/shared/colors/sorahiro_hard.nix b/modules/shared/colors/sorahiro_hard.nix deleted file mode 100755 index d8081f5..0000000 --- a/modules/shared/colors/sorahiro_hard.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ nix-colors, ... }: { - # usage: a = "#${config.colorScheme.palette.base00}"; - - colorScheme = { - slug = "sorahiro-hard"; - name = "sorahiro-hard"; - author = "Soraefir @ Helcel"; - variant = "dark"; - palette = { - # Format: Name, Pantone, RAL - base00 = "#000000"; # Black / 419C / 9005 - base01 = "#060a0f"; # Rich Black / 532C / 9005 - base02 = "#212c38"; # Yankees Blue / 433C / 5011 - base03 = "#3f5268"; # Police Blue / 432C / 5000 - base04 = "#617b9a"; # Slate Gray / 5415C / 5014 - base05 = "#90a7c1"; # Pewter Blue / 535C / 5024 - base06 = "#c9d3df"; # Columbia Blue / 538C / 7047 - base07 = "#fcfcfc"; # Lotion / 663C / 9016 - - alt00 = "#000000"; # Black / 419C / 9005 - alt01 = "#0c0906"; # Vampire Black / 419C / 9005 - alt02 = "#312920"; # Pine Tree / 440C / 6022 - alt03 = "#5b4e3e"; # Olive Drab Camouflage / 411C / 7013 - alt04 = "#887660"; # Shadow / 404C / 7002 - alt05 = "#b8a083"; # Pale Taupe / 480C / 1019 - alt06 = "#e1cfb9"; # Desert Sand / 482C / 1015 - alt07 = "#fcfcfc"; # Lotion / 663C / 9016 - - base08 = "#f09732"; # Deep Saffron / 804C / 1033 - base09 = "#f2d831"; # Dandelion / 114C / 1016 - base0A = "#98f12f"; # Green Lizard / 375C / 6038 - base0B = "#34f4f0"; # Fluorescent Blue / 3252C / 6027 - base0C = "#3193f5"; # Brilliant Azure / 2727C / 5015 - baseOD = "#c156f6"; # Blue-Violet / 2592C / 4006 - base0E = "#f62ac0"; # Royal Pink / 807C / 4010 - base0F = "#f42060"; # Deep Carmine Pink / 1925C / 3018 - - alt08 = "#f66824"; # Orange-Red / 165C / 2008 - alt0B = "#41f3a4"; # Eucalyptus / 3395C / 6037 - alt0C = "#2abef8"; # Spiro Disco Ball / 298C / 5012 - alt0D = "#837ff5"; # Violets Are Blue / 814C / 4005 - - }; - }; -} diff --git a/modules/shared/colors/sorahiro_soft.nix b/modules/shared/colors/sorahiro_soft.nix deleted file mode 100755 index 5efdf53..0000000 --- a/modules/shared/colors/sorahiro_soft.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ nix-colors, ... }: { - # usage: a = "#${config.colorScheme.palette.base00}"; - - colorScheme = { - slug = "sorahiro-soft"; - name = "sorahiro-soft"; - author = "Soraefir @ Helcel"; - variant = "dark"; - palette = { - # Format: Name, Pantone, RAL - base00 = "#000000"; # Black / 419C / 9005 - base01 = "#060a0f"; # Rich Black / 532C / 9005 - base02 = "#212c38"; # Yankees Blue / 433C / 5011 - base03 = "#3f5268"; # Police Blue / 432C / 5000 - base04 = "#617b9a"; # Slate Gray / 5415C / 5014 - base05 = "#90a7c1"; # Pewter Blue / 535C / 5024 - base06 = "#c9d3df"; # Columbia Blue / 538C / 7047 - base07 = "#fcfcfc"; # Lotion / 663C / 9016 - - alt00 = "#000000"; # Black / 419C / 9005 - alt01 = "#0c0906"; # Vampire Black / 419C / 9005 - alt02 = "#312920"; # Pine Tree / 440C / 6022 - alt03 = "#5b4e3e"; # Olive Drab Camouflage / 411C / 7013 - alt04 = "#887660"; # Shadow / 404C / 7002 - alt05 = "#b8a083"; # Pale Taupe / 480C / 1019 - alt06 = "#e1cfb9"; # Desert Sand / 482C / 1015 - alt07 = "#fcfcfc"; # Lotion / 663C / 9016 - - base08 = "#ffac56"; # Rajah / 150C / 1017 - base09 = "#feea74"; # Shandy / 127C / 1016 - base0A = "#bffe8a"; # Menthol / 374C / 6018 - base0B = "#4cfefa"; # Electric Blue / 3252C / 6027 - base0C = "#62acfd"; # Blue Jeans / 279C / 5012 - base0D = "#9b9bfd"; # Maximum Blue Purple / 2715C / 4005 - base0E = "#fe9bda"; # Lavender Rose / 223C / 4003 - base0F = "#fc8999"; # Tulip / 1775C / 3014 - - alt08 = "#fe946a"; # Atomic Tangerine / 811C / 1034 - alt0B = "#87febf"; # Aquamarine / 353C / 6019 - alt0C = "#38c3fd"; # Picton Blue / 298C / 5012 - alt0D = "#dca2ff"; # Mauve / 2572C / 4005 - }; - }; -}