summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci.yaml26
-rw-r--r--README.md22
2 files changed, 16 insertions, 32 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bfc7cf4..d927c48 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -55,16 +55,11 @@ jobs:
with:
extra-conf: "extra-platforms = aarch64-linux arm-linux"
- - name: Setup local Nix cache
- uses: DeterminateSystems/magic-nix-cache-action@v2
-
- - name: Setup Attic cache
- uses: ryanccn/attic-action@v0
+ - name: Setup Cachix
+ uses: cachix/cachix-action@v12
with:
- endpoint: https://cache.mydadleft.me
- cache: nix-exprs
- token: ${{ secrets.ATTIC_TOKEN }}
- skip-push: ${{ github.event_name == 'pull_request' }}
+ name: getchoo
+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
- name: Run build
run: |
@@ -85,16 +80,11 @@ jobs:
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@v9
- - name: Setup local Nix cache
- uses: DeterminateSystems/magic-nix-cache-action@v2
-
- - name: Setup Attic cache
- uses: ryanccn/attic-action@v0
+ - name: Setup Cachix
+ uses: cachix/cachix-action@v12
with:
- endpoint: https://cache.mydadleft.me
- cache: nix-exprs
- token: ${{ secrets.ATTIC_TOKEN }}
- skip-push: ${{ github.event_name == 'pull_request' }}
+ name: getchoo
+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
- name: Run check
run: nix flake check --show-trace --accept-flake-config
diff --git a/README.md b/README.md
index 77eb11a..e44cdf8 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,9 @@
### enabling the binary cache
-all packages are cached in my own [attic](https://github.com/zhaofengli/attic) instance. you can use this
-yourself by following the instructions [here](https://docs.attic.rs/user-guide/index.html), with the endpoint
-being `https://cache.mydadleft.me` and no token required. the binary cache endpoint `https://cache.mydadleft.me/nix-exprs`
-may also be used in the `nixConfig` attribute of flakes or a system configuration.
+all packages are cached by [cachix](https://cachix.org). to enable it, you can run
+`nix run nixpkgs#cachix use getchoo`. it may may also be used in the `nixConfig` attribute
+of flakes or in a system configuration.
<details>
<summary>example</summary>
@@ -18,8 +17,8 @@ may also be used in the `nixConfig` attribute of flakes or a system configuratio
```nix
{pkgs, ...}: {
nix.settings = {
- trusted-substituters = ["https://cache.mydadleft.me/nix-exprs"];
- trusted-public-keys = ["nix-exprs:mLifiLXlGVkkuFpIbqcrCWkIxKn2GyCkrxOuE7fwLxQ="];
+ trusted-substituters = ["https://getchoo.cachix.org"];
+ trusted-public-keys = ["getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE="];
};
}
```
@@ -118,16 +117,13 @@ a "plug-n-play" solution to using the packages, and/or a reduction in duplicated
}
```
+</details>
+
#### ad-hoc installation
this flake can also be used in the base nix package manager!
-> **Note**
-> for nixos/nix-darwin users, `nixpkgs.overlays` does not configure
-> overlays for tools such as `nix(-)run`, `nix(-)shell`, etc. so this
-> will also be required for you
-
-the best way to make this overlay available for you is to
+the best way to make these packages available for you is to
add it to your flake registry like so.
```sh
@@ -136,8 +132,6 @@ nix profile install getchoo#treefetch
nix shell getchoo#cfspeedtest
```
-</details>
-
### standard nix
this repository uses [flake-compat](https://github.com/edolstra/flake-compat) to allow for non-flake environments to use the packages provided.