Compare commits
22 Commits
v1.0.0-rc1
...
v1.0.0-rc4
| Author | SHA1 | Date | |
|---|---|---|---|
|
495589d9f8 | ||
|
455dd7b403 | ||
|
|
b40c355ba3 | ||
|
|
001ba5bf12 | ||
|
|
1c336f20ad | ||
|
14cee4c1f5 | ||
|
|
febd32f208 | ||
|
|
663f6c61f8 | ||
|
|
b2f3d267e4 | ||
|
|
e72416ae5e | ||
|
|
87a5f92f4b | ||
|
|
b508c0ff2d | ||
|
|
44be6bb595 | ||
|
|
6eeda71fb7 | ||
|
|
5c3ec52e39 | ||
|
|
084c3acde7 | ||
|
|
66c2314f9c | ||
|
|
8d8949e96d | ||
|
|
89d94d64cb | ||
|
|
13f2a344c8 | ||
|
63c8fd9dee | ||
|
|
0fa26adccc |
20
.github/ISSUE_TEMPLATE/bug.yml
vendored
20
.github/ISSUE_TEMPLATE/bug.yml
vendored
@@ -25,18 +25,24 @@ body:
|
||||
attributes:
|
||||
label: How did you install the theme?
|
||||
options:
|
||||
- GitHub Release
|
||||
- AUR Package
|
||||
- catppuccin/nix
|
||||
- Nixpkgs
|
||||
- Flatpak
|
||||
- From source (Python script)
|
||||
- From release (install.py)
|
||||
- From release (manual installation)
|
||||
- From source (build.py)
|
||||
- Nix (nixpkgs / catppuccin/nix)
|
||||
- AUR package
|
||||
validations:
|
||||
required: true
|
||||
- type: checkboxes
|
||||
attributes:
|
||||
label: Are you running the latest release, and if not does the issue persist there?
|
||||
description: "Our latest release can be found under the [GitHub releases](https://github.com/catppuccin/gtk/releases/latest)"
|
||||
options:
|
||||
- label: I am running on the latest release & the issue persists there
|
||||
required: true
|
||||
- type: checkboxes
|
||||
attributes:
|
||||
label: If using GTK4, have you symlinked the "gtk-4.0" folder?
|
||||
description: "The instructions for symlinking are described in the [README](https://github.com/catppuccin/gtk/tree/877e75568c9bb0d57c7ddda85b246fa17af45e57?tab=readme-ov-file#for-gtk-4-users)."
|
||||
description: "The instructions for symlinking are described at the bottom of the [Manual Installation guide](https://github.com/catppuccin/gtk/tree/663f6c61f8cf1fcbbeb72110bf6b0a0214755245?tab=readme-ov-file#manual-installation)."
|
||||
options:
|
||||
- label: I have symlinked the `gtk-4.0` folder.
|
||||
required: false
|
||||
|
||||
35
.github/workflows/build.yml
vendored
Normal file
35
.github/workflows/build.yml
vendored
Normal file
@@ -0,0 +1,35 @@
|
||||
name: "Generate test artifacts"
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types: [opened, reopened, synchronize]
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: true
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11"
|
||||
cache: "pip"
|
||||
- name: Install dependencies
|
||||
run: pip install -r requirements.txt
|
||||
- name: Install colloid specific dependencies
|
||||
run: sudo apt update && sudo apt install -y sassc inkscape optipng
|
||||
- name: Generate themes
|
||||
run: |
|
||||
python patches/xfwm4/generate_assets.py
|
||||
|
||||
python ./build.py mocha --all-accents --zip -d $PWD/releases &&
|
||||
python ./build.py macchiato --all-accents --zip -d $PWD/releases &&
|
||||
python ./build.py frappe --all-accents --zip -d $PWD/releases &&
|
||||
python ./build.py latte --all-accents --zip -d $PWD/releases
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: '${{ github.sha }}-artifacts'
|
||||
path: ./releases/*.zip
|
||||
|
||||
10
.github/workflows/release.yml
vendored
10
.github/workflows/release.yml
vendored
@@ -1,4 +1,4 @@
|
||||
name: "Release"
|
||||
name: "Mainline release"
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -22,10 +22,10 @@ jobs:
|
||||
run: sudo apt update && sudo apt install -y sassc inkscape optipng
|
||||
- name: Generate themes
|
||||
run: |
|
||||
python ./build.py mocha -a all --zip -d $PWD/releases &&
|
||||
python ./build.py macchiato -a all --zip -d $PWD/releases &&
|
||||
python ./build.py frappe -a all --zip -d $PWD/releases &&
|
||||
python ./build.py latte -a all --zip -d $PWD/releases
|
||||
python ./build.py mocha --all-accents --zip -d $PWD/releases &&
|
||||
python ./build.py macchiato --all-accents --zip -d $PWD/releases &&
|
||||
python ./build.py frappe --all-accents --zip -d $PWD/releases &&
|
||||
python ./build.py latte --all-accents --zip -d $PWD/releases
|
||||
- name: Add zips to release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
|
||||
68
CONTRIBUTING.md
Normal file
68
CONTRIBUTING.md
Normal file
@@ -0,0 +1,68 @@
|
||||
## Development
|
||||
|
||||
### Requirements
|
||||
- All the [requirements for building](#building)
|
||||
- `whiskers`, optionally, from [catppuccin/toolbox](https://github.com/catppuccin/toolbox/tree/main/whiskers#installation)
|
||||
|
||||
### Patching colloid
|
||||
> [!TIP]
|
||||
> If you need to change the patches, reset the submodule and rerun the build script.
|
||||
|
||||
We patch upstream colloid through a series of `.patch` files, applied through `git apply` once when the build begins.
|
||||
The patches are located in `./patches/colloid/`.
|
||||
|
||||
Once the build script patches the submodule, it will write a file into
|
||||
`colloid/.patched`, to signal to future invocations that the patches have already been applied.
|
||||
|
||||
The palette patches are generated through `whiskers`,
|
||||
so if you're changing them, they will need regenerated. Simply run `whiskers palette.tera` to rebuild them.
|
||||
|
||||
The process for building the theme is [documented in the README](./README.md#building).
|
||||
|
||||
### Upstreaming procedure
|
||||
|
||||
Now and again, Colloid will have bugs upstream that impacts our theme. With our patching system we can easily fix these problems,
|
||||
but we still want to contribute the fixes upstream to benefit all users & forks of Colloid.
|
||||
|
||||
To avoid stalling unnecessarily, our procedure for the above is as follows:
|
||||
1) Open a PR to fix the issue, by adding a patch file to our theme, add `upstream:intended`
|
||||
to signal these changes are to be sent to Colloid eventually.
|
||||
2) Merge the PR & close the issue in our theme pertaining to the issue, once reviewed and approved
|
||||
3) Open a PR in Colloid with the patch
|
||||
4) Open a new issue in our theme, with these details:
|
||||
- The initial issue in our theme
|
||||
- The PR in Colloid that fixes the issue there
|
||||
- The PR that fixed the issue in our theme
|
||||
|
||||
Add the `upstream:open` label
|
||||
5) Once the PR is merged in Colloid:
|
||||
1) Test that the issue no longer persists, without our patch
|
||||
2) Open a PR to remove the patch file in our theme, with these details:
|
||||
- The tracking issue
|
||||
- The commit that fixed the issue in Colloid
|
||||
3) Close the tracking issue & merge the PR to remove the patch file
|
||||
|
||||
|
||||
### Running test builds
|
||||
We support building and publishing test builds from PRs. When you open PRs, the CI will automatically build with your changes and push an artifact
|
||||
which bundles all of the produced themes.
|
||||
|
||||
You can then download the artifacts as a zip (result should look similar to 7bff2448a81e36bf3b0e03bfbd649bebe6973ec7-artifacts.zip) and
|
||||
pass the path into `install.py` under the `--from-artifact` option:
|
||||
```bash
|
||||
python3 install.py mocha blue --dest ./build --from-artifact ~/downloads/7bff2448a81e36bf3b0e03bfbd649bebe6973ec7-artifacts.zip
|
||||
```
|
||||
|
||||
This will take the target flavor / accent out of the zip, and install it using the regular install process.
|
||||
|
||||
It is advised to pass a `--dest` when running in this mode, because the released zips follow the exact same naming scheme as regular builds.
|
||||
This wil cause conflicts when you install, if you already had that theme installed. Passing a different destination allows you to move the
|
||||
extracted folders to `~/.local/share/themes` yourself, adding a suffix as appropriate to avoid conflicts.
|
||||
|
||||
> [!WARNING]
|
||||
> If you pass `--link` to the install script when working from a PR, it will forcibly overwrite your `~/.config/gtk-4.0/` symlinks.
|
||||
> You will have to reinstall / relink to revert this.
|
||||
|
||||
### Useful resources
|
||||
- GNOME-shell sources: https://gitlab.gnome.org/GNOME/gnome-shell/-/tree/gnome-46/data/theme
|
||||
- GTK inspector guide: https://developer.gnome.org/documentation/tools/inspector.html
|
||||
183
README.md
183
README.md
@@ -1,14 +1,14 @@
|
||||
<h3 align="center">
|
||||
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/logos/exports/1544x1544_circle.png" width="100" alt="Logo"/><br/>
|
||||
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
|
||||
Catppuccin for <a href="https://gtk.org/">GTK</a>
|
||||
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
|
||||
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/logos/exports/1544x1544_circle.png" width="100" alt="Logo"/><br/>
|
||||
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
|
||||
Catppuccin for <a href="https://gtk.org/">GTK</a>
|
||||
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
|
||||
</h3>
|
||||
|
||||
<p align="center">
|
||||
<a href="https://github.com/catppuccin/gtk/stargazers"><img src="https://img.shields.io/github/stars/catppuccin/gtk?colorA=363a4f&colorB=b7bdf8&style=for-the-badge"></a>
|
||||
<a href="https://github.com/catppuccin/gtk/issues"><img src="https://img.shields.io/github/issues/catppuccin/gtk?colorA=363a4f&colorB=f5a97f&style=for-the-badge"></a>
|
||||
<a href="https://github.com/catppuccin/gtk/contributors"><img src="https://img.shields.io/github/contributors/catppuccin/gtk?colorA=363a4f&colorB=a6da95&style=for-the-badge"></a>
|
||||
<a href="https://github.com/catppuccin/gtk/stargazers"><img src="https://img.shields.io/github/stars/catppuccin/gtk?colorA=363a4f&colorB=b7bdf8&style=for-the-badge"></a>
|
||||
<a href="https://github.com/catppuccin/gtk/issues"><img src="https://img.shields.io/github/issues/catppuccin/gtk?colorA=363a4f&colorB=f5a97f&style=for-the-badge"></a>
|
||||
<a href="https://github.com/catppuccin/gtk/contributors"><img src="https://img.shields.io/github/contributors/catppuccin/gtk?colorA=363a4f&colorB=a6da95&style=for-the-badge"></a>
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
@@ -17,78 +17,54 @@
|
||||
|
||||
This GTK theme is based on the [Colloid](https://github.com/vinceliuice/Colloid-gtk-theme) theme made by [vinceliuice](https://github.com/vinceliuice)
|
||||
|
||||
## Usage
|
||||
## Installation
|
||||
|
||||
### Requirements
|
||||
This GTK theme requires:
|
||||
|
||||
- GTK >=3.20
|
||||
- `python3`
|
||||
- `gnome-themes-extra` (or `gnome-themes-standard`)
|
||||
- GTK `>=3.20`
|
||||
- Python 3+
|
||||
|
||||
To build the theme, make sure the following packages are installed:
|
||||
- `sassc`
|
||||
- `inkscape`
|
||||
- `optipng`
|
||||
### Automated script
|
||||
|
||||
### Manually
|
||||
We provide a Python script to automate the process of installing the theme:
|
||||
|
||||
1. Download and extract the theme zip from the [latest release](https://github.com/catppuccin/gtk/releases/latest/).
|
||||
2. Move the theme folder to the `~/.local/share/themes` directory.
|
||||
3. Select the downloaded theme via your desktop specific tweaks application (GNOME Tweaks on GNOME 3+).
|
||||
4. To theme other apps that are using GTK, make sure to run the following command:
|
||||
```bash
|
||||
export THEME_DIR="~/.local/share/themes/catppuccin-<flavor>-<accent>-standard+default"
|
||||
mkdir -p "${HOME}/.config/gtk-4.0" &&
|
||||
ln -sf "${THEME_DIR}/gtk-4.0/assets" "${HOME}/.config/gtk-4.0/assets" &&
|
||||
ln -sf "${THEME_DIR}/gtk-4.0/gtk.css" "${HOME}/.config/gtk-4.0/gtk.css" &&
|
||||
ln -sf "${THEME_DIR}/gtk-4.0/gtk-dark.css" "${HOME}/.config/gtk-4.0/gtk-dark.css"
|
||||
```
|
||||
|
||||
### Flatpak
|
||||
|
||||
In order for Flatpak to access the theme, make sure to run the following command:
|
||||
```bash
|
||||
sudo flatpak override --filesystem=$HOME/.local/share/themes
|
||||
```
|
||||
|
||||
Then, run the following command to apply the theme.
|
||||
```bash
|
||||
export THEME_DIR="~/.local/share/themes/catppuccin-<flavor>-<accent>-standard+default"
|
||||
sudo flatpak override --env=GTK_THEME=$THEME_DIR
|
||||
```
|
||||
|
||||
### Using the install script to install the theme
|
||||
|
||||
To install the theme using the install script, run `install.py`:
|
||||
```
|
||||
curl -LsS "https://raw.githubusercontent.com/catppuccin/gtk/main/install.py" -o install.py
|
||||
python3 install.py <flavor> <accent>
|
||||
[catppuccin-gtk] [INFO] - Installation info:
|
||||
flavor: mocha
|
||||
accent: blue
|
||||
dest: /home/<user>/.local/share/themes
|
||||
link: False
|
||||
|
||||
remote_url: https://github.com/catppuccin/gtk/releases/download/v1.0.0-alpha/catppuccin-mocha-blue-standard+default.zip
|
||||
[catppuccin-gtk] [INFO] - Starting download...
|
||||
[catppuccin-gtk] [INFO] - Response status: 200
|
||||
[catppuccin-gtk] [INFO] - Download finished, zip is valid
|
||||
[catppuccin-gtk] [INFO] - Verifying download..
|
||||
[catppuccin-gtk] [INFO] - Download verified
|
||||
[catppuccin-gtk] [INFO] - Extracting...
|
||||
[catppuccin-gtk] [INFO] - Extraction complete
|
||||
[catppuccin-gtk] [INFO] - Theme installation complete!
|
||||
```
|
||||
|
||||
If you have adwaita installed, make sure to include `--link` in order to add symlinks for it:
|
||||
```
|
||||
python3 install.py <flavor> <accent> --link
|
||||
```
|
||||
Run the command and the gtk theme should be installed!
|
||||
### Arch Linux
|
||||
|
||||
### AUR
|
||||
|
||||
We have 4 AUR packages for all the 4 flavours (Latte, Frappe, Macchiato, Mocha)
|
||||
|
||||
With your favourite AUR helper, you can install one of these flavors:
|
||||
With your favourite AUR helper, you can install your flavor of choice:
|
||||
|
||||
```bash
|
||||
yay -S catppuccin-gtk-theme-<flavor>
|
||||
paru -S catppuccin-gtk-theme-<flavor>
|
||||
```
|
||||
|
||||
### Nix
|
||||
|
||||
We suggest you use [catppuccin/nix](https://github.com/catppuccin/nix).
|
||||
Alternatively, you can use [catppuccin-gtk](https://github.com/NixOS/nixpkgs/blob/master/pkgs/data/themes/catppuccin-gtk/default.nix) from nixpkgs.
|
||||
We have created a Nix module ([catppuccin/nix](https://github.com/catppuccin/nix)) for theming apps under Nix, and recommend that you use it.
|
||||
You can set up our Nix module for GTK with the following config:
|
||||
|
||||
```nix
|
||||
{inputs, ...}: {
|
||||
imports = [inputs.catppuccin.homeManagerModules.catppuccin];
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
catppuccin = {
|
||||
@@ -103,19 +79,100 @@ Alternatively, you can use [catppuccin-gtk](https://github.com/NixOS/nixpkgs/blo
|
||||
```
|
||||
|
||||
> [!TIP]
|
||||
> For further information on the options available, see the [full documentation](https://github.com/catppuccin/nix/blob/main/docs/home-manager-options.md#gtkcatppuccinenable).
|
||||
> For further information on the options available with our module, see the [full documentation](https://github.com/catppuccin/nix/blob/main/docs/home-manager-options.md#gtkcatppuccinenable).
|
||||
|
||||
### For Other Distros
|
||||
Alternatively, if you are not using our Nix module, you can grab the theme from [nixpkgs/catppuccin-gtk](https://github.com/NixOS/nixpkgs/blob/master/pkgs/data/themes/catppuccin-gtk/default.nix)
|
||||
|
||||
Refer to [Using the install script to install the theme](https://github.com/catppuccin/gtk/edit/refactor/build-system/README.md#installing-the-theme-manually) or [Installing the theme manually](https://github.com/catppuccin/gtk/edit/refactor/build-system/README.md#installing-the-theme-manually).
|
||||
## Flatpak
|
||||
Flatpak by default restricts access to themes, to allow access, use the following:
|
||||
```bash
|
||||
sudo flatpak override --filesystem=$HOME/.local/share/themes
|
||||
```
|
||||
|
||||
### Theming the GDM Theme
|
||||
In order to theme the GDM theme, install the `gdm-settings` app, select the Catppuccin theme, and click *Save*.
|
||||
After you've allowed access, set the theme, using the following:
|
||||
```bash
|
||||
# Change to suite your flavor / accent combination
|
||||
export FLAVOR="mocha"
|
||||
export ACCENT="mauve"
|
||||
|
||||
# Set the theme
|
||||
sudo flatpak override --env=GTK_THEME="catppuccin-${FLAVOR}-${ACCENT}-standard+default"
|
||||
```
|
||||
|
||||
### Manual installation
|
||||
|
||||
If your distro does not package our theme, and the installation script will not work for your use case, you can pull down releases and extract them yourself. You can find the [latest release on GitHub](https://github.com/catppuccin/gtk/releases/latest).
|
||||
|
||||
```bash
|
||||
cd ~/.local/share/themes
|
||||
|
||||
# Set the root URL
|
||||
export ROOT_URL="https://https://github.com/catppuccin/gtk/releases/download"
|
||||
|
||||
# Change to the tag you want to download
|
||||
export RELEASE="v1.0.0"
|
||||
|
||||
# Change to suite your flavor / accent combination
|
||||
export FLAVOR="mocha"
|
||||
export ACCENT="mauve"
|
||||
curl -LsS "${ROOT_URL}/${RELEASE}/catppuccin-${FLAVOR}-${ACCENT}-standard+default.zip"
|
||||
|
||||
# Extract the catppuccin zip file
|
||||
unzip catppuccin-${FLAVOR}-${ACCENT}-standard+default.zip
|
||||
|
||||
# Set the catppuccin theme directory
|
||||
export THEME_DIR="$HOME/.local/share/themes/catppuccin-${FLAVOR}-${ACCENT}-standard+default"
|
||||
|
||||
# Optionally, add support for libadwaita
|
||||
mkdir -p "${HOME}/.config/gtk-4.0" &&
|
||||
ln -sf "${THEME_DIR}/gtk-4.0/assets" "${HOME}/.config/gtk-4.0/assets" &&
|
||||
ln -sf "${THEME_DIR}/gtk-4.0/gtk.css" "${HOME}/.config/gtk-4.0/gtk.css" &&
|
||||
ln -sf "${THEME_DIR}/gtk-4.0/gtk-dark.css" "${HOME}/.config/gtk-4.0/gtk-dark.css"
|
||||
```
|
||||
|
||||
## Building
|
||||
|
||||
If our prebuilt offerings do not match your requirements, you will have to build the theme from source.
|
||||
|
||||
### Requirements
|
||||
|
||||
- Python 3+
|
||||
- `sassc`, the Sass compiler
|
||||
- `inkscape`, `optipng`, for rendering PNGs
|
||||
|
||||
> [!WARNING]
|
||||
> We use a submodule to bring in colloid, the theme this theme is based on. You will need to clone
|
||||
> with `git clone <url> --recurse-submodules` to bring in the submodule.
|
||||
|
||||
To build the theme, simply invoke `build.py`:
|
||||
|
||||
```bash
|
||||
python3 build.py mocha --dest ./build -a rosewater --tweaks rimless
|
||||
[catppuccin-gtk] [INFO] - Patches seem to be applied, remove "colloid/.patched" to force application (this may fail)
|
||||
[catppuccin-gtk] [INFO] - Building temp tweaks file
|
||||
[catppuccin-gtk] [INFO] - Inserting gnome-shell imports
|
||||
[catppuccin-gtk] [INFO] - Building main theme
|
||||
[catppuccin-gtk] [INFO] - Build info:
|
||||
build_root: ./build
|
||||
theme_name: catppuccin
|
||||
flavor: mocha
|
||||
accent: rosewater
|
||||
size: standard
|
||||
tweaks: Tweaks(tweaks=['rimless'])
|
||||
[catppuccin-gtk] [INFO] - Building into './build/catppuccin-mocha-rosewater-standard+rimless'...
|
||||
[catppuccin-gtk] [INFO] - Main build complete
|
||||
[catppuccin-gtk] [INFO] - Bundling assets...
|
||||
[catppuccin-gtk] [INFO] - Asset bundling done
|
||||
[catppuccin-gtk] [INFO] - Done!
|
||||
```
|
||||
|
||||
You can now find the built theme under `./build`. If you want to package the theme up as a zip instead, pass `--zip` to the build script.
|
||||
|
||||
## 💝 Thanks to
|
||||
|
||||
**Current maintainers**
|
||||
|
||||
- [nullishamy](https://github.com/nullishamy)
|
||||
- [npv12](https://github.com/npv12)
|
||||
- [ghostx31](https://github.com/ghostx31)
|
||||
- [Syndrizzle](https://github.com/Syndrizzle)
|
||||
|
||||
117
build.py
117
build.py
@@ -1,4 +1,4 @@
|
||||
#! /usr/bin/env python3
|
||||
#!/usr/bin/env python3
|
||||
import os, re, shutil, subprocess, argparse, glob, logging, zipfile
|
||||
|
||||
from dataclasses import dataclass
|
||||
@@ -190,15 +190,15 @@ def build(ctx: BuildContext):
|
||||
|
||||
if not ctx.flavor.dark:
|
||||
shutil.copytree(
|
||||
f"{SRC_DIR}/main/plank/theme-Light-Catppuccin/", f"{output_dir}/plank"
|
||||
f"{SRC_DIR}/main/plank/theme-Light-Catppuccin/", f"{output_dir}/plank", dirs_exist_ok=True
|
||||
)
|
||||
else:
|
||||
shutil.copytree(
|
||||
f"{SRC_DIR}/main/plank/theme-Dark-Catppuccin/", f"{output_dir}/plank"
|
||||
f"{SRC_DIR}/main/plank/theme-Dark-Catppuccin/", f"{output_dir}/plank", dirs_exist_ok=True
|
||||
)
|
||||
|
||||
|
||||
def tweaks_temp():
|
||||
def init_tweaks_temp():
|
||||
shutil.copyfile(f"{SRC_DIR}/sass/_tweaks.scss", f"{SRC_DIR}/sass/_tweaks-temp.scss")
|
||||
|
||||
|
||||
@@ -262,7 +262,7 @@ def write_tweak(key, default, value):
|
||||
|
||||
|
||||
def apply_tweaks(ctx: BuildContext):
|
||||
write_tweak("theme", "'default'", translate_accent(ctx.accent))
|
||||
write_tweak("theme", "'default'", f"'{translate_accent(ctx.accent)}'")
|
||||
|
||||
if ctx.size == "compact":
|
||||
write_tweak("compact", "'false'", "'true'")
|
||||
@@ -393,17 +393,16 @@ def make_assets(ctx: BuildContext):
|
||||
f"{output_dir}/metacity-1/thumbnail.png",
|
||||
)
|
||||
|
||||
# TODO: Make our own assets for this and patch them in with the patch system, then code it to be
|
||||
# {src_dir}/assets/xfwm4/assets{light_suffix}-Catppuccin/
|
||||
# where assets-Light-Catppuccin will have latte
|
||||
# nad assets-Catppuccin will have mocha or something
|
||||
for file in glob.glob(f"{SRC_DIR}/assets/xfwm4/assets{ctx.apply_suffix(IS_LIGHT)}/*.png"):
|
||||
xfwm4_assets = f"{THIS_DIR}/patches/xfwm4/generated/assets-catppuccin-{ctx.flavor.identifier}"
|
||||
for file in glob.glob(xfwm4_assets + '/*'):
|
||||
shutil.copy(file, f"{output_dir}/xfwm4")
|
||||
|
||||
for file in glob.glob(f"{SRC_DIR}/assets/xfwm4/assets{ctx.apply_suffix(IS_LIGHT)}-hdpi/*.png"):
|
||||
xfwm4_assets = xfwm4_assets + "-hdpi/*"
|
||||
for file in glob.glob(xfwm4_assets):
|
||||
shutil.copy(file, f"{output_dir}-hdpi/xfwm4")
|
||||
|
||||
for file in glob.glob(f"{SRC_DIR}/assets/xfwm4/assets{ctx.apply_suffix(IS_LIGHT)}-xhdpi/*.png"):
|
||||
xfwm4_assets = xfwm4_assets + "-xhdpi/*"
|
||||
for file in glob.glob(xfwm4_assets):
|
||||
shutil.copy(file, f"{output_dir}-xhdpi/xfwm4")
|
||||
|
||||
|
||||
@@ -477,7 +476,6 @@ def apply_colloid_patches():
|
||||
for patch in [
|
||||
"plank-dark.patch",
|
||||
"plank-light.patch",
|
||||
"sass-colors.patch",
|
||||
"sass-palette-frappe.patch",
|
||||
"sass-palette-mocha.patch",
|
||||
"sass-palette-latte.patch",
|
||||
@@ -492,7 +490,6 @@ def apply_colloid_patches():
|
||||
|
||||
logger.info("Patching finished.")
|
||||
|
||||
|
||||
def parse_args():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument(
|
||||
@@ -525,7 +522,8 @@ def parse_args():
|
||||
"-a",
|
||||
type=str,
|
||||
default="mauve",
|
||||
dest="accent",
|
||||
nargs='+',
|
||||
dest="accents",
|
||||
choices=[
|
||||
"rosewater",
|
||||
"flamingo",
|
||||
@@ -541,11 +539,17 @@ def parse_args():
|
||||
"sapphire",
|
||||
"blue",
|
||||
"lavender",
|
||||
"all",
|
||||
],
|
||||
help="Accent of the theme.",
|
||||
)
|
||||
|
||||
parser.add_argument(
|
||||
"--all-accents",
|
||||
help="Whether to build all accents",
|
||||
dest="all_accents",
|
||||
action="store_true",
|
||||
)
|
||||
|
||||
parser.add_argument(
|
||||
"--size",
|
||||
"-s",
|
||||
@@ -590,58 +594,43 @@ def main():
|
||||
if args.patch:
|
||||
apply_colloid_patches()
|
||||
|
||||
palette = getattr(PALETTE, args.flavor)
|
||||
accents = [
|
||||
"rosewater",
|
||||
"flamingo",
|
||||
"pink",
|
||||
"mauve",
|
||||
"red",
|
||||
"maroon",
|
||||
"peach",
|
||||
"yellow",
|
||||
"green",
|
||||
"teal",
|
||||
"sky",
|
||||
"sapphire",
|
||||
"blue",
|
||||
"lavender",
|
||||
]
|
||||
|
||||
if args.accent == "all":
|
||||
for accent in accents:
|
||||
accent = getattr(palette.colors, accent)
|
||||
|
||||
tweaks = Tweaks(tweaks=args.tweaks)
|
||||
|
||||
if args.zip:
|
||||
output_format = "zip"
|
||||
else:
|
||||
output_format = "dir"
|
||||
|
||||
ctx = BuildContext(
|
||||
build_root=args.dest,
|
||||
theme_name=args.name,
|
||||
flavor=palette,
|
||||
accent=accent,
|
||||
size=args.size,
|
||||
tweaks=tweaks,
|
||||
output_format=output_format,
|
||||
)
|
||||
|
||||
tweaks_temp()
|
||||
gnome_shell_version()
|
||||
build_theme(ctx)
|
||||
logger.info("Done!")
|
||||
if args.zip:
|
||||
output_format = "zip"
|
||||
else:
|
||||
accent = getattr(palette.colors, args.accent)
|
||||
output_format = "dir"
|
||||
|
||||
tweaks = Tweaks(tweaks=args.tweaks)
|
||||
|
||||
palette = getattr(PALETTE, args.flavor)
|
||||
|
||||
accents = args.accents
|
||||
if args.all_accents:
|
||||
accents = [
|
||||
"rosewater",
|
||||
"flamingo",
|
||||
"pink",
|
||||
"mauve",
|
||||
"red",
|
||||
"maroon",
|
||||
"peach",
|
||||
"yellow",
|
||||
"green",
|
||||
"teal",
|
||||
"sky",
|
||||
"sapphire",
|
||||
"blue",
|
||||
"lavender",
|
||||
]
|
||||
|
||||
for accent in accents:
|
||||
accent = getattr(palette.colors, accent)
|
||||
|
||||
tweaks = Tweaks(tweaks=args.tweaks)
|
||||
|
||||
if args.zip:
|
||||
output_format = "zip"
|
||||
else:
|
||||
output_format = "dir"
|
||||
|
||||
ctx = BuildContext(
|
||||
build_root=args.dest,
|
||||
theme_name=args.name,
|
||||
@@ -651,15 +640,15 @@ def main():
|
||||
tweaks=tweaks,
|
||||
output_format=output_format,
|
||||
)
|
||||
|
||||
logger.info("Building temp tweaks file")
|
||||
tweaks_temp()
|
||||
init_tweaks_temp()
|
||||
logger.info("Inserting gnome-shell imports")
|
||||
gnome_shell_version()
|
||||
logger.info("Building main theme")
|
||||
build_theme(ctx)
|
||||
logger.info("Done!")
|
||||
logger.info(f"Completed {palette.identifier} with {accent.identifier}")
|
||||
|
||||
logger.info("Done!")
|
||||
|
||||
try:
|
||||
main()
|
||||
|
||||
118
install.py
118
install.py
@@ -1,9 +1,11 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import os, zipfile, argparse, logging, io
|
||||
from typing import Optional
|
||||
from pathlib import Path
|
||||
from dataclasses import dataclass
|
||||
from urllib.request import urlopen, Request
|
||||
from urllib.parse import urlparse
|
||||
|
||||
logger = logging.getLogger("catppuccin-gtk")
|
||||
logger.setLevel(logging.DEBUG)
|
||||
@@ -20,6 +22,17 @@ class InstallContext:
|
||||
dest: Path
|
||||
link: bool
|
||||
|
||||
def build_info(self, include_url=True) -> str:
|
||||
url = build_release_url(self)
|
||||
info = f"""Installation info:
|
||||
flavor: {self.flavor}
|
||||
accent: {self.accent}
|
||||
dest: {self.dest.absolute()}
|
||||
link: {self.link}"""
|
||||
if include_url:
|
||||
info += f"\nremote_url: {url}"
|
||||
return info
|
||||
|
||||
|
||||
def parse_args():
|
||||
parser = argparse.ArgumentParser()
|
||||
@@ -49,11 +62,17 @@ def parse_args():
|
||||
"sapphire",
|
||||
"blue",
|
||||
"lavender",
|
||||
"all",
|
||||
],
|
||||
help="Accent of the theme.",
|
||||
)
|
||||
|
||||
parser.add_argument(
|
||||
"--from-artifact",
|
||||
type=Path,
|
||||
dest="from_artifact",
|
||||
help="Install from an artifact instead of a mainline release, pass the artifact path (e.g 7bff2448a81e36bf3b0e03bfbd649bebe6973ec7-artifacts.zip)",
|
||||
)
|
||||
|
||||
parser.add_argument(
|
||||
"--dest",
|
||||
"-d",
|
||||
@@ -75,27 +94,18 @@ def parse_args():
|
||||
|
||||
def build_release_url(ctx: InstallContext) -> str:
|
||||
repo_root = "https://github.com/catppuccin/gtk/releases/download"
|
||||
release = "v1.0.0-alpha"
|
||||
release = "v1.0.0-rc4"
|
||||
zip_name = f"catppuccin-{ctx.flavor}-{ctx.accent}-standard+default.zip"
|
||||
|
||||
return f"{repo_root}/{release}/{zip_name}"
|
||||
|
||||
|
||||
def install(ctx: InstallContext):
|
||||
url = build_release_url(ctx)
|
||||
build_info = f"""Installation info:
|
||||
flavor: {ctx.flavor}
|
||||
accent: {ctx.accent}
|
||||
dest: {ctx.dest.absolute()}
|
||||
link: {ctx.link}
|
||||
|
||||
remote_url: {url}"""
|
||||
logger.info(build_info)
|
||||
httprequest = Request(url)
|
||||
def fetch_zip(url: str) -> Optional[zipfile.ZipFile]:
|
||||
req = Request(url)
|
||||
|
||||
zip_file = None
|
||||
logger.info("Starting download...")
|
||||
with urlopen(httprequest) as response:
|
||||
with urlopen(req) as response:
|
||||
logger.info(f"Response status: {response.status}")
|
||||
zip_file = zipfile.ZipFile(io.BytesIO(response.read()))
|
||||
logger.info("Download finished, zip is valid")
|
||||
@@ -104,28 +114,81 @@ def install(ctx: InstallContext):
|
||||
first_bad_file = zip_file.testzip()
|
||||
if first_bad_file is not None:
|
||||
logger.error(f'Zip appears to be corrupt, first bad file is "{first_bad_file}"')
|
||||
return
|
||||
return None
|
||||
logger.info("Download verified")
|
||||
return zip_file
|
||||
|
||||
|
||||
def add_libadwaita_links(ctx: InstallContext, rewrite: bool = False):
|
||||
dir_name = (
|
||||
ctx.dest / f"catppuccin-{ctx.flavor}-{ctx.accent}-standard+default" / "gtk-4.0"
|
||||
).absolute()
|
||||
gtk4_dir = (Path(os.path.expanduser("~")) / ".config" / "gtk-4.0").absolute()
|
||||
os.makedirs(gtk4_dir, exist_ok=True)
|
||||
|
||||
logger.info("Adding symlinks for libadwaita")
|
||||
logger.info(f"Root: {dir_name}")
|
||||
logger.info(f"Target: {gtk4_dir}")
|
||||
try:
|
||||
if rewrite:
|
||||
os.remove(gtk4_dir / "assets")
|
||||
os.remove(gtk4_dir / "gtk.css")
|
||||
os.remove(gtk4_dir / "gtk-dark.css")
|
||||
except FileNotFoundError:
|
||||
logger.debug("Ignoring FileNotFound in symlink rewrite")
|
||||
|
||||
os.symlink(dir_name / "assets", gtk4_dir / "assets")
|
||||
os.symlink(dir_name / "gtk.css", gtk4_dir / "gtk.css")
|
||||
os.symlink(dir_name / "gtk-dark.css", gtk4_dir / "gtk-dark.css")
|
||||
|
||||
|
||||
def install(ctx: InstallContext):
|
||||
url = build_release_url(ctx)
|
||||
logger.info(ctx.build_info())
|
||||
|
||||
zip_file = fetch_zip(url)
|
||||
if zip_file is None:
|
||||
return
|
||||
|
||||
logger.info("Extracting...")
|
||||
zip_file.extractall(ctx.dest)
|
||||
logger.info("Extraction complete")
|
||||
|
||||
if ctx.link:
|
||||
dir_name = (ctx.dest / f"catppuccin-{ctx.flavor}-{ctx.accent}-standard+default" / 'gtk-4.0').absolute()
|
||||
gtk4_dir = (Path(os.path.expanduser('~')) / '.config' / 'gtk-4.0').absolute()
|
||||
os.makedirs(gtk4_dir, exist_ok=True)
|
||||
add_libadwaita_links(ctx)
|
||||
|
||||
logger.info("Adding symlinks for libadwaita")
|
||||
logger.info(f'Root: {dir_name}')
|
||||
logger.info(f'Target: {gtk4_dir}')
|
||||
os.symlink(dir_name / 'assets', gtk4_dir / 'assets')
|
||||
os.symlink(dir_name / 'gtk.css', gtk4_dir / 'gtk.css')
|
||||
os.symlink(dir_name / 'gtk-dark.css', gtk4_dir / 'gtk-dark.css')
|
||||
def install_from_artifact(ctx: InstallContext, artifact_path: Path):
|
||||
# Working from a pull request, special case it
|
||||
logger.info(f"Extracting artifact from '{artifact_path}'")
|
||||
artifacts = zipfile.ZipFile(artifact_path)
|
||||
|
||||
logger.info("Verifying artifact...")
|
||||
first_bad_file = artifacts.testzip()
|
||||
if first_bad_file is not None:
|
||||
logger.error(f'Zip appears to be corrupt, first bad file is "{first_bad_file}"')
|
||||
return None
|
||||
logger.info("Artifact verified")
|
||||
|
||||
logger.info(ctx.build_info(False))
|
||||
|
||||
# The zip, inside the artifacts, that we want to pull out
|
||||
zip_name = f"catppuccin-{ctx.flavor}-{ctx.accent}-standard+default.zip"
|
||||
logger.info(f"Pulling '{zip_name}' from the artifacts")
|
||||
info = artifacts.getinfo(zip_name)
|
||||
|
||||
logger.info("Extracting the artifact...")
|
||||
artifact = zipfile.ZipFile(io.BytesIO(artifacts.read(info)))
|
||||
artifact.extractall(ctx.dest)
|
||||
logger.info("Extraction complete")
|
||||
|
||||
if ctx.link:
|
||||
logger.info("Adding links (with rewrite)")
|
||||
add_libadwaita_links(ctx, True)
|
||||
logger.info("Links added")
|
||||
|
||||
def main():
|
||||
args = parse_args()
|
||||
|
||||
dest = Path(os.path.expanduser("~")) / ".local" / "share" / "themes"
|
||||
os.makedirs(dest, exist_ok=True)
|
||||
|
||||
@@ -136,9 +199,12 @@ def main():
|
||||
flavor=args.flavor, accent=args.accent, dest=dest, link=args.link
|
||||
)
|
||||
|
||||
install(ctx)
|
||||
if args.from_artifact:
|
||||
install_from_artifact(ctx, args.from_artifact)
|
||||
return
|
||||
|
||||
logger.info('Theme installation complete!')
|
||||
install(ctx)
|
||||
logger.info("Theme installation complete!")
|
||||
|
||||
|
||||
try:
|
||||
|
||||
@@ -8,7 +8,7 @@ whiskers:
|
||||
{%- set palette = flavor.colors -%}
|
||||
diff --git a/src/sass/_color-palette-catppuccin-{{ flavor.identifier }}.scss b/src/sass/_color-palette-catppuccin-{{ flavor.identifier }}.scss
|
||||
new file mode 100644
|
||||
index 00000000..8a905942
|
||||
index 00000000..4ff0da0d
|
||||
--- /dev/null
|
||||
+++ b/src/sass/_color-palette-catppuccin-{{ flavor.identifier }}.scss
|
||||
@@ -0,0 +1,72 @@
|
||||
@@ -47,31 +47,53 @@ index 00000000..8a905942
|
||||
+$orange-dark: #{{ palette.peach.hex }};
|
||||
+
|
||||
+// Grey
|
||||
+$grey-050: #{{ palette.text.hex }};
|
||||
+$grey-100: #{{ palette.subtext1.hex }};
|
||||
+$grey-150: #{{ palette.subtext1.hex }};
|
||||
+$grey-200: #{{ palette.subtext0.hex }};
|
||||
+$grey-250: #{{ palette.subtext0.hex }};
|
||||
+$grey-300: #{{ palette.overlay1.hex }};
|
||||
+$grey-350: #{{ palette.overlay1.hex }};
|
||||
+$grey-400: #{{ palette.overlay0.hex }};
|
||||
+$grey-450: #{{ palette.overlay0.hex }};
|
||||
+$grey-500: #{{ palette.surface2.hex }};
|
||||
+$grey-550: #{{ palette.surface2.hex }};
|
||||
+$grey-600: #{{ palette.surface1.hex }};
|
||||
+$grey-650: #{{ palette.surface1.hex }};
|
||||
+$grey-700: #{{ palette.surface0.hex }};
|
||||
+$grey-750: #{{ palette.surface0.hex }};
|
||||
+$grey-800: #{{ palette.base.hex }};
|
||||
+$grey-850: #{{ palette.base.hex }};
|
||||
+$grey-900: #{{ palette.crust.hex }};
|
||||
+$grey-950: #{{ palette.crust.hex }};
|
||||
{% if flavor.dark -%} {#- https://github.com/catppuccin/gtk/blob/0c3e8817da94769887c690b2211e006b287b27b1/scripts/recolor.py#L153-L176 -#}
|
||||
+$grey-050: #{{ palette.overlay2.hex }};
|
||||
+$grey-100: #{{ palette.overlay1.hex }};
|
||||
+$grey-150: #{{ palette.overlay0.hex }};
|
||||
+$grey-200: #{{ palette.surface2.hex }};
|
||||
+$grey-250: #{{ palette.surface1.hex }};
|
||||
+$grey-300: red;
|
||||
+$grey-350: red;
|
||||
+$grey-400: red;
|
||||
+$grey-450: red;
|
||||
+$grey-500: red;
|
||||
+$grey-550: red;
|
||||
+$grey-600: red;
|
||||
+$grey-650: #{{ palette.surface0.hex }};
|
||||
+$grey-700: #{{ palette.base.hex }};
|
||||
+$grey-750: #{{ palette.crust.hex }};
|
||||
+$grey-800: #{{ palette.crust.hex }};
|
||||
+$grey-850: #020202;
|
||||
+$grey-900: #010101;
|
||||
+$grey-950: #000000;
|
||||
{%- else -%} {#- Light mode https://github.com/catppuccin/gtk/blob/0c3e8817da94769887c690b2211e006b287b27b1/scripts/recolor.py#L128-L151 -#}
|
||||
+$grey-050: #{{ palette.crust.hex }};
|
||||
+$grey-100: #{{ palette.mantle.hex }};
|
||||
+$grey-150: #{{ palette.base.hex }};
|
||||
+$grey-200: #{{ palette.surface0.hex }};
|
||||
+$grey-250: #{{ palette.surface1.hex }};
|
||||
+$grey-300: red;
|
||||
+$grey-350: red;
|
||||
+$grey-400: red;
|
||||
+$grey-450: red;
|
||||
+$grey-500: red;
|
||||
+$grey-550: red;
|
||||
+$grey-600: red;
|
||||
+$grey-650: #{{ palette.base.hex }};
|
||||
+$grey-700: #{{ palette.base.hex }};
|
||||
+$grey-750: #{{ palette.mantle.hex }};
|
||||
+$grey-800: #{{ palette.text.hex }};
|
||||
+$grey-850: #020202;
|
||||
+$grey-900: #010101;
|
||||
+$grey-950: #000000;
|
||||
{%- endif %}
|
||||
+
|
||||
+// White
|
||||
+$white: #FFFFFF;
|
||||
+$white: #eff1f5;
|
||||
+
|
||||
+// Black
|
||||
+$black: #000000;
|
||||
+$black: #11111b;
|
||||
+
|
||||
+// Button
|
||||
+$button-close: #{{ palette.red.hex }};
|
||||
@@ -84,4 +106,3 @@ index 00000000..8a905942
|
||||
+// Theme
|
||||
+$default-light: $purple-light;
|
||||
+$default-dark: $purple-dark;
|
||||
{{ '' }}
|
||||
@@ -1,47 +0,0 @@
|
||||
diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
|
||||
index e8366fa0..97fa670c 100644
|
||||
--- a/src/sass/_colors.scss
|
||||
+++ b/src/sass/_colors.scss
|
||||
@@ -57,9 +57,8 @@
|
||||
@else { @return rgba($white, 0.1); }
|
||||
}
|
||||
|
||||
-@function theme($color) {
|
||||
+@function theme() {
|
||||
@if ($variant == 'light') {
|
||||
- @if ($theme == 'default') { @return $default-dark; }
|
||||
@if ($theme == 'purple') { @return $purple-dark; }
|
||||
@if ($theme == 'pink') { @return $pink-dark; }
|
||||
@if ($theme == 'red') { @return $red-dark; }
|
||||
@@ -68,8 +67,9 @@
|
||||
@if ($theme == 'green') { @return $green-dark; }
|
||||
@if ($theme == 'teal') { @return $teal-dark; }
|
||||
@if ($theme == 'grey') { @return $grey-600; }
|
||||
+
|
||||
+ @return $default-dark;
|
||||
} @else {
|
||||
- @if ($theme == 'default') { @return $default-light; }
|
||||
@if ($theme == 'purple') { @return $purple-light; }
|
||||
@if ($theme == 'pink') { @return $pink-light; }
|
||||
@if ($theme == 'red') { @return $red-light; }
|
||||
@@ -78,6 +78,8 @@
|
||||
@if ($theme == 'green') { @return $green-light; }
|
||||
@if ($theme == 'teal') { @return $teal-light; }
|
||||
@if ($theme == 'grey') { @return $grey-200; }
|
||||
+
|
||||
+ @return $default-light;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,9 +115,9 @@
|
||||
// Basic colors
|
||||
//
|
||||
|
||||
-$primary: theme(color);
|
||||
+$primary: theme();
|
||||
$drop_target_color: $orange-dark;
|
||||
-$indicator: theme(color);
|
||||
+$indicator: theme();
|
||||
$titlebar-indicator: if($variant == 'dark', currentColor, $primary);
|
||||
$inverse-indicator: if($theme == 'grey', $white, $primary);
|
||||
$applet-primary: if($theme == 'grey' and variant == 'light' and $topbar == 'dark', $grey-200, $primary);
|
||||
@@ -1,6 +1,6 @@
|
||||
diff --git a/src/sass/_color-palette-catppuccin-frappe.scss b/src/sass/_color-palette-catppuccin-frappe.scss
|
||||
new file mode 100644
|
||||
index 00000000..8a905942
|
||||
index 00000000..4ff0da0d
|
||||
--- /dev/null
|
||||
+++ b/src/sass/_color-palette-catppuccin-frappe.scss
|
||||
@@ -0,0 +1,72 @@
|
||||
@@ -39,31 +39,31 @@ index 00000000..8a905942
|
||||
+$orange-dark: #ef9f76;
|
||||
+
|
||||
+// Grey
|
||||
+$grey-050: #c6d0f5;
|
||||
+$grey-100: #b5bfe2;
|
||||
+$grey-150: #b5bfe2;
|
||||
+$grey-200: #a5adce;
|
||||
+$grey-250: #a5adce;
|
||||
+$grey-300: #838ba7;
|
||||
+$grey-350: #838ba7;
|
||||
+$grey-400: #737994;
|
||||
+$grey-450: #737994;
|
||||
+$grey-500: #626880;
|
||||
+$grey-550: #626880;
|
||||
+$grey-600: #51576d;
|
||||
+$grey-650: #51576d;
|
||||
+$grey-700: #414559;
|
||||
+$grey-750: #414559;
|
||||
+$grey-800: #303446;
|
||||
+$grey-850: #303446;
|
||||
+$grey-900: #232634;
|
||||
+$grey-950: #232634;
|
||||
+$grey-050: #949cbb;
|
||||
+$grey-100: #838ba7;
|
||||
+$grey-150: #737994;
|
||||
+$grey-200: #626880;
|
||||
+$grey-250: #51576d;
|
||||
+$grey-300: red;
|
||||
+$grey-350: red;
|
||||
+$grey-400: red;
|
||||
+$grey-450: red;
|
||||
+$grey-500: red;
|
||||
+$grey-550: red;
|
||||
+$grey-600: red;
|
||||
+$grey-650: #414559;
|
||||
+$grey-700: #303446;
|
||||
+$grey-750: #232634;
|
||||
+$grey-800: #232634;
|
||||
+$grey-850: #020202;
|
||||
+$grey-900: #010101;
|
||||
+$grey-950: #000000;
|
||||
+
|
||||
+// White
|
||||
+$white: #FFFFFF;
|
||||
+$white: #eff1f5;
|
||||
+
|
||||
+// Black
|
||||
+$black: #000000;
|
||||
+$black: #11111b;
|
||||
+
|
||||
+// Button
|
||||
+$button-close: #e78284;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff --git a/src/sass/_color-palette-catppuccin-latte.scss b/src/sass/_color-palette-catppuccin-latte.scss
|
||||
new file mode 100644
|
||||
index 00000000..8a905942
|
||||
index 00000000..4ff0da0d
|
||||
--- /dev/null
|
||||
+++ b/src/sass/_color-palette-catppuccin-latte.scss
|
||||
@@ -0,0 +1,72 @@
|
||||
@@ -39,31 +39,31 @@ index 00000000..8a905942
|
||||
+$orange-dark: #fe640b;
|
||||
+
|
||||
+// Grey
|
||||
+$grey-050: #4c4f69;
|
||||
+$grey-100: #5c5f77;
|
||||
+$grey-150: #5c5f77;
|
||||
+$grey-200: #6c6f85;
|
||||
+$grey-250: #6c6f85;
|
||||
+$grey-300: #8c8fa1;
|
||||
+$grey-350: #8c8fa1;
|
||||
+$grey-400: #9ca0b0;
|
||||
+$grey-450: #9ca0b0;
|
||||
+$grey-500: #acb0be;
|
||||
+$grey-550: #acb0be;
|
||||
+$grey-600: #bcc0cc;
|
||||
+$grey-650: #bcc0cc;
|
||||
+$grey-700: #ccd0da;
|
||||
+$grey-750: #ccd0da;
|
||||
+$grey-800: #eff1f5;
|
||||
+$grey-850: #eff1f5;
|
||||
+$grey-900: #dce0e8;
|
||||
+$grey-950: #dce0e8;
|
||||
+$grey-050: #dce0e8;
|
||||
+$grey-100: #e6e9ef;
|
||||
+$grey-150: #eff1f5;
|
||||
+$grey-200: #ccd0da;
|
||||
+$grey-250: #bcc0cc;
|
||||
+$grey-300: red;
|
||||
+$grey-350: red;
|
||||
+$grey-400: red;
|
||||
+$grey-450: red;
|
||||
+$grey-500: red;
|
||||
+$grey-550: red;
|
||||
+$grey-600: red;
|
||||
+$grey-650: #eff1f5;
|
||||
+$grey-700: #eff1f5;
|
||||
+$grey-750: #e6e9ef;
|
||||
+$grey-800: #4c4f69;
|
||||
+$grey-850: #020202;
|
||||
+$grey-900: #010101;
|
||||
+$grey-950: #000000;
|
||||
+
|
||||
+// White
|
||||
+$white: #FFFFFF;
|
||||
+$white: #eff1f5;
|
||||
+
|
||||
+// Black
|
||||
+$black: #000000;
|
||||
+$black: #11111b;
|
||||
+
|
||||
+// Button
|
||||
+$button-close: #d20f39;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff --git a/src/sass/_color-palette-catppuccin-macchiato.scss b/src/sass/_color-palette-catppuccin-macchiato.scss
|
||||
new file mode 100644
|
||||
index 00000000..8a905942
|
||||
index 00000000..4ff0da0d
|
||||
--- /dev/null
|
||||
+++ b/src/sass/_color-palette-catppuccin-macchiato.scss
|
||||
@@ -0,0 +1,72 @@
|
||||
@@ -39,31 +39,31 @@ index 00000000..8a905942
|
||||
+$orange-dark: #f5a97f;
|
||||
+
|
||||
+// Grey
|
||||
+$grey-050: #cad3f5;
|
||||
+$grey-100: #b8c0e0;
|
||||
+$grey-150: #b8c0e0;
|
||||
+$grey-200: #a5adcb;
|
||||
+$grey-250: #a5adcb;
|
||||
+$grey-300: #8087a2;
|
||||
+$grey-350: #8087a2;
|
||||
+$grey-400: #6e738d;
|
||||
+$grey-450: #6e738d;
|
||||
+$grey-500: #5b6078;
|
||||
+$grey-550: #5b6078;
|
||||
+$grey-600: #494d64;
|
||||
+$grey-650: #494d64;
|
||||
+$grey-700: #363a4f;
|
||||
+$grey-750: #363a4f;
|
||||
+$grey-800: #24273a;
|
||||
+$grey-850: #24273a;
|
||||
+$grey-900: #181926;
|
||||
+$grey-950: #181926;
|
||||
+$grey-050: #939ab7;
|
||||
+$grey-100: #8087a2;
|
||||
+$grey-150: #6e738d;
|
||||
+$grey-200: #5b6078;
|
||||
+$grey-250: #494d64;
|
||||
+$grey-300: red;
|
||||
+$grey-350: red;
|
||||
+$grey-400: red;
|
||||
+$grey-450: red;
|
||||
+$grey-500: red;
|
||||
+$grey-550: red;
|
||||
+$grey-600: red;
|
||||
+$grey-650: #363a4f;
|
||||
+$grey-700: #24273a;
|
||||
+$grey-750: #181926;
|
||||
+$grey-800: #181926;
|
||||
+$grey-850: #020202;
|
||||
+$grey-900: #010101;
|
||||
+$grey-950: #000000;
|
||||
+
|
||||
+// White
|
||||
+$white: #FFFFFF;
|
||||
+$white: #eff1f5;
|
||||
+
|
||||
+// Black
|
||||
+$black: #000000;
|
||||
+$black: #11111b;
|
||||
+
|
||||
+// Button
|
||||
+$button-close: #ed8796;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff --git a/src/sass/_color-palette-catppuccin-mocha.scss b/src/sass/_color-palette-catppuccin-mocha.scss
|
||||
new file mode 100644
|
||||
index 00000000..8a905942
|
||||
index 00000000..4ff0da0d
|
||||
--- /dev/null
|
||||
+++ b/src/sass/_color-palette-catppuccin-mocha.scss
|
||||
@@ -0,0 +1,72 @@
|
||||
@@ -39,31 +39,31 @@ index 00000000..8a905942
|
||||
+$orange-dark: #fab387;
|
||||
+
|
||||
+// Grey
|
||||
+$grey-050: #cdd6f4;
|
||||
+$grey-100: #bac2de;
|
||||
+$grey-150: #bac2de;
|
||||
+$grey-200: #a6adc8;
|
||||
+$grey-250: #a6adc8;
|
||||
+$grey-300: #7f849c;
|
||||
+$grey-350: #7f849c;
|
||||
+$grey-400: #6c7086;
|
||||
+$grey-450: #6c7086;
|
||||
+$grey-500: #585b70;
|
||||
+$grey-550: #585b70;
|
||||
+$grey-600: #45475a;
|
||||
+$grey-650: #45475a;
|
||||
+$grey-700: #313244;
|
||||
+$grey-750: #313244;
|
||||
+$grey-800: #1e1e2e;
|
||||
+$grey-850: #1e1e2e;
|
||||
+$grey-900: #11111b;
|
||||
+$grey-950: #11111b;
|
||||
+$grey-050: #9399b2;
|
||||
+$grey-100: #7f849c;
|
||||
+$grey-150: #6c7086;
|
||||
+$grey-200: #585b70;
|
||||
+$grey-250: #45475a;
|
||||
+$grey-300: red;
|
||||
+$grey-350: red;
|
||||
+$grey-400: red;
|
||||
+$grey-450: red;
|
||||
+$grey-500: red;
|
||||
+$grey-550: red;
|
||||
+$grey-600: red;
|
||||
+$grey-650: #313244;
|
||||
+$grey-700: #1e1e2e;
|
||||
+$grey-750: #11111b;
|
||||
+$grey-800: #11111b;
|
||||
+$grey-850: #020202;
|
||||
+$grey-900: #010101;
|
||||
+$grey-950: #000000;
|
||||
+
|
||||
+// White
|
||||
+$white: #FFFFFF;
|
||||
+$white: #eff1f5;
|
||||
+
|
||||
+// Black
|
||||
+$black: #000000;
|
||||
+$black: #11111b;
|
||||
+
|
||||
+// Button
|
||||
+$button-close: #f38ba8;
|
||||
|
||||
2
patches/xfwm4/.gitignore
vendored
Normal file
2
patches/xfwm4/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
generated/
|
||||
patched/
|
||||
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 49 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 60 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 49 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 60 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 60 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 49 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 49 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 60 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 60 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 49 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 60 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 49 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 57 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 47 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 57 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 46 KiB |
244
patches/xfwm4/generate_assets.py
Normal file
244
patches/xfwm4/generate_assets.py
Normal file
@@ -0,0 +1,244 @@
|
||||
from typing import List
|
||||
from catppuccin import PALETTE
|
||||
from catppuccin.models import Flavor
|
||||
|
||||
import re, os, shutil, subprocess, time
|
||||
from dataclasses import dataclass
|
||||
|
||||
THIS_DIR = os.path.dirname(os.path.realpath(__file__))
|
||||
|
||||
INDEX = [
|
||||
"close-active",
|
||||
"close-inactive",
|
||||
"close-prelight",
|
||||
"close-pressed",
|
||||
"hide-active",
|
||||
"hide-inactive",
|
||||
"hide-prelight",
|
||||
"hide-pressed",
|
||||
"maximize-active",
|
||||
"maximize-inactive",
|
||||
"maximize-prelight",
|
||||
"maximize-pressed",
|
||||
"maximize-toggled-active",
|
||||
"maximize-toggled-inactive",
|
||||
"maximize-toggled-prelight",
|
||||
"maximize-toggled-pressed",
|
||||
"menu-active",
|
||||
"menu-inactive",
|
||||
"menu-prelight",
|
||||
"menu-pressed",
|
||||
"shade-active",
|
||||
"shade-inactive",
|
||||
"shade-prelight",
|
||||
"shade-pressed",
|
||||
"shade-toggled-active",
|
||||
"shade-toggled-inactive",
|
||||
"shade-toggled-prelight",
|
||||
"shade-toggled-pressed",
|
||||
"stick-active",
|
||||
"stick-inactive",
|
||||
"stick-prelight",
|
||||
"stick-pressed",
|
||||
"stick-toggled-active",
|
||||
"stick-toggled-inactive",
|
||||
"stick-toggled-prelight",
|
||||
"stick-toggled-pressed",
|
||||
"title-1-active",
|
||||
"title-1-inactive",
|
||||
"title-2-active",
|
||||
"title-2-inactive",
|
||||
"title-3-active",
|
||||
"title-3-inactive",
|
||||
"title-4-active",
|
||||
"title-4-inactive",
|
||||
"title-5-active",
|
||||
"title-5-inactive",
|
||||
"top-left-active",
|
||||
"top-left-inactive",
|
||||
"top-right-active",
|
||||
"top-right-inactive",
|
||||
"left-active",
|
||||
"left-inactive",
|
||||
"right-active",
|
||||
"right-inactive",
|
||||
"bottom-active",
|
||||
"bottom-inactive",
|
||||
"bottom-left-active",
|
||||
"bottom-left-inactive",
|
||||
"bottom-right-active",
|
||||
"bottom-right-inactive",
|
||||
]
|
||||
|
||||
|
||||
def subst_text(path, _from, to):
|
||||
with open(path, "r+") as f:
|
||||
content = f.read()
|
||||
f.seek(0)
|
||||
f.truncate()
|
||||
f.write(re.sub(_from, to, content))
|
||||
|
||||
|
||||
def generate_for_flavor(flavor: Flavor):
|
||||
# Setup the palette
|
||||
palette = flavor.colors
|
||||
|
||||
close_color=f'#{palette.red.hex}'
|
||||
max_color=f'#{palette.green.hex}'
|
||||
min_color=f'#{palette.yellow.hex}'
|
||||
|
||||
# We expand the source assets into the 4 flavors, but need to map between
|
||||
# Their definition of dark and ours. This means that latte will get the -light assets
|
||||
# and the rest get the -dark assets to work from
|
||||
color = "-dark"
|
||||
if not flavor.dark:
|
||||
color = "-light"
|
||||
|
||||
# Make a directory for our patched SVGs to live in before compilation
|
||||
odir = f"{THIS_DIR}/patched"
|
||||
os.makedirs(odir, exist_ok=True)
|
||||
|
||||
# Copy the base assets into the output
|
||||
shutil.copy(
|
||||
f"{THIS_DIR}/assets{color}.svg",
|
||||
f"{odir}/assets-catppuccin-{flavor.identifier}.svg",
|
||||
)
|
||||
shutil.copy(
|
||||
f"{THIS_DIR}/assets{color}-normal.svg",
|
||||
f"{odir}/assets-catppuccin-{flavor.identifier}-normal.svg",
|
||||
)
|
||||
|
||||
# Patch all the SVGs
|
||||
path = f"{odir}/assets-catppuccin-{flavor.identifier}-normal.svg"
|
||||
subst_text(path, "#fd5f51", close_color)
|
||||
subst_text(path, "#38c76a", max_color)
|
||||
subst_text(path, "#fdbe04", min_color)
|
||||
|
||||
headerbar = palette.base.hex
|
||||
headerbar_backdrop = palette.mantle.hex
|
||||
|
||||
if flavor.dark:
|
||||
path = f"{odir}/assets-catppuccin-{flavor.identifier}.svg"
|
||||
subst_text(path, "#242424", headerbar)
|
||||
subst_text(path, "#2c2c2c", headerbar_backdrop)
|
||||
|
||||
path = f"{odir}/assets-catppuccin-{flavor.identifier}-normal.svg"
|
||||
subst_text(path, "#242424", headerbar)
|
||||
subst_text(path, "#2c2c2c", headerbar_backdrop)
|
||||
else:
|
||||
path = f"{odir}/assets-catppuccin-{flavor.identifier}.svg"
|
||||
subst_text(path, "#f2f2f2", headerbar)
|
||||
subst_text(path, "#fafafa", headerbar_backdrop)
|
||||
|
||||
path = f"{odir}/assets-catppuccin-{flavor.identifier}-normal.svg"
|
||||
subst_text(path, "#f2f2f2", headerbar)
|
||||
subst_text(path, "#fafafa", headerbar_backdrop)
|
||||
|
||||
|
||||
@dataclass
|
||||
class WorkerInput:
|
||||
output_path: str
|
||||
output_dir: str
|
||||
input_path: str
|
||||
dpi: str
|
||||
ident: str
|
||||
|
||||
|
||||
def call_subprocesses(inp: WorkerInput):
|
||||
inkscape = "inkscape"
|
||||
optipng = "optipng"
|
||||
|
||||
return [
|
||||
subprocess.Popen(
|
||||
[
|
||||
inkscape,
|
||||
"--export-id",
|
||||
inp.ident,
|
||||
"--export-id-only",
|
||||
"--export-dpi",
|
||||
inp.dpi,
|
||||
"--export-filename",
|
||||
inp.output_path,
|
||||
inp.input_path,
|
||||
],
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.STDOUT,
|
||||
),
|
||||
subprocess.Popen(
|
||||
[optipng, "-o7", "--quiet", inp.output_path],
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.STDOUT,
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
@dataclass
|
||||
class RenderState:
|
||||
tasks: List[subprocess.Popen]
|
||||
input_root: str
|
||||
output_root: str
|
||||
|
||||
|
||||
screen_to_dpi = {
|
||||
"-hdpi": "144",
|
||||
"-xhdpi": "192",
|
||||
}
|
||||
|
||||
def render_for_screen(state: RenderState, flavor: Flavor, screen: str, ident: str):
|
||||
# NOTE: We do not generate for the -normal variant currently, that would just be
|
||||
# a stupid amount of compute and time for little benefit
|
||||
src_file = f"{state.input_root}/assets-catppuccin-{flavor.identifier}.svg"
|
||||
|
||||
output_dir = f"{state.output_root}/assets-catppuccin-{flavor.identifier}{screen}"
|
||||
output_path = f"{output_dir}/{ident}.png"
|
||||
|
||||
dpi = screen_to_dpi.get(screen, "96")
|
||||
|
||||
os.makedirs(output_dir, exist_ok=True)
|
||||
|
||||
if os.path.exists(output_path):
|
||||
print(f"Skipping '{output_path}', already generated")
|
||||
else:
|
||||
new_tasks = call_subprocesses(
|
||||
WorkerInput(
|
||||
output_path=output_path,
|
||||
output_dir=output_dir,
|
||||
input_path=src_file,
|
||||
dpi=dpi,
|
||||
ident=ident,
|
||||
)
|
||||
)
|
||||
state.tasks.extend(new_tasks)
|
||||
|
||||
|
||||
def render_for_flavor(flavor: Flavor, state: RenderState):
|
||||
print(
|
||||
f"Starting render tasks for {flavor.identifier}"
|
||||
)
|
||||
for ident in INDEX:
|
||||
render_for_screen(state=state, flavor=flavor, screen="", ident=ident)
|
||||
render_for_screen(state=state, flavor=flavor, screen="-hdpi", ident=ident)
|
||||
render_for_screen(state=state, flavor=flavor, screen="-xhdpi", ident=ident)
|
||||
|
||||
|
||||
generate_for_flavor(PALETTE.mocha)
|
||||
generate_for_flavor(PALETTE.latte)
|
||||
generate_for_flavor(PALETTE.macchiato)
|
||||
generate_for_flavor(PALETTE.frappe)
|
||||
|
||||
state = RenderState(
|
||||
tasks=[], input_root=f"{THIS_DIR}/patched", output_root=f"{THIS_DIR}/generated"
|
||||
)
|
||||
start_time = time.time()
|
||||
|
||||
render_for_flavor(PALETTE.mocha, state)
|
||||
render_for_flavor(PALETTE.latte, state)
|
||||
render_for_flavor(PALETTE.macchiato, state)
|
||||
render_for_flavor(PALETTE.frappe, state)
|
||||
|
||||
for task in state.tasks:
|
||||
task.wait()
|
||||
|
||||
end_time = time.time() - start_time
|
||||
print(f"Generation complete in {end_time} seconds")
|
||||
shutil.rmtree(state.input_root)
|
||||
9
renovate.json
Normal file
9
renovate.json
Normal file
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": [
|
||||
"config:recommended"
|
||||
],
|
||||
"git-submodules": {
|
||||
"enabled": true
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user