From d8289c3f0e5995863921ea207392c122f5d59f6d Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 11 Feb 2025 18:32:56 -0300 Subject: [PATCH] ci: disable IFD (#855) Disable IFD in the CI to prevent regressions mentioned in commit e72aa84da1c6 ("{vencord,vesktop}: revert attempt to support fonts (#844)"). Link: https://github.com/danth/stylix/pull/855 Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- .github/workflows/check.yml | 3 +++ flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ stylix/testbed.nix | 4 ++-- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index b87eb9a2..c6fe6d06 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -69,6 +69,9 @@ jobs: steps: - uses: DeterminateSystems/nix-installer-action@v16 + with: + extra-conf: |- + allow-import-from-derivation = false - run: | nix build --no-update-lock-file --print-build-logs \ diff --git a/flake.lock b/flake.lock index 4c24c0b2..2b3047fd 100644 --- a/flake.lock +++ b/flake.lock @@ -249,6 +249,7 @@ "systems": "systems", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" } @@ -302,6 +303,22 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1737565458, + "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 9e8499a2..8066dc49 100644 --- a/flake.nix +++ b/flake.nix @@ -96,6 +96,11 @@ url = "github:tinted-theming/tinted-kitty/eb39e141db14baef052893285df9f266df041ff8"; }; + tinted-schemes = { + url = "github:tinted-theming/schemes"; + flake = false; + }; + firefox-gnome-theme = { flake = false; url = "github:rafaelmardojai/firefox-gnome-theme"; diff --git a/stylix/testbed.nix b/stylix/testbed.nix index a0a710e3..d518233d 100644 --- a/stylix/testbed.nix +++ b/stylix/testbed.nix @@ -157,7 +157,7 @@ let url = "https://unsplash.com/photos/hwLAI5lRhdM/download?ixid=M3wxMjA3fDB8MXxhbGx8fHx8fHx8fHwxNzE2MzYxNDcwfA&force=true"; hash = "sha256-S0MumuBGJulUekoGI2oZfUa/50Jw0ZzkqDDu1nRkFUA="; }; - base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml"; + base16Scheme = "${inputs.tinted-schemes}/base16/catppuccin-latte.yaml"; polarity = "light"; } { @@ -167,7 +167,7 @@ let url = "https://unsplash.com/photos/ZqLeQDjY6fY/download?ixid=M3wxMjA3fDB8MXxhbGx8fHx8fHx8fHwxNzE2MzY1NDY4fA&force=true"; hash = "sha256-Dm/0nKiTFOzNtSiARnVg7zM0J1o+EuIdUQ3OAuasM58="; }; - base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-macchiato.yaml"; + base16Scheme = "${inputs.tinted-schemes}/base16/catppuccin-macchiato.yaml"; polarity = "dark"; } ];