kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

Added color Schemes support. Added settings GUI in colorscheme-osd

Browse Source
This commit is contained in:
midn8hustlr
2024-03-16 21:00:17 +05:30
parent 36e706be01
commit 4904cfbe71
14 changed files with 485 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/ags/scripts/color_generation/applycolor.sh
+3 -3
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
term_alpha=100 #Set this to < 100 make all your terminals transparent
term_alpha=80 #Set this to < 100 make all your terminals transparent
# sleep 0 # idk i wanted some delay or colors dont get applied properly
if [ ! -d "$HOME"/.cache/ags/user/generated ]; then
mkdir -p "$HOME"/.cache/ags/user/generated
@@ -52,7 +52,7 @@ get_light_dark() {
if [ ! -f "$HOME"/.cache/ags/user/colormode.txt ]; then
echo "" > "$HOME"/.cache/ags/user/colormode.txt
else
lightdark=$(cat "$HOME"/.cache/ags/user/colormode.txt) # either "" or "-l"
lightdark=$(sed -n '1p' "$HOME/.cache/ags/user/colormode.txt")
fi
echo "$lightdark"
}
@@ -163,7 +163,7 @@ apply_gtk() { # Using gradience-cli
# Set light/dark preference
# And set GTK theme manually as Gradience defaults to light adw-gtk3
# (which is unreadable when broken when you use dark mode)
if [ "$lightdark" = "-l" ]; then
if [ "$lightdark" = "light" ]; then
gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3'
gsettings set org.gnome.desktop.interface color-scheme 'prefer-light'
else
.config/ags/scripts/color_generation/colorgen.sh
+13 -6
View File
@@ -1,6 +1,5 @@
#!/usr/bin/env bash
source ${HOME}/virtualenvs/my_project_venv/bin/activate
# check if no arguments
if [ $# -eq 0 ]; then
@@ -9,11 +8,15 @@ if [ $# -eq 0 ]; then
fi
# check if the file ~/.cache/ags/user/colormode.txt exists. if not, create it. else, read it to $lightdark
lightdark=""
lightdark="dark"
transparency="opaque"
materialscheme="tonalspot"
if [ ! -f "$HOME/.cache/ags/user/colormode.txt" ]; then
echo "" > "$HOME/.cache/ags/user/colormode.txt"
echo "dark\nopaque\ntonalspot" > "$HOME/.cache/ags/user/colormode.txt"
else
lightdark=$(cat "$HOME/.cache/ags/user/colormode.txt") # either "" or "-l"
lightdark=$(sed -n '1p' "$HOME/.cache/ags/user/colormode.txt")
transparency=$(sed -n '2p' "$HOME/.cache/ags/user/colormode.txt")
materialscheme=$(sed -n '3p' "$HOME/.cache/ags/user/colormode.txt")
fi
backend="material" # color generator backend
if [ ! -f "$HOME/.cache/ags/user/colorbackend.txt" ]; then
@@ -24,13 +27,17 @@ fi
cd "$HOME/.config/ags/scripts/" || exit
if [[ "$1" = "#"* ]]; then # this is a color
color_generation/generate_colors_material.py --color "$1" "$lightdark" > "$HOME"/.cache/ags/user/generated/material_colors.scss
source ${HOME}/virtualenvs/my_project_venv/bin/activate
color_generation/generate_colors_material.py --color "$1" --mode "$lightdark" --scheme "$materialscheme" --transparency "$transparency" > "$HOME"/.cache/ags/user/generated/material_colors.scss
deactivate
if [ "$2" = "--apply" ]; then
cp "$HOME"/.cache/ags/user/generated/material_colors.scss "$HOME/.config/ags/scss/_material.scss"
color_generation/applycolor.sh
fi
elif [ "$backend" = "material" ]; then
color_generation/generate_colors_material.py --path "$1" "$lightdark" > "$HOME"/.cache/ags/user/generated/material_colors.scss
source ${HOME}/virtualenvs/my_project_venv/bin/activate
color_generation/generate_colors_material.py --path "$1" --mode "$lightdark" --scheme "$materialscheme" --transparency "$transparency" > "$HOME"/.cache/ags/user/generated/material_colors.scss
deactivate
if [ "$2" = "--apply" ]; then
cp "$HOME"/.cache/ags/user/generated/material_colors.scss "$HOME/.config/ags/scss/_material.scss"
color_generation/applycolor.sh
.config/ags/scripts/color_generation/generate_colors_material.py
+72 -142
View File
@@ -3,159 +3,82 @@ from material_color_utilities_python import *
from pathlib import Path
import sys
import subprocess
import argparse
import os
# Color in hue, chroma, tone form
from materialyoucolor.hct import Hct
from materialyoucolor.dynamiccolor.material_dynamic_colors import MaterialDynamicColors
# There are 9 different variants of scheme.
parser = argparse.ArgumentParser(description='Color generation script')
parser.add_argument('--path', type=str, default=None, help='generate colorscheme from image')
parser.add_argument('--color', type=str, default=None, help='generate colorscheme from color')
parser.add_argument('--mode', type=str , choices=['dark', 'light'], default='dark', help='dark or light mode')
parser.add_argument('--scheme', type=str, default=None, help='material scheme to use')
parser.add_argument('--transparency', type=str , choices=['opaque', 'transparent'], default='opaque', help='enable transparency')
parser.add_argument('--debug', action='store_true', default=False, help='debug mode')
args = parser.parse_args()
export_color_file=os.environ['HOME']+"/.cache/ags/user/color.txt"
# Default scheme -> Tonal Spot (Android Default)
from materialyoucolor.scheme.scheme_tonal_spot import SchemeTonalSpot as Scheme
#from materialyoucolor.scheme.scheme_fruit_salad import SchemeFruitSalad as Scheme
#from materialyoucolor.scheme.scheme_expressive import SchemeExpressive as Scheme
#from materialyoucolor.scheme.scheme_monochrome import SchemeMonochrome as Scheme
#from materialyoucolor.scheme.scheme_rainbow import SchemeRainbow as Scheme
#from materialyoucolor.scheme.scheme_vibrant import SchemeVibrant as Scheme
#from materialyoucolor.scheme.scheme_neutral import SchemeNeutral as Scheme
#from materialyoucolor.scheme.scheme_fidelity import SchemeFidelity as Scheme
#from materialyoucolor.scheme.scheme_content import SchemeContent as Scheme
# Others you can import: SchemeExpressive, SchemeFruitSalad, SchemeMonochrome, SchemeRainbow, SchemeVibrant, SchemeNeutral, SchemeFidelity and SchemeContent
if args.scheme is not None:
if args.scheme == 'fruitsalad':
from materialyoucolor.scheme.scheme_fruit_salad import SchemeFruitSalad as Scheme
elif args.scheme == 'expressive':
from materialyoucolor.scheme.scheme_expressive import SchemeExpressive as Scheme
elif args.scheme == 'monochrome':
from materialyoucolor.scheme.scheme_monochrome import SchemeMonochrome as Scheme
elif args.scheme == 'rainbow':
from materialyoucolor.scheme.scheme_rainbow import SchemeRainbow as Scheme
elif args.scheme == 'vibrant':
from materialyoucolor.scheme.scheme_vibrant import SchemeVibrant as Scheme
elif args.scheme == 'neutral':
from materialyoucolor.scheme.scheme_neutral import SchemeNeutral as Scheme
elif args.scheme == 'fidelity':
from materialyoucolor.scheme.scheme_fidelity import SchemeFidelity as Scheme
elif args.scheme == 'content':
from materialyoucolor.scheme.scheme_content import SchemeContent as Scheme
def darken(hex_color, factor=0.7):
if not (hex_color.startswith('#') and len(hex_color) in (4, 7)):
raise ValueError("Invalid hex color format")
hex_color = hex_color.lstrip('#')
rgb = tuple(int(hex_color[i:i + 2], 16) for i in (0, 2, 4))
darkened_rgb = tuple(int(max(0, val * factor)) for val in rgb)
darkened_hex = "#{:02X}{:02X}{:02X}".format(*darkened_rgb)
return darkened_hex
def hex_to_argb(hex_color):
color = hex_color.lstrip('#')
if len(color) != 6:
raise ValueError("Invalid color code!")
r = int(color[:2], 16)
g = int(color[2:4], 16)
b = int(color[4:], 16)
a = 255
argb = (a << 24) | (r << 16) | (g << 8) | b
return argb
img = 0
newtheme=0
if len(sys.argv) > 1 and sys.argv[1] == '--path':
# try:
img = Image.open(sys.argv[2])
def argb_to_hex(argb_value):
r = (argb_value >> 16) & 0xff
g = (argb_value >> 8) & 0xff
b = argb_value & 0xff
hex_r = format(r, '02x')
hex_g = format(g, '02x')
hex_b = format(b, '02x')
hex_color = f"#{hex_r}{hex_g}{hex_b}"
return hex_color
darkmode = (args.mode == 'dark')
transparent = (args.transparency == 'transparent')
print(f"$darkmode: {darkmode};")
print(f"$transparent: {transparent};")
if args.path is not None:
img = Image.open(args.path)
basewidth = 64
wpercent = (basewidth/float(img.size[0]))
hsize = int((float(img.size[1])*float(wpercent)))
img = img.resize((basewidth,hsize),Image.Resampling.LANCZOS)
newtheme = themeFromImage(img)
argb = sourceColorFromImage(img)
with open(export_color_file, 'w') as file:
file.write(argb_to_hex(argb))
elif args.color is not None:
argb = hex_to_argb(args.color)
scheme = Scheme(Hct.from_int(argb), True, 0.0)
# except FileNotFoundError:
# print('[generate_colors_material.py] File not found', file=sys.stderr);
# exit()
# except:
# print('[generate_colors_material.py] Something went wrong', file=sys.stderr);
# exit()
elif len(sys.argv) > 1 and sys.argv[1] == '--color':
colorstr = sys.argv[2]
newtheme = themeFromSourceColor(argbFromHex(colorstr))
else:
# try:
# imagePath = subprocess.check_output("ags run-js 'wallpaper.get(0)'", shell=True)
imagePath = subprocess.check_output("swww query | awk -F 'image: ' '{print $2}'", shell=True)
imagePath = imagePath[:-1].decode("utf-8")
img = Image.open(imagePath)
basewidth = 64
wpercent = (basewidth/float(img.size[0]))
hsize = int((float(img.size[1])*float(wpercent)))
img = img.resize((basewidth,hsize),Image.Resampling.LANCZOS)
newtheme = themeFromImage(img)
# except FileNotFoundError:
# print('[generate_colors_material.py] File not found', file=sys.stderr)
# exit()
# except:
# print('[generate_colors_material.py] Something went wrong', file=sys.stderr);
# exit()
colorscheme=0
darkmode = True
if("-l" in sys.argv):
darkmode = False
colorscheme = newtheme.get('schemes').get('light')
print('$darkmode: false;')
else:
colorscheme = newtheme.get('schemes').get('dark')
print('$darkmode: true;')
#primary = hexFromArgb(colorscheme.get_primary())
#onPrimary = hexFromArgb(colorscheme.get_onPrimary())
#primaryContainer = hexFromArgb(colorscheme.get_primaryContainer())
#onPrimaryContainer = hexFromArgb(colorscheme.get_onPrimaryContainer())
#secondary = hexFromArgb(colorscheme.get_secondary())
#onSecondary = hexFromArgb(colorscheme.get_onSecondary())
#secondaryContainer = hexFromArgb(colorscheme.get_secondaryContainer())
#onSecondaryContainer = hexFromArgb(colorscheme.get_onSecondaryContainer())
#tertiary = hexFromArgb(colorscheme.get_tertiary())
#onTertiary = hexFromArgb(colorscheme.get_onTertiary())
#tertiaryContainer = hexFromArgb(colorscheme.get_tertiaryContainer())
#onTertiaryContainer = hexFromArgb(colorscheme.get_onTertiaryContainer())
#error = hexFromArgb(colorscheme.get_error())
#onError = hexFromArgb(colorscheme.get_onError())
#errorContainer = hexFromArgb(colorscheme.get_errorContainer())
#onErrorContainer = hexFromArgb(colorscheme.get_onErrorContainer())
#background = hexFromArgb(colorscheme.get_background())
#onBackground = hexFromArgb(colorscheme.get_onBackground())
#surface = hexFromArgb(colorscheme.get_surface())
#onSurface = hexFromArgb(colorscheme.get_onSurface())
#surfaceVariant = hexFromArgb(colorscheme.get_surfaceVariant())
#onSurfaceVariant = hexFromArgb(colorscheme.get_onSurfaceVariant())
#outline = hexFromArgb(colorscheme.get_outline())
#shadow = hexFromArgb(colorscheme.get_shadow())
#inverseSurface = hexFromArgb(colorscheme.get_inverseSurface())
#inverseOnSurface = hexFromArgb(colorscheme.get_inverseOnSurface())
#inversePrimary = hexFromArgb(colorscheme.get_inversePrimary())
# make material less boring
#if darkmode:
# background = darken(background, 0.6)
#print('$primary: ' + primary + ';')
#print('$onPrimary: ' + onPrimary + ';')
#print('$primaryContainer: ' + primaryContainer + ';')
#print('$onPrimaryContainer: ' + onPrimaryContainer + ';')
#print('$secondary: ' + secondary + ';')
#print('$onSecondary: ' + onSecondary + ';')
#print('$secondaryContainer: ' + secondaryContainer + ';')
#print('$onSecondaryContainer: ' + onSecondaryContainer + ';')
#print('$tertiary: ' + tertiary + ';')
#print('$onTertiary: ' + onTertiary + ';')
#print('$tertiaryContainer: ' + tertiaryContainer + ';')
#print('$onTertiaryContainer: ' + onTertiaryContainer + ';')
#print('$error: ' + error + ';')
#print('$onError: ' + onError + ';')
#print('$errorContainer: ' + errorContainer + ';')
#print('$onErrorContainer: ' + onErrorContainer + ';')
#print('$colorbarbg: ' + background + ';')
#print('$background: ' + background + ';')
#print('$onBackground: ' + onBackground + ';')
#print('$surface: ' + surface + ';')
#print('$onSurface: ' + onSurface + ';')
#print('$surfaceVariant: ' + surfaceVariant + ';')
#print('$onSurfaceVariant: ' + onSurfaceVariant + ';')
#print('$outline: ' + outline + ';')
#print('$shadow: ' + shadow + ';')
#print('$inverseSurface: ' + inverseSurface + ';')
#print('$inverseOnSurface: ' + inverseOnSurface + ';')
#print('$inversePrimary: ' + inversePrimary + ';')
#print('$indsddsdversePrimary: ' + inversePrimary + ';')
if len(sys.argv) > 4:
if sys.argv[4] == '--debug':
for color in vars(MaterialDynamicColors).keys():
color_name = getattr(MaterialDynamicColors, color)
if hasattr(color_name, "get_hct"):
rgba = color_name.get_hct(scheme).to_rgba()
r, g, b, a = rgba
hex_color = f"#{r:02X}{g:02X}{b:02X}"
print(color.ljust(32), "\x1B[38;2;{};{};{}m{}\x1B[0m".format(rgba[0], rgba[1], rgba[2], "\x1b[7m \x1b[7m"), hex_color)
print('\nHey :\n')
scheme = Scheme(Hct.from_int(argb), darkmode, 0.0)
for color in vars(MaterialDynamicColors).keys():
color_name = getattr(MaterialDynamicColors, color)
@@ -165,4 +88,11 @@ for color in vars(MaterialDynamicColors).keys():
hex_color = f"#{r:02X}{g:02X}{b:02X}"
print('$' + color + ': ' + hex_color + ';')
print('$colorbarbg: ' + '#000000' + ';')
if args.debug == True:
for color in vars(MaterialDynamicColors).keys():
color_name = getattr(MaterialDynamicColors, color)
if hasattr(color_name, "get_hct"):
rgba = color_name.get_hct(scheme).to_rgba()
r, g, b, a = rgba
hex_color = f"#{r:02X}{g:02X}{b:02X}"
print(color.ljust(32), "\x1B[38;2;{};{};{}m{}\x1B[0m".format(rgba[0], rgba[1], rgba[2], "\x1b[7m \x1b[7m"), hex_color)
.config/ags/scripts/color_generation/switchcolor.sh
+5 -1
View File
@@ -1,6 +1,10 @@
#!/usr/bin/env bash
color=$(hyprpicker --no-fancy)
if [ "$1" == "--pick" ]; then
color=$(hyprpicker --no-fancy)
else
color=$(cut -f1 "${HOME}/.cache/ags/user/color.txt")
fi
# Generate colors for ags n stuff
"$HOME"/.config/ags/scripts/color_generation/colorgen.sh "${color}" --apply
.config/ags/scripts/color_generation/switchwall.sh
+1 -1
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
if [ "$1" == "--noswitch" ]; then
imgpath=$(swww query | awk -F 'image: ' '{print $2}')
imgpath=$(swww query | awk -F 'image: ' '{print $2}' | head -n 1)
# imgpath=$(ags run-js 'wallpaper.get(0)')
else
# Select and set image (hyprland)