1
0
Fork 0

General: rename 'nix-secrets' to just 'secrets'

This commit is contained in:
Aires 2024-09-05 20:48:40 -04:00
parent 1304a6ad83
commit 00e7b60832
5 changed files with 25 additions and 25 deletions

4
.gitmodules vendored
View file

@ -1,4 +1,4 @@
[submodule "nix-secrets"] [submodule "secrets"]
path = nix-secrets path = secrets
url = ssh://code.8bitbuddhism.com/aires/nix-secrets.git url = ssh://code.8bitbuddhism.com/aires/nix-secrets.git
branch = main branch = main

View file

@ -231,22 +231,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-secrets": {
"flake": false,
"locked": {
"lastModified": 1725289601,
"narHash": "sha256-GJerArXURZD3VfNScxpa73QKajylnfpeG0U6Z6/XxA8=",
"ref": "refs/heads/main",
"rev": "a321a1ba2e23b59a6d39a33258a82021feaa853f",
"revCount": 64,
"type": "git",
"url": "file:./nix-secrets"
},
"original": {
"type": "git",
"url": "file:./nix-secrets"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1725477728, "lastModified": 1725477728,
@ -360,10 +344,10 @@
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"lix-module": "lix-module", "lix-module": "lix-module",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-secrets": "nix-secrets",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable",
"secrets": "secrets"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -391,6 +375,22 @@
"type": "github" "type": "github"
} }
}, },
"secrets": {
"flake": false,
"locked": {
"lastModified": 1725577261,
"narHash": "sha256-ibdKbdjhBvtjxACnfZDTWwwRsaqlTBg9pQCB60pZI9g=",
"ref": "refs/heads/main",
"rev": "f63bc68d28da4035eed84d4156615566ca5eae85",
"revCount": 65,
"type": "git",
"url": "file:./secrets"
},
"original": {
"type": "git",
"url": "file:./secrets"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

View file

@ -34,8 +34,8 @@
}; };
# "Secrets management" # "Secrets management"
nix-secrets = { secrets = {
url = "git+file:./nix-secrets"; url = "git+file:./secrets";
flake = false; flake = false;
}; };
}; };
@ -48,7 +48,7 @@
nix-flatpak, nix-flatpak,
nixos-hardware, nixos-hardware,
nixpkgs, nixpkgs,
nix-secrets, secrets,
... ...
}: }:
let let
@ -62,7 +62,7 @@
# Define shared modules and imports # Define shared modules and imports
defaultModules = [ defaultModules = [
./modules/autoimport.nix ./modules/autoimport.nix
(import nix-secrets) (import secrets)
lix-module.nixosModules.default lix-module.nixosModules.default
lanzaboote.nixosModules.lanzaboote lanzaboote.nixosModules.lanzaboote
nix-flatpak.nixosModules.nix-flatpak nix-flatpak.nixosModules.nix-flatpak

@ -1 +0,0 @@
Subproject commit a321a1ba2e23b59a6d39a33258a82021feaa853f

1
secrets Submodule

@ -0,0 +1 @@
Subproject commit f63bc68d28da4035eed84d4156615566ca5eae85