diff --git a/.github/actions/install-lix/action.yml b/.github/actions/install-lix/action.yml new file mode 100644 index 00000000..6cc3cb2c --- /dev/null +++ b/.github/actions/install-lix/action.yml @@ -0,0 +1,16 @@ +name: Install Lix +description: Install Lix and upgrade it to izlix + +runs: + using: composite + steps: + - name: Install Lix + uses: samueldr/lix-gha-installer-action@7b7f14d320d6aacfb65bd1ef761566b3b69e474c # v2026-02-22 + with: + extra_nix_config: | + substituters = https://cache.nixos.org/ https://nix-community.cachix.org https://isabelroses.cachix.org https://catppuccin.cachix.org https://extersia.cachix.org + trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= isabelroses.cachix.org-1:mXdV/CMcPDaiTmkQ7/4+MzChpOe6Cb97njKmBQQmLPM= catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU= extersia.cachix.org-1:ZHy9765xrhn4lDKGTzWWykHC+B091oTqNxClgc78MQU= + + - name: Upgrade to izlix + shell: bash + run: nix profile install github:isabelroses/izlix#lix diff --git a/.github/workflows/build-isos.yml b/.github/workflows/build-isos.yml index 30f7cc01..fe9ea838 100644 --- a/.github/workflows/build-isos.yml +++ b/.github/workflows/build-isos.yml @@ -30,11 +30,7 @@ jobs: persist-credentials: false - name: Install Lix - uses: samueldr/lix-gha-installer-action@7b7f14d320d6aacfb65bd1ef761566b3b69e474c # v2026-02-22 - with: - extra_nix_config: | - substituters = https://cache.nixos.org/ https://nix-community.cachix.org https://isabelroses.cachix.org https://catppuccin.cachix.org https://extersia.cachix.org - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= isabelroses.cachix.org-1:mXdV/CMcPDaiTmkQ7/4+MzChpOe6Cb97njKmBQQmLPM= catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU= extersia.cachix.org-1:ZHy9765xrhn4lDKGTzWWykHC+B091oTqNxClgc78MQU= + uses: ./.github/actions/install-lix # we shouldn't really be needing to do this, but sometimes lix isn't # build before we get here diff --git a/.github/workflows/check-lock.yml b/.github/workflows/check-lock.yml index d7812412..edd9fc32 100644 --- a/.github/workflows/check-lock.yml +++ b/.github/workflows/check-lock.yml @@ -20,11 +20,7 @@ jobs: persist-credentials: false - name: Install Lix - uses: samueldr/lix-gha-installer-action@7b7f14d320d6aacfb65bd1ef761566b3b69e474c # v2026-02-22 - with: - extra_nix_config: | - substituters = https://cache.nixos.org/ https://extersia.cachix.org - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= extersia.cachix.org-1:ZHy9765xrhn4lDKGTzWWykHC+B091oTqNxClgc78MQU= + uses: ./.github/actions/install-lix - name: Check flake.lock run: nix run github:extersia-org/pkgs#locker diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 8aa90422..6667187d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -31,11 +31,7 @@ jobs: persist-credentials: false - name: Install Lix - uses: samueldr/lix-gha-installer-action@7b7f14d320d6aacfb65bd1ef761566b3b69e474c # v2026-02-22 - with: - extra_nix_config: | - substituters = https://cache.nixos.org/ https://nix-community.cachix.org https://isabelroses.cachix.org https://catppuccin.cachix.org https://extersia.cachix.org - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= isabelroses.cachix.org-1:mXdV/CMcPDaiTmkQ7/4+MzChpOe6Cb97njKmBQQmLPM= catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU= extersia.cachix.org-1:ZHy9765xrhn4lDKGTzWWykHC+B091oTqNxClgc78MQU= + uses: ./.github/actions/install-lix - name: Check Flake run: nix flake check --show-trace --option allow-import-from-derivation false diff --git a/.github/workflows/diff.yml b/.github/workflows/diff.yml index 961690df..413596cf 100644 --- a/.github/workflows/diff.yml +++ b/.github/workflows/diff.yml @@ -19,11 +19,7 @@ jobs: persist-credentials: false - name: Install Lix - uses: samueldr/lix-gha-installer-action@7b7f14d320d6aacfb65bd1ef761566b3b69e474c # v2026-02-22 - with: - extra_nix_config: | - substituters = https://cache.nixos.org/ https://nix-community.cachix.org https://isabelroses.cachix.org https://catppuccin.cachix.org https://extersia.cachix.org - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= isabelroses.cachix.org-1:mXdV/CMcPDaiTmkQ7/4+MzChpOe6Cb97njKmBQQmLPM= catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU= extersia.cachix.org-1:ZHy9765xrhn4lDKGTzWWykHC+B091oTqNxClgc78MQU= + uses: ./.github/actions/install-lix - name: Get Hosts id: hosts @@ -66,11 +62,7 @@ jobs: persist-credentials: false - name: Install Lix - uses: samueldr/lix-gha-installer-action@7b7f14d320d6aacfb65bd1ef761566b3b69e474c # v2026-02-22 - with: - extra_nix_config: | - substituters = https://cache.nixos.org/ https://nix-community.cachix.org https://isabelroses.cachix.org https://catppuccin.cachix.org https://extersia.cachix.org - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= isabelroses.cachix.org-1:mXdV/CMcPDaiTmkQ7/4+MzChpOe6Cb97njKmBQQmLPM= catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU= extersia.cachix.org-1:ZHy9765xrhn4lDKGTzWWykHC+B091oTqNxClgc78MQU= + uses: ./.github/actions/install-lix - name: Checkout base uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 446e4d73..9c49ceb0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -24,11 +24,7 @@ jobs: persist-credentials: false - name: Install Lix - uses: samueldr/lix-gha-installer-action@7b7f14d320d6aacfb65bd1ef761566b3b69e474c # v2026-02-22 - with: - extra_nix_config: | - substituters = https://cache.nixos.org/ https://nix-community.cachix.org https://isabelroses.cachix.org https://catppuccin.cachix.org https://extersia.cachix.org - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= isabelroses.cachix.org-1:mXdV/CMcPDaiTmkQ7/4+MzChpOe6Cb97njKmBQQmLPM= catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU= extersia.cachix.org-1:ZHy9765xrhn4lDKGTzWWykHC+B091oTqNxClgc78MQU= + uses: ./.github/actions/install-lix - name: Build docs run: nix build .#docs diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 3e428ecb..efb21f31 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -19,7 +19,7 @@ jobs: persist-credentials: false - name: Install Lix - uses: samueldr/lix-gha-installer-action@7b7f14d320d6aacfb65bd1ef761566b3b69e474c # v2026-02-22 + uses: ./.github/actions/install-lix - name: Update Lockfile id: pr diff --git a/flake.lock b/flake.lock index 4fabb2df..bc4bd258 100644 --- a/flake.lock +++ b/flake.lock @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1778379977, - "narHash": "sha256-0QvW0xTzw7m0/9u6/QT7/sCsCJbFlA84EOe6tZjLwkQ=", + "lastModified": 1778435222, + "narHash": "sha256-y6eS7OIP4ijJw8LwlZ35IlqLcMQ+1XJBidyiaSSUq2U=", "owner": "isabelroses", "repo": "izlix", - "rev": "fd01451a2ecebb04e90284fac63eb6606ef142ee", + "rev": "46c2c6b8b7af3816282c2dda648229ca0666859f", "type": "github" }, "original": { @@ -384,11 +384,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1777789800, - "narHash": "sha256-XHCvLGu/bEEZRzXVKFu1i+2YB102Nr00n8e7xrzsfVs=", + "lastModified": 1778395012, + "narHash": "sha256-A/VRiNFQIwGp8cOC/8yNCRexFHjtFCzBwhajrkyGojo=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "d0e921cc48aab6137d203a3eab19601dc2bdc0c3", + "rev": "3b4991bfc064c3361957f23141351ae2d9833234", "type": "github" }, "original": {