diff --git a/nixos/.sops.yaml b/nixos/.sops.yaml index aa87c18..b45f4b4 100644 --- a/nixos/.sops.yaml +++ b/nixos/.sops.yaml @@ -1,10 +1,11 @@ keys: hosts: - &laptop age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v - - &nixos-homelab-00 age1snp9nyljs6zps0h4aesdjdtdlqckz4axmw9ud20vuhy9a36mdadqzemea4 + - &nixos-homelab-00 age1npdh6er3ntzlw4c7suwaw04fw4kqg2xr3h5qhw2anst02j7kypaspwyfda creation_rules: - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ key_groups: - age: - *laptop - *nixos-homelab-00 + - *nixos-homelab-00 diff --git a/nixos/flake.lock b/nixos/flake.lock index ea06d54..8496530 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1744145203, - "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -59,6 +59,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -66,11 +84,11 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -94,27 +112,27 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.8", "repo": "ixx", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1744168086, - "narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=", + "lastModified": 1748421225, + "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73", + "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", "type": "github" }, "original": { @@ -126,11 +144,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744096231, - "narHash": "sha256-kUfx3FKU1Etnua3EaKvpeuXs7zoFiAcli1gBwkPvGSs=", + "lastModified": 1748406211, + "narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", + "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707", "type": "github" }, "original": { @@ -140,18 +158,35 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1748421225, + "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_2", - "nuschtosSearch": "nuschtosSearch" + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_2" }, "locked": { - "lastModified": 1744200902, - "narHash": "sha256-BqTLjxT1C1XfREDBQSxPrfKI9DBpZHBVLHzfXZs+h8M=", + "lastModified": 1748564405, + "narHash": "sha256-uCmQLJmdg0gKWBs+vhNmS9RIPJW8/ddo6TvQ/a4gupc=", "owner": "nix-community", "repo": "nixvim", - "rev": "51203927e395535c4a427295efed4e1b2ef8349b", + "rev": "8b3a69cfea5ba2fa008c6c57ab79c99c513a349b", "type": "github" }, "original": { @@ -170,11 +205,11 @@ ] }, "locked": { - "lastModified": 1743683223, - "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", + "lastModified": 1748298102, + "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", "owner": "NuschtOS", "repo": "search", - "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", + "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", "type": "github" }, "original": { @@ -185,11 +220,11 @@ }, "quasiSecrets": { "locked": { - "lastModified": 1747776798, - "narHash": "sha256-rzCpxht8YLDndS/V43RD9Lr3Yv9BAdDC3HEB7Gk7Zq8=", + "lastModified": 1748826711, + "narHash": "sha256-MATId8k2XLIBrEwYePxuWyHeYTF59focabs5FKt1bAI=", "ref": "refs/heads/main", - "rev": "fa94af6a999c23277a8a286f046024fbe0bebecf", - "revCount": 10, + "rev": "2b03b96cdfed1fb02e69c622472db62909029859", + "revCount": 11, "type": "git", "url": "ssh://git@github.com/RoyDumblauskas/server-semi-secrets" }, @@ -205,7 +240,8 @@ "nixpkgs": "nixpkgs", "nixvim": "nixvim", "quasiSecrets": "quasiSecrets", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "tests-service": "tests-service" } }, "sops-nix": { @@ -215,11 +251,11 @@ ] }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -242,6 +278,55 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tests-service": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1748825739, + "narHash": "sha256-pLMRDpZYpkpQRRBJ3pnHf9OjwW5WEnpHL1sZ11SHXYw=", + "owner": "RoyDumblauskas", + "repo": "tests-service", + "rev": "9a324e39c3d0d9b1b679da5909e6b7eb98fe4ecb", + "type": "github" + }, + "original": { + "owner": "RoyDumblauskas", + "repo": "tests-service", + "type": "github" + } } }, "root": "root", diff --git a/nixos/secrets/build.json b/nixos/secrets/build.json index d1eca40..17a06e9 100644 --- a/nixos/secrets/build.json +++ b/nixos/secrets/build.json @@ -8,11 +8,11 @@ "age": [ { "recipient": "age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOMFlhWGlMcUNtU2JHQ2Zm\nMXlhMGwvMGJUWk83M2pQSUxEd0RzaytBYmxvCnBCU2E3RHdTc2p0eWV2OHdyaFJh\nNk5MZ3ZGVHc1NzMwK0xQNHBDYWc0Y2cKLS0tIGxJOTFGQmJ3TTJWNVIrT3ZPOThQ\nS2IvbVFLU3NBblhMWlUwYlN6TkN1VlkKfy60em/GrGicEVR5FizanIH8X8xlLOkp\nlN3eRJeUoizWkpSxdY4ArH1HEZDpEGOEy848jR/EBPfhYg5OlYlXcg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKREV0d0FMQSt0a05iZU1y\nMzdreG9WOXhWWFQ3RU41UnVCSXdQRjJDYmd3CkVHcGhvN0dmSUp2SWx6QkZ5N3px\nSTJjQi8ySE1YdWFTQ0FkOWpib2tYWkUKLS0tIE9MN0h5eGJHZExPNmk3WGtQd2ZN\nVGh1OWIxcVhaVktrUm5Za2IxSXdNQjAKFk6Lm6VQWwFPlPNP/m9y7DPUiGV0/buk\nOi6Lq2/yYJA0n3IHdqSG9H0QCZKDwyfVqKnmctsoG/pRCLsZYovgTw==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1snp9nyljs6zps0h4aesdjdtdlqckz4axmw9ud20vuhy9a36mdadqzemea4", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrZW9NM2xxZGpPZzMvdnVl\nQWhBR0F3UnFLM00xNTNiS0lvVlVOdkZwV2tzCkpGRjNsV20yaG9uTnBxVEttdkw5\na3h2WEJHVFVFQVdtYm0ybyttU3pJWGMKLS0tIDNwQTBvRWpVZGdiTmVVS1hlU205\nSngrWndLRmFZcGFDRGFlS3FpZEJwajQK+L333YTBA/PaHpGwf0skTjk0oz63Za5L\n3CpA03vczMhxPecL4MvKvSKpRu91E3JwQ393zXf3+tZf0rjoeD3i5w==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1npdh6er3ntzlw4c7suwaw04fw4kqg2xr3h5qhw2anst02j7kypaspwyfda", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYSk9SbmVQblBhYWdyZ1BG\nVDN0QXVPclFBRzUrN0xDU3JUbXJpT2ZlZ21jCmtROFdhaDFHbTZBK00rMzh5c21x\nN2hnOVIxeEJpN1dBekplT2hZN2VyalkKLS0tIEtZempQc3hiOUhBZzdqVG1LSEEx\nV0paSmdCeFpzQU5DWCt6RmloalFoejQKrizov+5Rd7+Vn1F/H6uFaC8Rpa9Ncj6e\nHfxk6oNaulKrD7bpApL6lVLrL7oy8UZpb/bX97zKO6e6ZaLVM/ju1w==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-04-17T15:26:55Z", diff --git a/nixos/secrets/cloudflare.json b/nixos/secrets/cloudflare.json index 7d6cacd..95f95cf 100644 --- a/nixos/secrets/cloudflare.json +++ b/nixos/secrets/cloudflare.json @@ -9,11 +9,11 @@ "age": [ { "recipient": "age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPalRZUUIzMnQxdUZYQ1ND\nR0NxY3ZnRWJJdGxMY1RJbFdHcFluektyeUV3ClBOZXR2UlVYUzFWOWptdERhSHRB\nb2U0Q05udzZNaUlZOTNKWFBuNGxXZFkKLS0tIHlVU09WSnI5UHVGTFlLVGxkb05Y\nWlRjZ1V5TzJYYXEyeEtIcFBWa245aFEKh+hwWXm0Edin1EMDjSDt8Fl4Wl6ATvh7\nGrVu4wEayKT7rK3NuTIkE8yelVBhcJBGv8s1wsx7R+dUFmvXq2B2kg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpSzBqMXM4SWhrR0I1eXVG\ncmJ2aGx5YmpWZ2VSNkg0NWlCd2U1ckM2UndJClF3bkdxZDZnWG0zSWJ0R0ZRMUY4\nOXkyditGUnpiNHBkaHd1R1huZDh5TzQKLS0tIDk1MmIvbXZXT3owUkkvcHAxK0Jj\nSXVLMk9pWG55cTV6WUJOZlQwdmM4alkKZyqY0Cr4BNmOWLNMD60PWbodYnCUmHa3\n2An1qI+hXHmtpod4UqzoI2ZfBajI2dhYCtkJh6pVB/vbOCWyhCh+Nw==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1snp9nyljs6zps0h4aesdjdtdlqckz4axmw9ud20vuhy9a36mdadqzemea4", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGVHNmaDM2UE83UWEwaHIv\nQWxwSDY2SGxtNkJTYjBJRHU4aU9WVURkNFNJCnc5TGp4VmlLUWR0NjdZeXN3Y3lU\nWm9mbG9rMmtFck5ncVpjc3laSnhOcjQKLS0tIHQwdGdhVXNFeVZUMDIwWEtsNHlG\ncjJPNEZPQXgyaTdEZ1huRGZGTy93YncK2RjRC5f4hj3LbpPEaRXbyfdV/YRPwLoe\nrcOF/F3qm5gTR7YIHnyGu/ACRQoFXPQKheGltg5AmHq2JeuyINrTRw==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1npdh6er3ntzlw4c7suwaw04fw4kqg2xr3h5qhw2anst02j7kypaspwyfda", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwalc2ck1CQXNCVG9nMUtH\nakNyV0ZFUDZXQ21PVGg5OTNEVjZYVHU1ZXhNCk9CZ1FHb1I1RG11L0JKR1U5Rm9r\nanFRQ3NhNkNLcU1UYTZ5ZkxtTVUxL2sKLS0tIDNPanRqcmZmOS9mY0hGNWtLbVZC\nQ1NRb0dJWmo5TEtvQkpHcE9ScjRVSDAKnw+5oTzg+GU81j+wBWz8ZNTawnnPj8BJ\nfwNKtsorqo3SQ+KOb/zL7o0lairkkUBP9R2vcrCwl9oacnGl+y8ZFg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-04-28T04:15:19Z",