diff --git a/.gitmodules b/.gitmodules index a7c947c..d03cc67 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "nix-secrets"] - path = nix-secrets +[submodule "secrets"] + path = secrets url = ssh://code.8bitbuddhism.com/aires/nix-secrets.git branch = main diff --git a/flake.lock b/flake.lock index 48cd726..a247781 100644 --- a/flake.lock +++ b/flake.lock @@ -231,22 +231,6 @@ "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": { "locked": { "lastModified": 1725477728, @@ -360,10 +344,10 @@ "lanzaboote": "lanzaboote", "lix-module": "lix-module", "nix-flatpak": "nix-flatpak", - "nix-secrets": "nix-secrets", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-unstable": "nixpkgs-unstable", + "secrets": "secrets" } }, "rust-overlay": { @@ -391,6 +375,22 @@ "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": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 735b510..283955e 100644 --- a/flake.nix +++ b/flake.nix @@ -34,8 +34,8 @@ }; # "Secrets management" - nix-secrets = { - url = "git+file:./nix-secrets"; + secrets = { + url = "git+file:./secrets"; flake = false; }; }; @@ -48,7 +48,7 @@ nix-flatpak, nixos-hardware, nixpkgs, - nix-secrets, + secrets, ... }: let @@ -62,7 +62,7 @@ # Define shared modules and imports defaultModules = [ ./modules/autoimport.nix - (import nix-secrets) + (import secrets) lix-module.nixosModules.default lanzaboote.nixosModules.lanzaboote nix-flatpak.nixosModules.nix-flatpak diff --git a/nix-secrets b/nix-secrets deleted file mode 160000 index a321a1b..0000000 --- a/nix-secrets +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a321a1ba2e23b59a6d39a33258a82021feaa853f diff --git a/secrets b/secrets new file mode 160000 index 0000000..f63bc68 --- /dev/null +++ b/secrets @@ -0,0 +1 @@ +Subproject commit f63bc68d28da4035eed84d4156615566ca5eae85