diff --git a/.gitignore b/.gitignore index 496ee2c..36a416f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.DS_Store \ No newline at end of file +.DS_Store +dist diff --git a/README.md b/README.md index c2fd88e..dd90063 100644 --- a/README.md +++ b/README.md @@ -12,44 +12,53 @@

- -

-

- + +

-## Screenshots +## Previews + +
+ 🌻 Latte + + +
+
+ 🪴 Frappé + + +
+
+ 🌺 Macchiato + + +
+
+ 🌿 Mocha + + +
-Check within the [assets](assets/) folder. +## Usage -## Usage (Image Effect) +### Image Effects -1. Clone this repository locally to a suitable directory -2. Click on one of the configuration files, each one is named after a flavor of the colorscheme. Pick whichever you like! -3. Give it a friendly name within ShareX -4. Enjoy the theme! +1. Download the `image-effects` directory from the [latest release](https://github.com/catppuccin/sharex/releases/latest) +2. Choose one of the `.sxie` files to double-click. (This will open the image-effects window in ShareX, make sure to allow image effects!) +3. Close the window and enjoy your new image effects! -## Usage (Theme) -1. Clone this repository locally (Or download the source code) -2. Go to ShareX -3. Select "Application Settings" -4. Select "Theme" -5. Select "Import" -6. Select "From File" -7. Select the theme file -8. Enjoy the theme! +### Themes + +1. Download the `themes` directory from the [latest release](https://github.com/catppuccin/sharex/releases/latest) +2. Open ShareX and navigate to `Application Settings` → `Theme` → `Import` +3. Select `From File` +4. Choose one of the downloaded theme files and enjoy the theme! ## 💝 Thanks to - [Dukeatron](https://github.com/Dukeatron) - [King Cube](https://github.com/kingofcube) -## TODO - -- [x] Add optional border with the Catppuccin icon -- [x] Fix image contrast/exposure -- [x] Add more Themes -  

diff --git a/assets/.gitignore b/assets/.gitignore deleted file mode 100644 index e43b0f9..0000000 --- a/assets/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.DS_Store diff --git a/assets/1e5epqu3.png b/assets/1e5epqu3.png deleted file mode 100644 index 5d40777..0000000 Binary files a/assets/1e5epqu3.png and /dev/null differ diff --git a/assets/3mtcr6wh.png b/assets/3mtcr6wh.png deleted file mode 100644 index 978eef5..0000000 Binary files a/assets/3mtcr6wh.png and /dev/null differ diff --git a/assets/5993toka.png b/assets/5993toka.png deleted file mode 100644 index 78f2a7e..0000000 Binary files a/assets/5993toka.png and /dev/null differ diff --git a/assets/ShareX_8Ivzp3y2vO.webp b/assets/ShareX_8Ivzp3y2vO.webp deleted file mode 100644 index 5fff4ef..0000000 Binary files a/assets/ShareX_8Ivzp3y2vO.webp and /dev/null differ diff --git a/assets/image-effects/frappe.webp b/assets/image-effects/frappe.webp new file mode 100644 index 0000000..f4e3eb9 Binary files /dev/null and b/assets/image-effects/frappe.webp differ diff --git a/assets/image-effects/latte.webp b/assets/image-effects/latte.webp new file mode 100644 index 0000000..68cb99c Binary files /dev/null and b/assets/image-effects/latte.webp differ diff --git a/assets/image-effects/macchiato.webp b/assets/image-effects/macchiato.webp new file mode 100644 index 0000000..76f7000 Binary files /dev/null and b/assets/image-effects/macchiato.webp differ diff --git a/assets/image-effects/mocha.webp b/assets/image-effects/mocha.webp new file mode 100644 index 0000000..3534867 Binary files /dev/null and b/assets/image-effects/mocha.webp differ diff --git a/assets/image-effects/preview.webp b/assets/image-effects/preview.webp new file mode 100644 index 0000000..ea9e63d Binary files /dev/null and b/assets/image-effects/preview.webp differ diff --git a/assets/themes/frappe.webp b/assets/themes/frappe.webp new file mode 100644 index 0000000..2027fad Binary files /dev/null and b/assets/themes/frappe.webp differ diff --git a/assets/themes/latte.webp b/assets/themes/latte.webp new file mode 100644 index 0000000..18eafc9 Binary files /dev/null and b/assets/themes/latte.webp differ diff --git a/assets/themes/macchiato.webp b/assets/themes/macchiato.webp new file mode 100644 index 0000000..976cc4d Binary files /dev/null and b/assets/themes/macchiato.webp differ diff --git a/assets/themes/mocha.webp b/assets/themes/mocha.webp new file mode 100644 index 0000000..ac3cdf6 Binary files /dev/null and b/assets/themes/mocha.webp differ diff --git a/assets/themes/preview.webp b/assets/themes/preview.webp new file mode 100644 index 0000000..5dcc409 Binary files /dev/null and b/assets/themes/preview.webp differ diff --git a/assets/v5kyrhpl.png b/assets/v5kyrhpl.png deleted file mode 100644 index 4828b1f..0000000 Binary files a/assets/v5kyrhpl.png and /dev/null differ diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..f547ef7 --- /dev/null +++ b/flake.lock @@ -0,0 +1,95 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1704935893, + "narHash": "sha256-UlGnmFuvr9UgYHkD/lVvRhL7LdXVLP0591A6vNd/qUU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "70c5084aeac16e009b767af01dea842ddd78a9b5", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "toolbox": "toolbox" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "toolbox": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1703901416, + "narHash": "sha256-+JfgIki1TtjEEsSBZiRiCwbLmcmTRoDGk9yiPnhnN+0=", + "owner": "catppuccin", + "repo": "toolbox", + "rev": "1f7baff791546dee39262bc6139c8c3ed36aedf8", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "toolbox", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..8831844 --- /dev/null +++ b/flake.nix @@ -0,0 +1,27 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs"; + flake-utils.url = "github:numtide/flake-utils"; + toolbox.url = "github:catppuccin/toolbox"; + }; + + outputs = { + self, + flake-utils, + nixpkgs, + toolbox, + } @ inputs: + flake-utils.lib.eachDefaultSystem ( + system: let + pkgs = nixpkgs.legacyPackages.${system}; + whiskers = inputs.toolbox.packages.${system}.whiskers; + in { + devShells.default = pkgs.mkShell { + buildInputs = with pkgs; [ + whiskers + just + ]; + }; + } + ); +} diff --git a/image-effects/frappe.sxie b/image-effects/frappe.sxie index 2504ec8..61805b8 100644 Binary files a/image-effects/frappe.sxie and b/image-effects/frappe.sxie differ diff --git a/image-effects/latte.sxie b/image-effects/latte.sxie index 55445ad..5b2e123 100644 Binary files a/image-effects/latte.sxie and b/image-effects/latte.sxie differ diff --git a/image-effects/macchiato.sxie b/image-effects/macchiato.sxie index a487978..d762e77 100644 Binary files a/image-effects/macchiato.sxie and b/image-effects/macchiato.sxie differ diff --git a/image-effects/mocha.sxie b/image-effects/mocha.sxie index c2969ca..6047ccd 100644 Binary files a/image-effects/mocha.sxie and b/image-effects/mocha.sxie differ diff --git a/justfile b/justfile new file mode 100644 index 0000000..c6811f0 --- /dev/null +++ b/justfile @@ -0,0 +1,18 @@ +default: all + +setup: + mkdir -p themes + +clean: + rm -fv themes/*.json + rm -rfv dist + +gen flavor: + whiskers theme.json.tmpl {{flavor}} -o themes/{{flavor}}.json + +zip: + mkdir -p dist + zip -r dist/image-effects.zip image-effects/ + zip -r dist/themes.zip themes/ + +all: setup (gen "latte") (gen "frappe") (gen "macchiato") (gen "mocha") diff --git a/theme.json.tmpl b/theme.json.tmpl new file mode 100644 index 0000000..1f87d2c --- /dev/null +++ b/theme.json.tmpl @@ -0,0 +1,32 @@ +--- +bg: "{{red_i base}}, {{green_i base}}, {{blue_i base}}" +light_bg: "{{red_i mantle}}, {{green_i mantle}}, {{blue_i mantle}}" +dark_bg: "{{red_i crust}}, {{green_i crust}}, {{blue_i crust}}" +border: "{{red_i overlay1}}, {{green_i overlay1}}, {{blue_i overlay1}}" +text: "{{red_i text}}, {{green_i text}}, {{blue_i text}}" +link: "{{red_i blue}}, {{green_i blue}}, {{blue_i blue}}" +highlight: "{{red_i surface0}}, {{green_i surface0}}, {{blue_i surface0}}" +light_sep: "{{red_i subtext1}}, {{green_i subtext1}}, {{blue_i subtext1}}" +dark_sep: "{{red_i subtext0}}, {{green_i subtext0}}, {{blue_i subtext0}}" +--- +{ + "Name": "Catppuccin {{titlecase flavor}}", + "BackgroundColor": "{{bg}}", + "LightBackgroundColor": "{{light_bg}}", + "DarkBackgroundColor": "{{dark_bg}}", + "TextColor": "{{text}}", + "BorderColor": "{{border}}", + "CheckerColor": "{{bg}}", + "CheckerColor2": "{{light_bg}}", + "CheckerSize": 15, + "LinkColor": "{{link}}", + "MenuHighlightColor": "{{highlight}}", + "MenuHighlightBorderColor": "{{border}}", + "MenuBorderColor": "{{border}}", + "MenuCheckBackgroundColor": "{{bg}}", + "MenuFont": "Segoe UI, 9.75pt", + "ContextMenuFont": "Segoe UI, 9.75pt", + "ContextMenuOpacity": 100, + "SeparatorLightColor": "{{light_sep}}", + "SeparatorDarkColor": "{{dark_sep}}" +} diff --git a/themes/frappe.json b/themes/frappe.json new file mode 100644 index 0000000..84faba9 --- /dev/null +++ b/themes/frappe.json @@ -0,0 +1,21 @@ +{ + "Name": "Catppuccin Frappe", + "BackgroundColor": "48, 52, 70", + "LightBackgroundColor": "41, 44, 60", + "DarkBackgroundColor": "35, 38, 52", + "TextColor": "198, 208, 245", + "BorderColor": "131, 139, 167", + "CheckerColor": "48, 52, 70", + "CheckerColor2": "41, 44, 60", + "CheckerSize": 15, + "LinkColor": "140, 170, 238", + "MenuHighlightColor": "65, 69, 89", + "MenuHighlightBorderColor": "131, 139, 167", + "MenuBorderColor": "131, 139, 167", + "MenuCheckBackgroundColor": "48, 52, 70", + "MenuFont": "Segoe UI, 9.75pt", + "ContextMenuFont": "Segoe UI, 9.75pt", + "ContextMenuOpacity": 100, + "SeparatorLightColor": "181, 191, 226", + "SeparatorDarkColor": "165, 173, 206" +} \ No newline at end of file diff --git a/themes/latte.json b/themes/latte.json new file mode 100644 index 0000000..22adfdf --- /dev/null +++ b/themes/latte.json @@ -0,0 +1,21 @@ +{ + "Name": "Catppuccin Latte", + "BackgroundColor": "239, 241, 245", + "LightBackgroundColor": "230, 233, 239", + "DarkBackgroundColor": "220, 224, 232", + "TextColor": "76, 79, 105", + "BorderColor": "140, 143, 161", + "CheckerColor": "239, 241, 245", + "CheckerColor2": "230, 233, 239", + "CheckerSize": 15, + "LinkColor": "30, 102, 245", + "MenuHighlightColor": "204, 208, 218", + "MenuHighlightBorderColor": "140, 143, 161", + "MenuBorderColor": "140, 143, 161", + "MenuCheckBackgroundColor": "239, 241, 245", + "MenuFont": "Segoe UI, 9.75pt", + "ContextMenuFont": "Segoe UI, 9.75pt", + "ContextMenuOpacity": 100, + "SeparatorLightColor": "92, 95, 119", + "SeparatorDarkColor": "108, 111, 133" +} \ No newline at end of file diff --git a/themes/macchiato.json b/themes/macchiato.json index bb58e90..7dba6f0 100644 --- a/themes/macchiato.json +++ b/themes/macchiato.json @@ -1,21 +1,21 @@ { "Name": "Catppuccin Macchiato", "BackgroundColor": "36, 39, 58", - "LightBackgroundColor": "54, 58, 79", - "DarkBackgroundColor": "30, 32, 48", + "LightBackgroundColor": "30, 32, 48", + "DarkBackgroundColor": "24, 25, 38", "TextColor": "202, 211, 245", - "BorderColor": "24, 25, 38", + "BorderColor": "128, 135, 162", "CheckerColor": "36, 39, 58", "CheckerColor2": "30, 32, 48", "CheckerSize": 15, - "LinkColor": "125, 196, 228", - "MenuHighlightColor": "30, 32, 48", - "MenuHighlightBorderColor": "54, 58, 79", - "MenuBorderColor": "54, 58, 79", - "MenuCheckBackgroundColor": "30, 32, 48", + "LinkColor": "138, 173, 244", + "MenuHighlightColor": "54, 58, 79", + "MenuHighlightBorderColor": "128, 135, 162", + "MenuBorderColor": "128, 135, 162", + "MenuCheckBackgroundColor": "36, 39, 58", "MenuFont": "Segoe UI, 9.75pt", "ContextMenuFont": "Segoe UI, 9.75pt", "ContextMenuOpacity": 100, - "SeparatorLightColor": "30, 32, 48", - "SeparatorDarkColor": "24, 25, 38" -} + "SeparatorLightColor": "184, 192, 224", + "SeparatorDarkColor": "165, 173, 203" +} \ No newline at end of file diff --git a/themes/mocha.json b/themes/mocha.json new file mode 100644 index 0000000..22abb86 --- /dev/null +++ b/themes/mocha.json @@ -0,0 +1,21 @@ +{ + "Name": "Catppuccin Mocha", + "BackgroundColor": "30, 30, 46", + "LightBackgroundColor": "24, 24, 37", + "DarkBackgroundColor": "17, 17, 27", + "TextColor": "205, 214, 244", + "BorderColor": "127, 132, 156", + "CheckerColor": "30, 30, 46", + "CheckerColor2": "24, 24, 37", + "CheckerSize": 15, + "LinkColor": "137, 180, 250", + "MenuHighlightColor": "49, 50, 68", + "MenuHighlightBorderColor": "127, 132, 156", + "MenuBorderColor": "127, 132, 156", + "MenuCheckBackgroundColor": "30, 30, 46", + "MenuFont": "Segoe UI, 9.75pt", + "ContextMenuFont": "Segoe UI, 9.75pt", + "ContextMenuOpacity": 100, + "SeparatorLightColor": "186, 194, 222", + "SeparatorDarkColor": "166, 173, 200" +} \ No newline at end of file