chore: update colloid (#182)

This commit removes the hardcoded string "latte"
and fixes latte from not properly applying
to the status bar.

---------

Co-authored-by: Isabel <isabel@isabelroses.com>

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,33 +0,0 @@
----
-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 <!-- If you installed using the python script, please mention the command that you ran for installation. -->
-- [ ] 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 Nixpkg.**
-
-**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.

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,53 @@
+name: Bug Report
+description: Report your bugs with the theme here!
+labels: [bug]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue outlining your problem?
+      description: Please search to see if an issue already exists for your problem.
+      options:
+        - label: I have searched the existing issues and they do not solve my problem.
+          required: true
+  - type: textarea
+    attributes:
+      label: Describe the bug.
+      description: Also tell us, what do you expect to see?
+      placeholder: The tabs are darker than they should be...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Attach screenshots.
+      description: If applicable, attach screenshots which clearly highlight the bug.
+  - type: dropdown
+    id: installation_method
+    attributes:
+      label: How did you install the theme?
+      options:
+        - GitHub Release
+        - AUR Package
+        - catppuccin/nix
+        - Nixpkgs
+        - Flatpak
+        - From source (Python script)
+    validations:
+      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)."
+      options:
+        - label: I have symlinked the `gtk-4.0` folder.
+          required: false
+  - type: input
+    attributes:
+      label: What GNOME version are you seeing the bug on?
+      description: "Follow [GNOME's instructions](https://help.gnome.org/users/gnome-help/stable/gnome-version.html.en) to find out what version you are running."
+      placeholder: "GNOME Version 42.9"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Any additional comments?
+      description: Add any information that hasn't been covered in the previous sections!

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community Discord
+    url: https://discord.com/servers/catppuccin-907385605422448742
+    about: Chat to other community members!

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -0,0 +1,18 @@
+name: Enhancement Issue
+description: Request improvements to the theme here!
+labels: [enhancement]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue outlining your improvement?
+      description: Please search to see if your improvement has already been raised as an issue.
+      options:
+        - label: I have searched the existing issues and my improvement has not been raised yet.
+          required: true
+  - type: textarea
+    attributes:
+      label: What would you like to see added and/or changed?
+      description: Make sure to mention why you think this is an improvement!
+      placeholder: I'd like to have an extra configuration option for...
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/meta.yml

@@ -0,0 +1,18 @@
+name: Meta Issue
+description: Raise any issue regarding the repository here!
+labels: [meta]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue outlining your problem?
+      description: Please search to see if an issue already exists for your problem.
+      options:
+        - label: I have searched the existing issues and they do not solve my problem.
+          required: true
+  - type: textarea
+    attributes:
+      label: Describe the issue.
+      description: Bugs should be raised under a [Bug Report](https://github.com/catppuccin/gtk/issues/new?assignees=&labels=bug&template=bug.yml).
+      placeholder: The README is missing crucial information such as...
+    validations:
+      required: true

.github/workflows/release.yml

@@ -1,20 +1,19 @@
-name: "GTK theme release"
+name: "Release"
 
-on: 
+on:
   push:
     tags:
-      - "*"
+      - "v*"
 
 jobs:
   release:
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
           cache: 'pip'
@@ -25,6 +24,7 @@ jobs:
       - name: Generate themes
         run: python ./install.py all -a all --zip -d $PWD/releases --recreate-asset
       - name: Add zips to release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
+          draft: true
           files: ./releases/*.zip

README.md

@@ -49,56 +49,29 @@ yay -S catppuccin-gtk-theme-mocha catppuccin-gtk-theme-macchiato catppuccin-gtk-
 
 ### For Nix users
 
-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.
+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.
-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
-# as per wiki examples
+{inputs, ...}: {
-environment.systemPackages = with pkgs; [
+  imports = [inputs.catppuccin.homeManagerModules.catppuccin];
-  ...
-  (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,
-  ...
-}: {
   gtk = {
     enable = true;
-    theme = {
+    catppuccin = {
-      name = "Catppuccin-Macchiato-Compact-Pink-Dark";
+      enable = true;
-      package = pkgs.catppuccin-gtk.override {
+      flavor = "mocha";
-        accents = [ "pink" ];
+      accent = "pink";
-        size = "compact";
+      size = "standard";
-        tweaks = [ "rimless" "black" ];
+      tweaks = [ "normal" ];
-        variant = "macchiato";
-      };
     };
   };
 }
-
-# Now symlink the `~/.config/gtk-4.0/` folder declaratively:
-xdg.configFile = {
-  "gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets";
-  "gtk-4.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css";
-  "gtk-4.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css";
-};
 ```
 
+> [!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 GTK 4 users
 
 To theme GTK 4 applications you have to manually symlink the `~/.config/gtk-4.0/` to the themes folder. Use the following commands

flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1715961556,
+        "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,18 @@
+{
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
+  outputs =
+    { nixpkgs, ... }:
+    let
+      forAllSystems =
+        function:
+        nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
+          system: function nixpkgs.legacyPackages.${system}
+        );
+    in
+    {
+      devShells = forAllSystems (pkgs: {
+        default = pkgs.callPackage ./shell.nix { };
+      });
+    };
+}

scripts/recolor.py

@@ -86,7 +86,7 @@ def recolor(flavor, accent: str):
     replacetext(f"{work_dir}/gtkrc.sh",
                 "titlebar_light='#F2F2F2'", f"titlebar_light='{latte_colors.crust.hex}'")
 
-    if flavor.name == "latte":
+    if flavor.name == PALETTE.latte.name:
         replacetext(f"{work_dir}/gtkrc.sh", "background_dark='#0F0F0F'",
                     f"background_dark='{mocha_colors.base.hex}'")
         replacetext(f"{work_dir}/gtkrc.sh", "background_darker='#121212'",
@@ -124,7 +124,7 @@ def recolor(flavor, accent: str):
     print("Mod SASS Color_Palette_default")
 
     # Greys
-    if flavor.name == "latte":  # Hardcode till someone smarter than me comes along
+    if flavor.name == PALETTE.latte.name:
         replacetext(f"{src_dir}/sass/_color-palette-default.scss",
                     "grey-050: #FAFAFA", f"grey-050: {colors.crust.hex}")
         replacetext(f"{src_dir}/sass/_color-palette-default.scss",

shell.nix

@@ -0,0 +1,11 @@
+{
+  pkgs ? import <nixpkgs> { },
+}:
+pkgs.mkShell {
+  name = "dev-shell";
+  buildInputs = with pkgs; [
+    python311
+    python311Packages.catppuccin
+    sassc
+  ];
+}