diff --git a/README.md b/README.md index 2badf31..8c88ee1 100644 --- a/README.md +++ b/README.md @@ -180,6 +180,7 @@ Formatting is configured through `treefmt`. - Style names come from the upstream Catppuccin repositories. The bundled test list in `lib/testUserStyles.nix` is a good reference for known working names. - `discord` is handled separately from the main `catppuccin/userstyles` tree and is compiled from the upstream SCSS theme. +- `tangled` is handled separately from the main `catppuccin/userstyles` tree and is compiled from [`csw.im/tangled-catppuccin`](https://tangled.org/csw.im/tangled-catppuccin). - The generated CSS is post-processed so every declaration becomes `!important`. ## Credits @@ -187,4 +188,5 @@ Formatting is configured through `treefmt`. - [Original project (`knoopx/nix-userstyles`)](https://github.com/knoopx/nix-userstyles) - [Catppuccin userstyles](https://github.com/catppuccin/userstyles) - [Catppuccin Discord theme](https://github.com/catppuccin/discord) +- [Tangled Catppuccin](https://tangled.org/csw.im/tangled-catppuccin) - [nix-colors](https://github.com/misterio77/nix-colors) diff --git a/flake.lock b/flake.lock index 94580ef..31b919d 100644 --- a/flake.lock +++ b/flake.lock @@ -140,6 +140,7 @@ "nix-colors": "nix-colors", "nixpkgs": "nixpkgs", "systems": "systems", + "tangled-catppuccin": "tangled-catppuccin", "treefmt-nix": "treefmt-nix" } }, @@ -158,6 +159,22 @@ "type": "github" } }, + "tangled-catppuccin": { + "flake": false, + "locked": { + "lastModified": 1783094318, + "narHash": "sha256-B7kn9bplozrpusIn6RM75Wk41XTBKINy8xeTv9acI8M=", + "ref": "refs/heads/main", + "rev": "16892445aad8938903cdf63e24000d046dd041c0", + "revCount": 21, + "type": "git", + "url": "https://tangled.org/csw.im/tangled-catppuccin" + }, + "original": { + "type": "git", + "url": "https://tangled.org/csw.im/tangled-catppuccin" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index af0c4bd..6c36f31 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,11 @@ systems.url = "github:nix-systems/default"; + tangled-catppuccin = { + url = "git+https://tangled.org/csw.im/tangled-catppuccin"; + flake = false; + }; + treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/lib/mkUserStyles.nix b/lib/mkUserStyles.nix index 333299b..c6cfee6 100644 --- a/lib/mkUserStyles.nix +++ b/lib/mkUserStyles.nix @@ -4,6 +4,7 @@ discord-userstyle, lib, pkgs, + tangled-catppuccin, # keep-sorted end ... } @ inputs: palette: userStyles: let @@ -37,6 +38,7 @@ lib palette24 pkgs + tangled-catppuccin # keep-sorted end ; }; diff --git a/lib/mkUserStyles/catppuccin.nix b/lib/mkUserStyles/catppuccin.nix index 67d9d4d..81ed8fc 100644 --- a/lib/mkUserStyles/catppuccin.nix +++ b/lib/mkUserStyles/catppuccin.nix @@ -5,6 +5,7 @@ lib, palette24, pkgs, + tangled-catppuccin, # keep-sorted end }: let inherit @@ -91,6 +92,7 @@ styleBoardAndPieces = 1; stylePieces = 1; styleVideoPlayer = 1; + systemFont = 0; urls = "localhost"; zen = 0; # keep-sorted end @@ -121,7 +123,10 @@ buildCommands = styleConfigs: concatMap (style: let - stylePath = "${catppuccin-userstyles}/styles/${style.name}/catppuccin.user.less"; + stylePath = + if style.name == "tangled" + then "${tangled-catppuccin}/tangled.user.less" + else "${catppuccin-userstyles}/styles/${style.name}/catppuccin.user.less"; styleSource = writeText "${sanitizeDerivationName style.name}.user.less" '' @import "${catppuccin-userstyles}/lib/lib.less"; diff --git a/lib/testUserStyles.nix b/lib/testUserStyles.nix index e7860a3..7d5652a 100644 --- a/lib/testUserStyles.nix +++ b/lib/testUserStyles.nix @@ -121,6 +121,7 @@ "substack" "syncthing" "tabnews" + "tangled" "tldraw" "trinket" "tuta" diff --git a/modules/packages.nix b/modules/packages.nix index 9480bf7..9de86dc 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -12,6 +12,7 @@ # keep-sorted start catppuccin-userstyles discord-userstyle + tangled-catppuccin # keep-sorted end ; };