sho/quickshell-rice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update sync_fastfetch to do in-place color replacements, preserving custom hamster cookie logo & boxed module layout

Browse Source
This commit is contained in:
Sho 2026-08-02 13:56:47 +09:00
parent 50edd85a91
commit dfbb0f3194
1 changed files with 37 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
quickshell/services/python/theme_sync.py
View File

@ -1620,74 +1620,52 @@ def sync_fastfetch(bg, surface, current_line, fg, accent, sub_accent, is_dark=Tr
os.path.expanduser('~/.var/app/com.github.fastfetch/config/fastfetch') os.path.expanduser('~/.var/app/com.github.fastfetch/config/fastfetch')
] ]
cyan_c = "#036a96" if not is_dark else "#80ffea"
green_c = "#14710a" if not is_dark else "#8aff80"
pink_c = "#a3144d" if not is_dark else "#ff80bf"
red_c = "#cb3a2a" if not is_dark else "#ff9580"
yellow_c = "#846e15" if not is_dark else "#ffff80"
for ff_dir in fastfetch_dirs: for ff_dir in fastfetch_dirs:
try: try:
os.makedirs(ff_dir, exist_ok=True) if not os.path.exists(ff_dir):
continue
config_path = os.path.join(ff_dir, 'config.jsonc') config_path = os.path.join(ff_dir, 'config.jsonc')
if not os.path.exists(config_path):
config_path = os.path.join(ff_dir, 'config.json')
if not os.path.exists(config_path):
continue
data = {}
if os.path.exists(config_path):
try:
with open(config_path, 'r', encoding='utf-8') as f: with open(config_path, 'r', encoding='utf-8') as f:
raw = f.read() content = f.read()
cleaned = re.sub(r'//.*', '', raw)
data = json.loads(cleaned) if cleaned.strip() else {}
except Exception:
data = {}
if not data: # Update display.color in-place
data = { if '"display"' in content and '"color"' in content:
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", content = re.sub(
"display": { r'("display"\s*:\s*\{[\s\S]*?"color"\s*:\s*\{)([\s\S]*?)(\})',
"separator": " ➜ " lambda m: m.group(1) + f'\n "keys": "{accent}",\n "title": "{sub_accent}",\n "output": "{fg}",\n "separator": "{current_line}"\n ' + m.group(3),
}, content,
"modules": [ count=1
"title", )
"separator",
"os",
"host",
"kernel",
"uptime",
"packages",
"shell",
"display",
"de",
"wm",
"theme",
"icons",
"terminal",
"cpu",
"gpu",
"memory",
"disk",
"break",
"colors"
]
}
if "display" not in data or not isinstance(data["display"], dict): # Update logo.color in-place if logo present
data["display"] = {} if '"logo"' in content and '"color"' in content:
content = re.sub(
r'("logo"\s*:\s*\{[\s\S]*?"color"\s*:\s*\{)([\s\S]*?)(\})',
lambda m: m.group(1) + f'\n "1": "{accent}",\n "2": "{sub_accent}"\n ' + m.group(3),
content,
count=1
)
data["display"]["color"] = { # Update keyColors on modules to theme-aware colors
"keys": accent, content = re.sub(r'("keyColor"\s*:\s*)"(?:#[0-9a-fA-F]{3,6}|cyan)"', r'\1"' + cyan_c + '"', content)
"title": sub_accent, content = re.sub(r'("keyColor"\s*:\s*)"(?:#[0-9a-fA-F]{3,6}|green)"', r'\1"' + green_c + '"', content)
"output": fg, content = re.sub(r'("keyColor"\s*:\s*)"(?:#[0-9a-fA-F]{3,6}|magenta)"', r'\1"' + pink_c + '"', content)
"separator": current_line content = re.sub(r'("keyColor"\s*:\s*)"(?:#[0-9a-fA-F]{3,6}|red)"', r'\1"' + red_c + '"', content)
} content = re.sub(r'("keyColor"\s*:\s*)"(?:#[0-9a-fA-F]{3,6}|yellow)"', r'\1"' + yellow_c + '"', content)
if "logo" in data and isinstance(data["logo"], dict):
data["logo"]["color"] = {
"1": accent,
"2": sub_accent
}
if "modules" in data and isinstance(data["modules"], list):
for mod in data["modules"]:
if isinstance(mod, dict) and "keyColor" in mod:
del mod["keyColor"]
with open(config_path, 'w', encoding='utf-8') as f: with open(config_path, 'w', encoding='utf-8') as f:
json.dump(data, f, indent=4) f.write(content)
except Exception: except Exception:
pass pass