From 41d54ae759aea317562cc23eab7745da46e18c3d Mon Sep 17 00:00:00 2001 From: Pranav Date: Tue, 7 Feb 2023 22:28:56 +0530 Subject: [PATCH 1/6] chore: update colloid Signed-off-by: Pranav --- colloid | 2 +- scripts/recolor.py | 6 ++---- scripts/utils.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/colloid b/colloid index d8f0fbe2..eceba968 160000 --- a/colloid +++ b/colloid @@ -1 +1 @@ -Subproject commit d8f0fbe20755128839aabaf3f4e034ef239d8892 +Subproject commit eceba96893973146c3092a2db417c0904b91a7a5 diff --git a/scripts/recolor.py b/scripts/recolor.py index b01d4e76..5d671feb 100644 --- a/scripts/recolor.py +++ b/scripts/recolor.py @@ -1,8 +1,7 @@ from catppuccin import Flavour from .utils import replacetext, replaceAllText -from .var import (def_accent_dark, def_accent_light, def_color_map, src_dir, - theme_name, work_dir) +from .var import (def_accent_dark, def_accent_light, def_color_map, src_dir, work_dir) def recolor_accent(flavor, accent: str = "blue"): @@ -71,10 +70,9 @@ def recolor(flavor, accent: str): Recolor the theme. currently hard code it frappe """ print("Recoloring to suit catppuccin theme") - replacetext(f"{work_dir}/install.sh", "Colloid", theme_name) - print("Recoloring accents") recolor_accent(flavor, accent) + print("Recoloring firefox") recolor_firefox(flavor, accent) print("MOD: Gtkrc.sh") diff --git a/scripts/utils.py b/scripts/utils.py index 032de688..2d92eb2e 100644 --- a/scripts/utils.py +++ b/scripts/utils.py @@ -25,7 +25,7 @@ def replacetext(filepath: str, search_text: str, replace_text: str) -> None: f.seek(0) f.write(file) f.truncate() - except Exception as e: + except Exception: print(f"Failed to recolor {filepath}") From c79e453e62cf6c3974ea7a38deef46da99c13915 Mon Sep 17 00:00:00 2001 From: Dixon Sean Low Yan Feng <56017218+PlayerNameHere@users.noreply.github.com> Date: Fri, 24 Feb 2023 01:48:26 +0800 Subject: [PATCH 2/6] docs: improve nix instructions Documents the other configurable options and updates the example accordingly. --- README.md | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index b48c4cae..fdf45e34 100644 --- a/README.md +++ b/README.md @@ -46,27 +46,35 @@ With your favourite AUR helper, install them: yay -S catppuccin-gtk-theme-mocha catppuccin-gtk-theme-macchiato catppuccin-gtk-theme-frappe catppuccin-gtk-theme-latte ``` ### For Nix users -The [catppuccin-gtk](https://github.com/NixOS/nixpkgs/blob/master/pkgs/data/themes/catppuccin-gtk/default.nix) nixpkg packages all four of the flavours. -The default flavour is `frappe` and the default accent is `blue`. To override them use: +The [catppuccin-gtk](https://github.com/NixOS/nixpkgs/blob/master/pkgs/data/themes/catppuccin-gtk/default.nix) package in Nixpkgs allows you to specify the accents, size, tweaks and variant (flavour) of the theme by overriding the package. + +By default, the variant is `frappe`, the accent is `blue`, the size is `standard`, and no tweaks are enabled. To change them, override the package. A list of valid choices are available in the package definition [here](https://github.com/NixOS/nixpkgs/blob/7ce8e7c4cf90492a631e96bcfe70724104914381/pkgs/data/themes/catppuccin-gtk/default.nix#L16). + +Example: ```nix - pkgs.catppuccin-gtk.override { - accents = ["pink"] # You can specify multiple here - variant = "macchiato" - } +pkgs.catppuccin-gtk.override { + accents = [ "pink" ]; # You can specify multiple accents here to output multiple themes + size = "compact"; + tweaks = [ "rimless" "black" ]; # You can also specify multiple tweaks here + variant = "macchiato"; +} ``` + To use it in home-manager: ```nix +# home.nix { pkgs, - config, ... }: { - config.gtk = { + gtk = { enable = true; theme = { - name = "Catppuccin-Macchiato-Standard-Pink-Dark"; + name = "Catppuccin-Macchiato-Compact-Pink-Dark"; package = pkgs.catppuccin-gtk.override { - accents = ["pink"]; + accents = [ "pink" ]; + size = "compact"; + tweaks = [ "rimless" "black" ]; variant = "macchiato"; }; }; From ed3abe04f834b878056dd72f1c8622ea5666adbb Mon Sep 17 00:00:00 2001 From: spooky <68803793+ghostx31@users.noreply.github.com> Date: Sat, 4 Mar 2023 13:51:28 +0530 Subject: [PATCH 3/6] feat: add issue template --- .github/ISSUE_TEMPLATE/bug-report.md | 33 ++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug-report.md diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md new file mode 100644 index 00000000..d40ca5fb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -0,0 +1,33 @@ +--- +name: Bug report +about: Create a bug report about the GTK theme. +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**Mention your distribution and your theme version** +Please mention your Linux distribution and the theme version you've installed. + +**Select how you installed the theme** +- [ ] GitHub Releases +- [ ] AUR package +- [ ] Nixpkg +- [ ] Using the python install script +- [ ] Flatpak + +**Symlinked the gtk-4.0 folder?** +Have you symlinked the `gtk-4.0` folder as mentioned in the [README](https://github.com/catppuccin/gtk/blob/e907775723eb68a5628c1bcd718b9d822cea9aee/README.md?plain=1#L85-L93)? **This is not applicable for users who have installed the theme with the Nix package.** + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If possible, please share screenshots of the bug you've encountered. + +**Additional context** +Please mention any additional context that might be applicable. From 45df79e72c71ae2c294f03d359b7a0619bf665d8 Mon Sep 17 00:00:00 2001 From: ghostx31 Date: Sat, 4 Mar 2023 14:01:38 +0530 Subject: [PATCH 4/6] chore(bug issue template): change nix package to nixpkg --- .github/ISSUE_TEMPLATE/bug-report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index d40ca5fb..b144d8a4 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -21,7 +21,7 @@ Please mention your Linux distribution and the theme version you've installed. - [ ] Flatpak **Symlinked the gtk-4.0 folder?** -Have you symlinked the `gtk-4.0` folder as mentioned in the [README](https://github.com/catppuccin/gtk/blob/e907775723eb68a5628c1bcd718b9d822cea9aee/README.md?plain=1#L85-L93)? **This is not applicable for users who have installed the theme with the Nix package.** +Have you symlinked the `gtk-4.0` folder as mentioned in the [README](https://github.com/catppuccin/gtk/blob/e907775723eb68a5628c1bcd718b9d822cea9aee/README.md?plain=1#L85-L93)? **This is not applicable for users who have installed the theme with the Nixpkg.** **Expected behavior** A clear and concise description of what you expected to happen. From a53263bad2c0853c2e68c3478bb9d793413f947c Mon Sep 17 00:00:00 2001 From: Pranav Date: Sun, 5 Mar 2023 19:43:07 +0530 Subject: [PATCH 5/6] chore: update colloid submodule Signed-off-by: Pranav --- .gitignore | 1 + colloid | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 25115b2f..fa5ddb2f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ pkgs/ *-temp.scss __pycache__ venv/ +.venv # Releases folder releases diff --git a/colloid b/colloid index eceba968..51f72d50 160000 --- a/colloid +++ b/colloid @@ -1 +1 @@ -Subproject commit eceba96893973146c3092a2db417c0904b91a7a5 +Subproject commit 51f72d5066d19bec04db9b7d15e3f35efc8209d2 From 538067923bb2070b1aeb034dcf1505947ea50cb6 Mon Sep 17 00:00:00 2001 From: ghostx31 Date: Sun, 26 Mar 2023 10:32:20 +0530 Subject: [PATCH 6/6] chore: update colloid submodule --- colloid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colloid b/colloid index 51f72d50..6ddd8e19 160000 --- a/colloid +++ b/colloid @@ -1 +1 @@ -Subproject commit 51f72d5066d19bec04db9b7d15e3f35efc8209d2 +Subproject commit 6ddd8e1932286c8a71aa9a8028d7ccaeb18f3cba