Compare commits
3 commits
37d4123731
...
d3b5c27900
Author | SHA1 | Date | |
---|---|---|---|
d3b5c27900 | |||
a61c7fbf50 | |||
d6186b23ee |
4 changed files with 31 additions and 27 deletions
24
.github/workflows/build-machines-and-homes.yml
vendored
24
.github/workflows/build-machines-and-homes.yml
vendored
|
@ -47,17 +47,14 @@ jobs:
|
||||||
accept-flake-config = true
|
accept-flake-config = true
|
||||||
system-features = nixos-test benchmark big-parallel kvm
|
system-features = nixos-test benchmark big-parallel kvm
|
||||||
secret-key-files = /home/runner/cache-priv-key.pem
|
secret-key-files = /home/runner/cache-priv-key.pem
|
||||||
extra-substituters = https://nixcache.cy7.sh
|
extra-substituters = https://nixcache.cy7.sh https://cache.lix.systems https://attic.kennel.juneis.dog/conduwuit
|
||||||
extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=
|
extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE=
|
||||||
|
|
||||||
- name: Install Lix
|
- name: Install Lix
|
||||||
run: |
|
run: |
|
||||||
sudo --preserve-env=PATH $(which nix) run \
|
sudo --preserve-env=PATH $(which nix) run \
|
||||||
--experimental-features "nix-command flakes" \
|
|
||||||
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" \
|
|
||||||
'git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.92.0' -- \
|
'git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.92.0' -- \
|
||||||
upgrade-nix \
|
upgrade-nix
|
||||||
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
|
|
||||||
nix --version
|
nix --version
|
||||||
|
|
||||||
- name: Sync repository
|
- name: Sync repository
|
||||||
|
@ -69,7 +66,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
# package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel"
|
# package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel"
|
||||||
# nix build -L "$package"
|
# nix build -L "$package"
|
||||||
nix run nixpkgs#nixos-rebuild build -- --flake ".#${{ matrix.machine }}"
|
nix run nixpkgs#nixos-rebuild build -- -L --flake ".#${{ matrix.machine }}"
|
||||||
|
|
||||||
- name: cache
|
- name: cache
|
||||||
# https://stackoverflow.com/a/58859404
|
# https://stackoverflow.com/a/58859404
|
||||||
|
@ -77,7 +74,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel"
|
package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel"
|
||||||
nix run git+https://git.cy7.sh/cy/nixcp.git -- \
|
nix run git+https://git.cy7.sh/cy/nixcp.git -- \
|
||||||
--to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem' \
|
--to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem&compression=none' \
|
||||||
-u https://nix-community.cachix.org \
|
-u https://nix-community.cachix.org \
|
||||||
-u https://nixcache.web.cy7.sh \
|
-u https://nixcache.web.cy7.sh \
|
||||||
$package
|
$package
|
||||||
|
@ -120,17 +117,14 @@ jobs:
|
||||||
accept-flake-config = true
|
accept-flake-config = true
|
||||||
system-features = nixos-test benchmark big-parallel kvm
|
system-features = nixos-test benchmark big-parallel kvm
|
||||||
secret-key-files = /home/runner/cache-priv-key.pem
|
secret-key-files = /home/runner/cache-priv-key.pem
|
||||||
extra-substituters = https://nixcache.cy7.sh
|
extra-substituters = https://nixcache.cy7.sh https://cache.lix.systems
|
||||||
extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=
|
extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=
|
||||||
|
|
||||||
- name: Install Lix
|
- name: Install Lix
|
||||||
run: |
|
run: |
|
||||||
sudo --preserve-env=PATH $(which nix) run \
|
sudo --preserve-env=PATH $(which nix) run \
|
||||||
--experimental-features "nix-command flakes" \
|
|
||||||
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" \
|
|
||||||
'git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.92.0' -- \
|
'git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.92.0' -- \
|
||||||
upgrade-nix \
|
upgrade-nix
|
||||||
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
|
|
||||||
nix --version
|
nix --version
|
||||||
|
|
||||||
- name: Sync repository
|
- name: Sync repository
|
||||||
|
@ -149,7 +143,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
package=".#homeConfigurations."${{ matrix.home }}".activationPackage"
|
package=".#homeConfigurations."${{ matrix.home }}".activationPackage"
|
||||||
nix run git+https://git.cy7.sh/cy/nixcp.git -- \
|
nix run git+https://git.cy7.sh/cy/nixcp.git -- \
|
||||||
--to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem' \
|
--to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem&compression=none' \
|
||||||
-u https://nix-community.cachix.org \
|
-u https://nix-community.cachix.org \
|
||||||
-u https://nixcache.web.cy7.sh \
|
-u https://nixcache.web.cy7.sh \
|
||||||
$package
|
$package
|
||||||
|
|
11
.github/workflows/build-packages.yml
vendored
11
.github/workflows/build-packages.yml
vendored
|
@ -40,17 +40,14 @@ jobs:
|
||||||
accept-flake-config = true
|
accept-flake-config = true
|
||||||
system-features = nixos-test benchmark big-parallel kvm
|
system-features = nixos-test benchmark big-parallel kvm
|
||||||
secret-key-files = /home/runner/cache-priv-key.pem
|
secret-key-files = /home/runner/cache-priv-key.pem
|
||||||
extra-substituters = https://nixcache.cy7.sh
|
extra-substituters = https://nixcache.cy7.sh https://cache.lix.systems
|
||||||
extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=
|
extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=
|
||||||
|
|
||||||
- name: Install Lix
|
- name: Install Lix
|
||||||
run: |
|
run: |
|
||||||
sudo --preserve-env=PATH $(which nix) run \
|
sudo --preserve-env=PATH $(which nix) run \
|
||||||
--experimental-features "nix-command flakes" \
|
|
||||||
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" \
|
|
||||||
'git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.92.0' -- \
|
'git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.92.0' -- \
|
||||||
upgrade-nix \
|
upgrade-nix
|
||||||
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
|
|
||||||
nix --version
|
nix --version
|
||||||
|
|
||||||
- name: Sync repository
|
- name: Sync repository
|
||||||
|
@ -65,7 +62,7 @@ jobs:
|
||||||
if: '!cancelled()'
|
if: '!cancelled()'
|
||||||
run: |
|
run: |
|
||||||
nix run git+https://git.cy7.sh/cy/nixcp.git -- \
|
nix run git+https://git.cy7.sh/cy/nixcp.git -- \
|
||||||
--to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem' \
|
--to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem&compression=none' \
|
||||||
-u https://nix-community.cachix.org \
|
-u https://nix-community.cachix.org \
|
||||||
-u https://nixcache.web.cy7.sh \
|
-u https://nixcache.web.cy7.sh \
|
||||||
"${{ matrix.package }}"
|
"${{ matrix.package }}"
|
||||||
|
|
22
flake.lock
generated
22
flake.lock
generated
|
@ -701,9 +701,7 @@
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_3",
|
||||||
"flakey-profile": "flakey-profile",
|
"flakey-profile": "flakey-profile",
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_5"
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742943028,
|
"lastModified": 1742943028,
|
||||||
|
@ -974,6 +972,22 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1743448293,
|
||||||
|
"narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743559129,
|
"lastModified": 1743559129,
|
||||||
"narHash": "sha256-7gpAWsENV3tY2HmeHYQ2MoQxGpys+jQWnkS/BHAMXVk=",
|
"narHash": "sha256-7gpAWsENV3tY2HmeHYQ2MoQxGpys+jQWnkS/BHAMXVk=",
|
||||||
|
@ -1042,7 +1056,7 @@
|
||||||
"nil": "nil",
|
"nil": "nil",
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nix-ld": "nix-ld",
|
"nix-ld": "nix-ld",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_6",
|
||||||
"nixpkgs-stable": "nixpkgs-stable_3",
|
"nixpkgs-stable": "nixpkgs-stable_3",
|
||||||
"rust-overlay": "rust-overlay_4",
|
"rust-overlay": "rust-overlay_4",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
conduwuit.url = "github:girlbossceo/conduwuit";
|
conduwuit.url = "github:girlbossceo/conduwuit";
|
||||||
conduwuit.inputs.nixpkgs.follows = "nixpkgs";
|
conduwuit.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
lix-module.url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.92";
|
lix-module.url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.92";
|
||||||
lix-module.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
nix-ld.url = "github:nix-community/nix-ld";
|
nix-ld.url = "github:nix-community/nix-ld";
|
||||||
nix-ld.inputs.nixpkgs.follows = "nixpkgs";
|
nix-ld.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nil.url = "github:oxalica/nil";
|
nil.url = "github:oxalica/nil";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue