Fixed #167

Add catppuccin colorschemes version

assets.sh

@@ -52,167 +52,208 @@ make_assets() {
   esac
 
   if [[ "$scheme" == '-Nord' ]]; then
-      case "$theme" in
-        '')
-          theme_color_dark='#5e81ac'
-          theme_color_light='#89a3c2'
-          ;;
-        -Purple)
-          theme_color_dark='#b57daa'
-          theme_color_light='#c89dbf'
-          ;;
-        -Pink)
-          theme_color_dark='#cd7092'
-          theme_color_light='#dc98b1'
-          ;;
-        -Red)
-          theme_color_dark='#c35b65'
-          theme_color_light='#d4878f'
-          ;;
-        -Orange)
-          theme_color_dark='#d0846c'
-          theme_color_light='#dca493'
-          ;;
-        -Yellow)
-          theme_color_dark='#e4b558'
-          theme_color_light='#eac985'
-          ;;
-        -Green)
-          theme_color_dark='#82ac5d'
-          theme_color_light='#a0c082'
-          ;;
-        -Teal)
-          theme_color_dark='#63a6a5'
-          theme_color_light='#83b9b8'
-          ;;
-        -Grey)
-          theme_color_dark='#3a4150'
-          theme_color_light='#d9dce3'
-          ;;
-      esac
+    case "$theme" in
+      '')
+        theme_color_dark='#5e81ac'
+        theme_color_light='#89a3c2'
+        ;;
+      -Purple)
+        theme_color_dark='#b57daa'
+        theme_color_light='#c89dbf'
+        ;;
+      -Pink)
+        theme_color_dark='#cd7092'
+        theme_color_light='#dc98b1'
+        ;;
+      -Red)
+        theme_color_dark='#c35b65'
+        theme_color_light='#d4878f'
+        ;;
+      -Orange)
+        theme_color_dark='#d0846c'
+        theme_color_light='#dca493'
+        ;;
+      -Yellow)
+        theme_color_dark='#e4b558'
+        theme_color_light='#eac985'
+        ;;
+      -Green)
+        theme_color_dark='#82ac5d'
+        theme_color_light='#a0c082'
+        ;;
+      -Teal)
+        theme_color_dark='#63a6a5'
+        theme_color_light='#83b9b8'
+        ;;
+      -Grey)
+        theme_color_dark='#3a4150'
+        theme_color_light='#d9dce3'
+        ;;
+    esac
   fi
 
   if [[ "$scheme" == '-Dracula' ]]; then
-      case "$theme" in
-        '')
-          theme_color_dark='#a679ec'
-          theme_color_light='#bd93f9'
-          ;;
-        -Purple)
-          theme_color_dark='#a679ec'
-          theme_color_light='#bd93f9'
-          ;;
-        -Pink)
-          theme_color_dark='#f04cab'
-          theme_color_light='#ff79c6'
-          ;;
-        -Red)
-          theme_color_dark='#f44d4d'
-          theme_color_light='#ff5555'
-          ;;
-        -Orange)
-          theme_color_dark='#f8a854'
-          theme_color_light='#ffb86c'
-          ;;
-        -Yellow)
-          theme_color_dark='#e8f467'
-          theme_color_light='#f1fa8c'
-          ;;
-        -Green)
-          theme_color_dark='#4be772'
-          theme_color_light='#50fa7b'
-          ;;
-        -Teal)
-          theme_color_dark='#20eed9'
-          theme_color_light='#50fae9'
-          ;;
-        -Grey)
-          theme_color_dark='#3c3f51'
-          theme_color_light='#d9dae3'
-          ;;
-      esac
+    case "$theme" in
+      '')
+        theme_color_dark='#a679ec'
+        theme_color_light='#bd93f9'
+        ;;
+      -Purple)
+        theme_color_dark='#a679ec'
+        theme_color_light='#bd93f9'
+        ;;
+      -Pink)
+        theme_color_dark='#f04cab'
+        theme_color_light='#ff79c6'
+        ;;
+      -Red)
+        theme_color_dark='#f44d4d'
+        theme_color_light='#ff5555'
+        ;;
+      -Orange)
+        theme_color_dark='#f8a854'
+        theme_color_light='#ffb86c'
+        ;;
+      -Yellow)
+        theme_color_dark='#e8f467'
+        theme_color_light='#f1fa8c'
+        ;;
+      -Green)
+        theme_color_dark='#4be772'
+        theme_color_light='#50fa7b'
+        ;;
+      -Teal)
+        theme_color_dark='#20eed9'
+        theme_color_light='#50fae9'
+        ;;
+      -Grey)
+        theme_color_dark='#3c3f51'
+        theme_color_light='#d9dae3'
+        ;;
+    esac
   fi
 
   if [[ "$scheme" == '-Gruvbox' ]]; then
-      case "$theme" in
-        '')
-          theme_color_dark='#458588'
-          theme_color_light='#83a598'
-          ;;
-        -Purple)
-          theme_color_dark='#ab62b1'
-          theme_color_light='#d386cd'
-          ;;
-        -Pink)
-          theme_color_dark='#b16286'
-          theme_color_light='#d3869b'
-          ;;
-        -Red)
-          theme_color_dark='#cc241d'
-          theme_color_light='#fb4934'
-          ;;
-        -Orange)
-          theme_color_dark='#d65d0e'
-          theme_color_light='#fe8019'
-          ;;
-        -Yellow)
-          theme_color_dark='#d79921'
-          theme_color_light='#fabd2f'
-          ;;
-        -Green)
-          theme_color_dark='#98971a'
-          theme_color_light='#b8bb26'
-          ;;
-        -Teal)
-          theme_color_dark='#689d6a'
-          theme_color_light='#8ec07c'
-          ;;
-        -Grey)
-          theme_color_dark='#3c3836'
-          theme_color_light='#a89984'
-          ;;
-      esac
+    case "$theme" in
+      '')
+        theme_color_dark='#458588'
+        theme_color_light='#83a598'
+        ;;
+      -Purple)
+        theme_color_dark='#ab62b1'
+        theme_color_light='#d386cd'
+        ;;
+      -Pink)
+        theme_color_dark='#b16286'
+        theme_color_light='#d3869b'
+        ;;
+      -Red)
+        theme_color_dark='#cc241d'
+        theme_color_light='#fb4934'
+        ;;
+      -Orange)
+        theme_color_dark='#d65d0e'
+        theme_color_light='#fe8019'
+        ;;
+      -Yellow)
+        theme_color_dark='#d79921'
+        theme_color_light='#fabd2f'
+        ;;
+      -Green)
+        theme_color_dark='#98971a'
+        theme_color_light='#b8bb26'
+        ;;
+      -Teal)
+        theme_color_dark='#689d6a'
+        theme_color_light='#8ec07c'
+        ;;
+      -Grey)
+        theme_color_dark='#3c3836'
+        theme_color_light='#a89984'
+        ;;
+    esac
   fi
 
   if [[ "$scheme" == '-Everforest' ]]; then
-      case "$theme" in
-        '')
-          theme_color_dark='#458588'
-          theme_color_light='#83a598'
-          ;;
-        -Purple)
-          theme_color_dark='#ab62b1'
-          theme_color_light='#d386cd'
-          ;;
-        -Pink)
-          theme_color_dark='#b16286'
-          theme_color_light='#d3869b'
-          ;;
-        -Red)
-          theme_color_dark='#cc241d'
-          theme_color_light='#fb4934'
-          ;;
-        -Orange)
-          theme_color_dark='#d65d0e'
-          theme_color_light='#fe8019'
-          ;;
-        -Yellow)
-          theme_color_dark='#d79921'
-          theme_color_light='#fabd2f'
-          ;;
-        -Green)
-          theme_color_dark='#98971a'
-          theme_color_light='#b8bb26'
-          ;;
-        -Teal)
-          theme_color_dark='#689d6a'
-          theme_color_light='#8ec07c'
-          ;;
-        -Grey)
-          theme_color_dark='#3c3836'
-          theme_color_light='#a89984'
-          ;;
-      esac 
+    case "$theme" in
+      '')
+        theme_color_dark='#458588'
+        theme_color_light='#83a598'
+        ;;
+      -Purple)
+        theme_color_dark='#ab62b1'
+        theme_color_light='#d386cd'
+        ;;
+      -Pink)
+        theme_color_dark='#b16286'
+        theme_color_light='#d3869b'
+        ;;
+      -Red)
+        theme_color_dark='#cc241d'
+        theme_color_light='#fb4934'
+        ;;
+      -Orange)
+        theme_color_dark='#d65d0e'
+        theme_color_light='#fe8019'
+        ;;
+      -Yellow)
+        theme_color_dark='#d79921'
+        theme_color_light='#fabd2f'
+        ;;
+      -Green)
+        theme_color_dark='#98971a'
+        theme_color_light='#b8bb26'
+        ;;
+      -Teal)
+        theme_color_dark='#689d6a'
+        theme_color_light='#8ec07c'
+        ;;
+      -Grey)
+        theme_color_dark='#3c3836'
+        theme_color_light='#a89984'
+        ;;
+    esac
+  fi
+
+  if [[ "$scheme" == '-Catppuccin' ]]; then
+    case "$theme" in
+      '')
+        theme_color_dark='#1e66f5'
+        theme_color_light='#8caaee'
+        ;;
+      -Purple)
+        theme_color_dark='#8839ef'
+        theme_color_light='#ca9ee6'
+        ;;
+      -Pink)
+        theme_color_dark='#ea76cb'
+        theme_color_light='#f4b8e4'
+        ;;
+      -Red)
+        theme_color_dark='#e64553'
+        theme_color_light='#ea999c'
+        ;;
+      -Orange)
+        theme_color_dark='#fe640b'
+        theme_color_light='#fe8019'
+        ;;
+      -Yellow)
+        theme_color_dark='#df8e1d'
+        theme_color_light='#ef9f76'
+        ;;
+      -Green)
+        theme_color_dark='#40a02b'
+        theme_color_light='#a6d189'
+        ;;
+      -Teal)
+        theme_color_dark='#179299'
+        theme_color_light='#81c8be'
+        ;;
+      -Grey)
+        theme_color_dark='#5c5f77'
+        theme_color_light='#ccd0da'
+        ;;
+    esac
   fi
 
   if [[ "$blackness" == 'true' ]]; then
@@ -252,6 +293,13 @@ make_assets() {
         titlebar_light='#f2efdf'
         titlebar_dark='#020203'
         ;;
+      -Catppuccin)
+        background_light='#eff1f5'
+        background_dark='#181825'
+        background_darker='#1e1e2e'
+        titlebar_light='#e6e9ef'
+        titlebar_dark='#11111b'
+        ;;
     esac
   else
     case "$scheme" in
@@ -290,6 +338,13 @@ make_assets() {
         background_light='#edeada'
         background_dark='#1e2326'
         ;;
+      -Catppuccin)
+        background_light='#eff1f5'
+        background_dark='#292c3c'
+        background_darker='#303446'
+        titlebar_light='#e6e9ef'
+        titlebar_dark='#24273a'
+        ;;
     esac
   fi
 

gtkrc.sh

@@ -53,167 +53,208 @@ make_gtkrc() {
   esac
 
   if [[ "$scheme" == '-Nord' ]]; then
-      case "$theme" in
-        '')
-          theme_color_dark='#5e81ac'
-          theme_color_light='#89a3c2'
-          ;;
-        -Purple)
-          theme_color_dark='#b57daa'
-          theme_color_light='#c89dbf'
-          ;;
-        -Pink)
-          theme_color_dark='#cd7092'
-          theme_color_light='#dc98b1'
-          ;;
-        -Red)
-          theme_color_dark='#c35b65'
-          theme_color_light='#d4878f'
-          ;;
-        -Orange)
-          theme_color_dark='#d0846c'
-          theme_color_light='#dca493'
-          ;;
-        -Yellow)
-          theme_color_dark='#e4b558'
-          theme_color_light='#eac985'
-          ;;
-        -Green)
-          theme_color_dark='#82ac5d'
-          theme_color_light='#a0c082'
-          ;;
-        -Teal)
-          theme_color_dark='#63a6a5'
-          theme_color_light='#83b9b8'
-          ;;
-        -Grey)
-          theme_color_dark='#3a4150'
-          theme_color_light='#d9dce3'
-          ;;
-      esac
+    case "$theme" in
+      '')
+        theme_color_dark='#5e81ac'
+        theme_color_light='#89a3c2'
+        ;;
+      -Purple)
+        theme_color_dark='#b57daa'
+        theme_color_light='#c89dbf'
+        ;;
+      -Pink)
+        theme_color_dark='#cd7092'
+        theme_color_light='#dc98b1'
+        ;;
+      -Red)
+        theme_color_dark='#c35b65'
+        theme_color_light='#d4878f'
+        ;;
+      -Orange)
+        theme_color_dark='#d0846c'
+        theme_color_light='#dca493'
+        ;;
+      -Yellow)
+        theme_color_dark='#e4b558'
+        theme_color_light='#eac985'
+        ;;
+      -Green)
+        theme_color_dark='#82ac5d'
+        theme_color_light='#a0c082'
+        ;;
+      -Teal)
+        theme_color_dark='#63a6a5'
+        theme_color_light='#83b9b8'
+        ;;
+      -Grey)
+        theme_color_dark='#3a4150'
+        theme_color_light='#d9dce3'
+        ;;
+    esac
   fi
 
   if [[ "$scheme" == '-Dracula' ]]; then
-      case "$theme" in
-        '')
-          theme_color_dark='#a679ec'
-          theme_color_light='#bd93f9'
-          ;;
-        -Purple)
-          theme_color_dark='#a679ec'
-          theme_color_light='#bd93f9'
-          ;;
-        -Pink)
-          theme_color_dark='#f04cab'
-          theme_color_light='#ff79c6'
-          ;;
-        -Red)
-          theme_color_dark='#f44d4d'
-          theme_color_light='#ff5555'
-          ;;
-        -Orange)
-          theme_color_dark='#f8a854'
-          theme_color_light='#ffb86c'
-          ;;
-        -Yellow)
-          theme_color_dark='#e8f467'
-          theme_color_light='#f1fa8c'
-          ;;
-        -Green)
-          theme_color_dark='#4be772'
-          theme_color_light='#50fa7b'
-          ;;
-        -Teal)
-          theme_color_dark='#20eed9'
-          theme_color_light='#50fae9'
-          ;;
-        -Grey)
-          theme_color_dark='#3c3f51'
-          theme_color_light='#d9dae3'
-          ;;
-      esac
+    case "$theme" in
+      '')
+        theme_color_dark='#a679ec'
+        theme_color_light='#bd93f9'
+        ;;
+      -Purple)
+        theme_color_dark='#a679ec'
+        theme_color_light='#bd93f9'
+        ;;
+      -Pink)
+        theme_color_dark='#f04cab'
+        theme_color_light='#ff79c6'
+        ;;
+      -Red)
+        theme_color_dark='#f44d4d'
+        theme_color_light='#ff5555'
+        ;;
+      -Orange)
+        theme_color_dark='#f8a854'
+        theme_color_light='#ffb86c'
+        ;;
+      -Yellow)
+        theme_color_dark='#e8f467'
+        theme_color_light='#f1fa8c'
+        ;;
+      -Green)
+        theme_color_dark='#4be772'
+        theme_color_light='#50fa7b'
+        ;;
+      -Teal)
+        theme_color_dark='#20eed9'
+        theme_color_light='#50fae9'
+        ;;
+      -Grey)
+        theme_color_dark='#3c3f51'
+        theme_color_light='#d9dae3'
+        ;;
+    esac
   fi
 
   if [[ "$scheme" == '-Gruvbox' ]]; then
-      case "$theme" in
-        '')
-          theme_color_dark='#458588'
-          theme_color_light='#83a598'
-          ;;
-        -Purple)
-          theme_color_dark='#ab62b1'
-          theme_color_light='#d386cd'
-          ;;
-        -Pink)
-          theme_color_dark='#b16286'
-          theme_color_light='#d3869b'
-          ;;
-        -Red)
-          theme_color_dark='#cc241d'
-          theme_color_light='#fb4934'
-          ;;
-        -Orange)
-          theme_color_dark='#d65d0e'
-          theme_color_light='#fe8019'
-          ;;
-        -Yellow)
-          theme_color_dark='#d79921'
-          theme_color_light='#fabd2f'
-          ;;
-        -Green)
-          theme_color_dark='#98971a'
-          theme_color_light='#b8bb26'
-          ;;
-        -Teal)
-          theme_color_dark='#689d6a'
-          theme_color_light='#8ec07c'
-          ;;
-        -Grey)
-          theme_color_dark='#3c3836'
-          theme_color_light='#a89984'
-          ;;
-      esac
+    case "$theme" in
+      '')
+        theme_color_dark='#458588'
+        theme_color_light='#83a598'
+        ;;
+      -Purple)
+        theme_color_dark='#ab62b1'
+        theme_color_light='#d386cd'
+        ;;
+      -Pink)
+        theme_color_dark='#b16286'
+        theme_color_light='#d3869b'
+        ;;
+      -Red)
+        theme_color_dark='#cc241d'
+        theme_color_light='#fb4934'
+        ;;
+      -Orange)
+        theme_color_dark='#d65d0e'
+        theme_color_light='#fe8019'
+        ;;
+      -Yellow)
+        theme_color_dark='#d79921'
+        theme_color_light='#fabd2f'
+        ;;
+      -Green)
+        theme_color_dark='#98971a'
+        theme_color_light='#b8bb26'
+        ;;
+      -Teal)
+        theme_color_dark='#689d6a'
+        theme_color_light='#8ec07c'
+        ;;
+      -Grey)
+        theme_color_dark='#3c3836'
+        theme_color_light='#a89984'
+        ;;
+    esac
   fi
 
   if [[ "$scheme" == '-Everforest' ]]; then
-      case "$theme" in
-        '')
-          theme_color_dark='#458588'
-          theme_color_light='#83a598'
-          ;;
-        -Purple)
-          theme_color_dark='#ab62b1'
-          theme_color_light='#d386cd'
-          ;;
-        -Pink)
-          theme_color_dark='#b16286'
-          theme_color_light='#d3869b'
-          ;;
-        -Red)
-          theme_color_dark='#cc241d'
-          theme_color_light='#fb4934'
-          ;;
-        -Orange)
-          theme_color_dark='#d65d0e'
-          theme_color_light='#fe8019'
-          ;;
-        -Yellow)
-          theme_color_dark='#d79921'
-          theme_color_light='#fabd2f'
-          ;;
-        -Green)
-          theme_color_dark='#98971a'
-          theme_color_light='#b8bb26'
-          ;;
-        -Teal)
-          theme_color_dark='#689d6a'
-          theme_color_light='#8ec07c'
-          ;;
-        -Grey)
-          theme_color_dark='#3c3836'
-          theme_color_light='#a89984'
-          ;;
-      esac 
+    case "$theme" in
+      '')
+        theme_color_dark='#458588'
+        theme_color_light='#83a598'
+        ;;
+      -Purple)
+        theme_color_dark='#ab62b1'
+        theme_color_light='#d386cd'
+        ;;
+      -Pink)
+        theme_color_dark='#b16286'
+        theme_color_light='#d3869b'
+        ;;
+      -Red)
+        theme_color_dark='#cc241d'
+        theme_color_light='#fb4934'
+        ;;
+      -Orange)
+        theme_color_dark='#d65d0e'
+        theme_color_light='#fe8019'
+        ;;
+      -Yellow)
+        theme_color_dark='#d79921'
+        theme_color_light='#fabd2f'
+        ;;
+      -Green)
+        theme_color_dark='#98971a'
+        theme_color_light='#b8bb26'
+        ;;
+      -Teal)
+        theme_color_dark='#689d6a'
+        theme_color_light='#8ec07c'
+        ;;
+      -Grey)
+        theme_color_dark='#3c3836'
+        theme_color_light='#a89984'
+        ;;
+    esac
+  fi
+
+  if [[ "$scheme" == '-Catppuccin' ]]; then
+    case "$theme" in
+      '')
+        theme_color_dark='#1e66f5'
+        theme_color_light='#8caaee'
+        ;;
+      -Purple)
+        theme_color_dark='#8839ef'
+        theme_color_light='#ca9ee6'
+        ;;
+      -Pink)
+        theme_color_dark='#ea76cb'
+        theme_color_light='#f4b8e4'
+        ;;
+      -Red)
+        theme_color_dark='#e64553'
+        theme_color_light='#ea999c'
+        ;;
+      -Orange)
+        theme_color_dark='#fe640b'
+        theme_color_light='#fe8019'
+        ;;
+      -Yellow)
+        theme_color_dark='#df8e1d'
+        theme_color_light='#ef9f76'
+        ;;
+      -Green)
+        theme_color_dark='#40a02b'
+        theme_color_light='#a6d189'
+        ;;
+      -Teal)
+        theme_color_dark='#179299'
+        theme_color_light='#81c8be'
+        ;;
+      -Grey)
+        theme_color_dark='#5c5f77'
+        theme_color_light='#ccd0da'
+        ;;
+    esac
   fi
 
   if [[ "$blackness" == 'true' ]]; then
@@ -258,6 +299,14 @@ make_gtkrc() {
         titlebar_light='#f2efdf'
         titlebar_dark='#020203'
         ;;
+      -Catppuccin)
+        background_light='#eff1f5'
+        background_dark='#181825'
+        background_darker='#1e1e2e'
+        background_alt='#232634'
+        titlebar_light='#e6e9ef'
+        titlebar_dark='#11111b'
+        ;;
     esac
   else
     case "$scheme" in
@@ -301,6 +350,14 @@ make_gtkrc() {
         titlebar_light='#edeada'
         titlebar_dark='#1e2326'
         ;;
+      -Catppuccin)
+        background_light='#eff1f5'
+        background_dark='#292c3c'
+        background_darker='#303446'
+        background_alt='#4c4f69'
+        titlebar_light='#e6e9ef'
+        titlebar_dark='#24273a'
+        ;;
     esac
   fi
 

install.sh

@@ -25,7 +25,7 @@ SASSC_OPT="-M -t expanded"
 
 THEME_NAME=Colloid
 THEME_VARIANTS=('' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '-Grey')
-SCHEME_VARIANTS=('' '-Nord' '-Dracula' '-Gruvbox' '-Everforest')
+SCHEME_VARIANTS=('' '-Nord' '-Dracula' '-Gruvbox' '-Everforest' '-Catppuccin')
 COLOR_VARIANTS=('' '-Light' '-Dark')
 SIZE_VARIANTS=('' '-Compact')
 
@@ -64,13 +64,13 @@ OPTIONS:
   -s, --size VARIANT      Specify size variant [standard|compact] (Default: standard variant)
 
   -l, --libadwaita        Install specify gtk-4.0 theme into config folder ($HOME/.config/gtk-4.0) for all gtk4 apps use this theme
-                          Default ColorSchemes theme will follow the system style (light/dark mode switch), nord|dracula|gruvbox|everforest|black ColorSchemes not support this
+                          Default ColorSchemes theme will follow the system style (light/dark mode switch), all ColorSchemes versions not support this !
                           Options for default ColorSchemes:
                           1. system                      Default option (using system colors for light/dark mode switching)
                           2. fixed                       Using fixed theme colors (that will break light/dark mode switch)
 
   --tweaks                Specify versions for tweaks
-                          1. [nord|dracula|gruvbox|everforest|all]  Nord|Dracula|gruvbox|everforet|all ColorSchemes version
+                          1. [nord|dracula|gruvbox|everforest|catppuccin|all]  (Nord/Dracula/Gruvbox/Everforet/Catppuccin/all) ColorSchemes version
                           2. black                       Blackness color version
                           3. rimless                     Remove the 1px border about windows and menus
                           4. normal                      Normal windows button style like gnome default theme (titlebuttons: max/min/close)
@@ -345,6 +345,12 @@ while [[ $# -gt 0 ]]; do
             echo -e "\nEverforest ColorScheme version! ..."
             shift
             ;;
+          catppuccin)
+            colorscheme='true'
+            schemes+=("${SCHEME_VARIANTS[5]}")
+            echo -e "\nCatppuccin ColorScheme version! ..."
+            shift
+            ;;
           all)
             colorscheme='true'
             schemes+=("${SCHEME_VARIANTS[@]}")
@@ -462,6 +468,9 @@ color_schemes() {
       -Everforest)
         scheme_color='everforest'
         ;;
+      -Catppuccin)
+        scheme_color='catppuccin'
+        ;;
     esac
     sed -i "/\@import/s/color-palette-default/color-palette-${scheme_color}/" "${SRC_DIR}/sass/_tweaks-temp.scss"
     sed -i "/\$colorscheme:/s/default/${scheme_color}/" "${SRC_DIR}/sass/_tweaks-temp.scss"