Compare commits
8 Commits
update-nix
...
lopter-lo-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a2e4b98a93 | ||
|
|
25ce97dd5e | ||
|
|
bd361b2744 | ||
|
|
ac901f5656 | ||
|
|
8339ad605c | ||
|
|
3473aaa440 | ||
|
|
e983b10331 | ||
|
|
fcf5ccd115 |
12
devFlake/flake.lock
generated
12
devFlake/flake.lock
generated
@@ -3,10 +3,10 @@
|
|||||||
"clan-core-for-checks": {
|
"clan-core-for-checks": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759745582,
|
"lastModified": 1759795610,
|
||||||
"narHash": "sha256-EEU7h84Ojz3jBnPUgDiWrpBnBK3Ep3317qoFo1NvjXM=",
|
"narHash": "sha256-YFOK+aoJjWLfMHj2spvrQIe0ufIsv6P8o44NqoFPwp0=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "1cb7c7d25f40a4e1943e54adcbcd57c4d3a7dd84",
|
"rev": "0de79962eacfe6f09d7aabca2a7305deef4fde0c",
|
||||||
"shallow": true,
|
"shallow": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.clan.lol/clan/clan-core"
|
"url": "https://git.clan.lol/clan/clan-core"
|
||||||
@@ -105,11 +105,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-dev": {
|
"nixpkgs-dev": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759670943,
|
"lastModified": 1759794031,
|
||||||
"narHash": "sha256-JBjTDfwzAwtd8+5X/Weg27WE/3hVYOP3uggP2JPaQVQ=",
|
"narHash": "sha256-Zruni/00BlDHSWVJf3mb0o+OHnxIvJNuXkPloY9c+PU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "21980a9c20f34648121f60bda15f419fa568db21",
|
"rev": "09c221b2f0726da85b124efb60a1d123971dfa08",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -5,11 +5,11 @@
|
|||||||
## Option 1: Follow `clan-core`
|
## Option 1: Follow `clan-core`
|
||||||
|
|
||||||
- **Pros**:
|
- **Pros**:
|
||||||
- Recommended for most users.
|
- Recommended for most users.
|
||||||
- Verified by our CI and widely used by others.
|
- Verified by our CI and widely used by others.
|
||||||
- **Cons**:
|
- **Cons**:
|
||||||
- Coupled to version bumps in `clan-core`.
|
- Coupled to version bumps in `clan-core`.
|
||||||
- Upstream features and packages may take longer to land.
|
- Upstream features and packages may take longer to land.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
@@ -24,10 +24,10 @@ inputs = {
|
|||||||
## Option 2: Use Your Own `nixpkgs` Version
|
## Option 2: Use Your Own `nixpkgs` Version
|
||||||
|
|
||||||
- **Pros**:
|
- **Pros**:
|
||||||
- Faster access to new upstream features and packages.
|
- Faster access to new upstream features and packages.
|
||||||
- **Cons**:
|
- **Cons**:
|
||||||
- Recommended for advanced users.
|
- Recommended for advanced users.
|
||||||
- Not covered by our CI — you’re on the frontier.
|
- Not covered by our CI — you’re on the frontier.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
|
|||||||
@@ -158,8 +158,10 @@ def encrypt_secret(
|
|||||||
admin_keys = sops.ensure_admin_public_keys(flake_dir)
|
admin_keys = sops.ensure_admin_public_keys(flake_dir)
|
||||||
|
|
||||||
if not admin_keys:
|
if not admin_keys:
|
||||||
# TODO double check the correct command to run
|
msg = (
|
||||||
msg = "No keys found. Please run 'clan secrets add-key' to add a key."
|
"No admin keys found.\n\n"
|
||||||
|
"Please run 'clan vars keygen' to generate and set up keys."
|
||||||
|
)
|
||||||
raise ClanError(msg)
|
raise ClanError(msg)
|
||||||
|
|
||||||
username = next(iter(admin_keys)).username
|
username = next(iter(admin_keys)).username
|
||||||
|
|||||||
Reference in New Issue
Block a user