diff --git a/flake.lock b/flake.lock index 8108c68..dc6787e 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1715077503, - "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e277d9566de9976f47228dd8c580b97488734d4", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -20,6 +20,22 @@ "type": "github" } }, + "nix-secrets": { + "flake": false, + "locked": { + "lastModified": 1715635214, + "narHash": "sha256-BeviucpDYaTQs0qGFTw8M3u7OJuqejN+uKCAn5094+g=", + "ref": "refs/heads/master", + "rev": "42b4533b8adf75f03f1ed98374cc75d02ec1e04d", + "revCount": 1, + "type": "git", + "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git" + }, + "original": { + "type": "git", + "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git" + } + }, "nixpkgs": { "locked": { "lastModified": 0, @@ -50,11 +66,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -67,6 +83,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nix-secrets": "nix-secrets", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" diff --git a/flake.nix b/flake.nix index f16a832..3404913 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,11 @@ url = "github:mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nix-secrets = { + url = "git+ssh://git@git.bitlab21.com/sam/nix-secrets.git"; + flake = false; + }; }; outputs = { diff --git a/secrets.yaml b/secrets.yaml deleted file mode 100644 index 4155bab..0000000 --- a/secrets.yaml +++ /dev/null @@ -1,35 +0,0 @@ -ssh_keys: - sam: - private: ENC[AES256_GCM,data:OKEDz+4HDU5VOTQUvteiJrifZHae8DEPKs2Z1Homx9TgPj8pshh/ONJMrWQeSOyzIR3y1jELhd+GvCE3Q3j6wi1VVsNo4Ia88fqYkbjnSLf3MF5w+9WHrmIkeoWO/SbmG/hGUgv8eVFUR9QkfbYEzepRXmD2HsBjj3xir4NodGyBGfOeB5Iw1W6qJQKx23lflKVD2mQ88LffpJ2V14BgWwk03AmhsKfKMyoCfA9caJOy3VdLKDNcfTZQrvFB75fWXL1HtHtOlxVWyRJWWqfZtbe8ccpaAvTsLo/+/JiFAYeNnvFfCa9lmIDgZv9XrhJpRX6SbRb70HCvXpBIhGfcaqdiYnyjK0e8TphfkYWjXzjlSHm4g+C0Y4yPdtISTTIbXgMi7sTNkxWd0AURWQZBIBfzhn5Y///ly/ZKYCAkHWUkhceL1gx3l8CmtvEDH5kYSpp9N5X3AhPbTlpF2kkSUE7FF8YmhY2JvZW32zvCEUQFAksvw6StqVe8S129YVByhpiS0dj90tR7VCxsZVmt,iv:2Dbm1IuYBto9QkW84HcyOXUbazcYhkk9fgAuiZi8cAo=,tag:dbYPiN9OQmAEPInB8OVBlQ==,type:str] - public: ENC[AES256_GCM,data:NidK4Kt4Dya6tKDDYEp1CtXfzClp2e9wdORKMo8ro1EiRBRoKolfMm7mtiPY70X7u/PagDH/v31bAy51tieqjsAI7ixNPhenSB8qfyFJZrhB/fZtEnKXpgmX,iv:SqCSeV+Fmnd3lloiR3xCagXyE9xz13HdWWQ1+syV75Y=,tag:n69o5oBC/dbYDxQVrMBKCQ==,type:str] -sam-password: ENC[AES256_GCM,data:2TObp9d8fvWWsKyTVqNqSabhmcA+ZVo5N1qmn8N15ZXhb9G4sdfkPspnCZmxZ+FttfTvNYG8ZwcDzBAx2XbR8jRwGxljZaoBXQ==,iv:mysxYtfrE8KEkK0qO1C4+FgJYuWsKvsYVMAYRD0FW/Q=,tag:5LNmkZn1msT6n18BLLP4vA==,type:str] -gitea-password: null -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1z6a934w5cwjge2lchrs7f0a7lp6s30s3tygq3alu7z9zwc8fqs2qdnd4mv - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYbE1DejdDSTVhVmdrTC9r - Y3BLLytPem90UnUvQkpCZ3NMaFBhYytWUndzCkNUWElDOVVwc0dhWFRWL2ZFQXV4 - Qi9PdDdqZHR2S2JkeXdEL3RQbXVQREkKLS0tIE5JcHVlTS9LellRM08wZUpiRS9Y - cE5LK1llSXVhYWVzUjg0Z0VoQVJIMDAKt+bCXwj6jMLiRDS+/4K3+z+8nc3lUFli - WWRVNOTUZT8Ckt5UjHWrZ/FOfgCupGiDD9Imsx1x37cgN0P88vib/A== - -----END AGE ENCRYPTED FILE----- - - recipient: age136u5hqnlp2mvepjh575yl9346wl08v9jyta9ynhqrawaqpcmldqsu5wns3 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlOG1jTEZYMmdFMWxzWGxE - cWp2QlM2N1hxYTlmN0NnRzJKczI4OWRtUW5nCmQ2YVB3SkNxVlFwL3ZVNm03K2U3 - SFdDU1JXTXJjM1M5UzV1ckoyRGQ5R0EKLS0tIHFsSnk5VWlReW1VZmYvMW50OGJr - ZE90dTRDQWdUL0FXNC9IWFhKcEhocG8KF4F5wAnkwF2gfGa3jt2OHseY4NlqHqf2 - /g2Huk8W6pni2K3XOnIrb+89JQaafI8AJgaBLl6kMrsGHx5Jqa2HjQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-05-12T19:33:31Z" - mac: ENC[AES256_GCM,data:qUWB5mwld/CSN4+TXHuGr0RLHagxd2YtCN5mkh4YKhI1BImZiUaTBlWQ78yiknmolk/Cxnb9TDsHk42dP9mnP2Ybus5DTgpIj0hTUVCiZmdcH7nxCIc40nC9zOhtVB2Idd2FDufssFQrs+KzKEkWfb2zEbcU72RjpnTkbkJ7Ie8=,iv:83Qa4EeBdYtU6w3fmJCMTNVfIzY9x3BGMm21QUNBOCA=,tag:NfeAbwZ9uLViX1ykkgBNBg==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1