chore: update colloid

docs: add window manager guide

.gitignore

@@ -3,6 +3,9 @@ pkgs/
 __pycache__
 venv/
 .venv
+bin/
+lib*/
+*.cfg
 
 # Releases folder
 releases

README.md

@@ -25,11 +25,10 @@ This GTK theme is based on the [Colloid](https://github.com/vinceliuice/Colloid-
 
 -   GTK `>=3.20`
 -   `gnome-themes-extra` (or `gnome-themes-standard`)
--   Murrine engine
 
 ### Installation
 
-1. Download and extract the theme zip from [releases](https://github.com/catppuccin/gtk/releases/) or you can install the theme from the [AUR](#for-arch-linux-users).
+1. Download and extract the theme zip from [releases](https://github.com/catppuccin/gtk/releases/).
 2. Move the theme folder to **".themes"** in your home directory. **(~/.themes)** (Skip this step if you are using the AUR package)
 3. Select the downloaded theme via your desktop specific tweaks application (**gnome-tweaks** on Gnome 3+).
 
@@ -53,7 +52,7 @@ By default, the variant is `frappe`, the accent is `blue`, the size is `standard
 Example:
 ```nix
 pkgs.catppuccin-gtk.override {
-  accents = [ "pink" ]; # You can specify multiple accents here to output multiple themes 
+  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";
@@ -82,9 +81,9 @@ To use it in home-manager:
 }
 ```
 
-### For gtk-4.0 users
+### For GTK 4 users
 
-To theme gtk-4.0 applications you have to manually symlink the `~/.config/gtk-4.0/` to the themes folder. Use the following commands
+To theme GTK 4 applications you have to manually symlink the `~/.config/gtk-4.0/` to the themes folder. Use the following commands
 ```bash
 mkdir -p "${HOME}/.config/gtk-4.0"
 ln -sf "${THEME_DIR}/gtk-4.0/assets" "${HOME}/.config/gtk-4.0/assets"
@@ -102,20 +101,43 @@ ln -sf "${THEME_DIR}/gtk-4.0/gtk-dark.css" "${HOME}/.config/gtk-4.0/gtk-dark.css
   ```bash
   sudo flatpak override --env=GTK_THEME=##theme##
   ```
-3. For a more in depth tutorial see Hamza Algohary's tutorial on [It's Foss](https://itsfoss.com/flatpak-app-apply-theme/)
+3. For a more in depth tutorial see Hamza Algohary's tutorial on [It's FOSS](https://itsfoss.com/flatpak-app-apply-theme/)
+
+### Handling GTK theme installation from window manager
+
+1. Install unzip and curl.
+2. Go to your window manager config file.
+3. Add an entrance to the config file to be executed when your window manager is loaded.
+    - i3/sway example:
+    ```
+    # catppuccin
+    set $ctp-version v0.6.1
+    exec_always if [ ! -e ~/.themes/Catppuccin-Frappe-Standard-Lavender-dark ]; then \
+      mkdir -p ~/.themes \
+      && curl -L https://github.com/catppuccin/gtk/releases/download/$ctp-version/Catppuccin-Frappe-Standard-Lavender-dark.zip -o ~/.themes/catppuccin.zip \
+      && unzip ~/.themes/catppuccin.zip -d ~/.themes/ \
+      && rm -rf ~/.themes/catppuccin.zip; fi
+    ```
+    >Note: The previous example execute that script every time i3/sway is reloaded.
+4. Set the GTK_THEME environment variable:
+```sh
+export GTK_THEME='Catppuccin-Frappe-Standard-Lavender-dark:dark'
+```
+>Note: In order to update the theme's version, just change the variable `$ctp-version`.
 
 ### Using the script
 
-**Note**: Ensure that you have atleast python version 3.10 installed
+**Note**: Ensure that you have at least Python version 3.10 installed
 
-Clone the repository using
+Set up the installer using
 ```bash
 git clone --recurse-submodules git@github.com:catppuccin/gtk.git
+cd gtk
 virtualenv -p python3 venv  # to be created only once and only if you need a virtual env
-source venv/bin/activate  
+source venv/bin/activate
 pip install -r requirements.txt
 ```
-To check out the install script, run 
+To check out the install script, run
 ```bash
 python install.py --help
 ```
@@ -128,12 +150,13 @@ Compulsory field        Specify color variant(s) [mocha|frappe|macchiato|latte|a
 -a, --accent VARIANT... Specify theme color variant(s) [rosewater|flamingo|pink|mauve|red|maroon|peach|yellow|green|teal|sky|
                         sapphire|blue|lavender|all] (Default: blue)
 -s, --size VARIANT...   Specify size variant [standard|compact] (Default: standard variant)
--l, --libadwaita        Link installed gtk-4.0 theme to config folder for all libadwaita app use this theme
---zip                   Zips up the finally produced themes. 
---tweaks                Specify versions for tweaks [black|rimless|normal]
+-l, --link              Link installed gtk-4.0 theme to config folder for all libadwaita app use this theme
+--zip                   Zips up the finally produced themes.
+--tweaks                Specify versions for tweaks [black|rimless|normal|float]
                         1. black:    Blackness color version
                         2. rimless:  Remove the 1px border about windows and menus
                         3. normal:   Normal windows button style (titlebuttons: max/min/close)
+                        4. float:    Floating gnome-shell panel style
 -h, --help              Show help
 ```
 You can install any theme like the following example
@@ -156,9 +179,9 @@ You need to install the following packages to build the theme. Check with your d
 A few important notes to keep in mind
 
 - `recolor.py` handles all changes that needs to be done to colloid to ensure it generated catppuccin colors. If vinceliuice changes anything in his theme in future, that is where you must change
-- `var.py` includes all different variables that you can tinker around as per your personal requirements. 
-- `create_theme.py` consists of a wrapper that will recolor the colloid theme, install it as per the args provided and rename it accordingly. 
- 
+- `var.py` includes all different variables that you can tinker around as per your personal requirements.
+- `create_theme.py` consists of a wrapper that will recolor the colloid theme, install it as per the args provided and rename it accordingly.
+
 ## 💝 Thanks to
 
 **Current maintainers**

install.py

@@ -59,7 +59,7 @@ parser.add_argument("--tweaks",
                     default=[],
                     nargs="+",
                     dest="tweaks",
-                    choices=["black", "rimless", "normal"],
+                    choices=["black", "rimless", "normal", "float"],
                     help="Some specifc tweaks. like black, rimless, normal buttons")
 
 parser.add_argument("-l", "--link",

scripts/create_theme.py

@@ -6,7 +6,7 @@ from typing import List
 from scripts.ctp_colors import ctp_colors
 from scripts.patches import recreate_xfwm4_assets
 from scripts.recolor import recolor
-from scripts.utils import zip_multiple_folders
+from scripts.utils import replacetext, zip_multiple_folders
 from scripts.var import def_color_map, repo_dir, src_dir, theme_name, work_dir
 
 
@@ -57,6 +57,7 @@ def create_theme(types: List[str], accents: List[str], dest: str, link: bool = F
                 os.rename(dest + "/" + filename + '-xhdpi',
                         new_filename + '-xhdpi')
                 os.rename(dest + "/" + filename, new_filename)
+                replacetext(new_filename + '/index.theme', filename, new_filename.split("/")[-1])
                 print("Successfully renamed file")
             except Exception as e:
                 print("Failed to rename the files due to:", e)