diff --git a/nixos/.sops.yaml b/nixos/.sops.yaml index 0ddf821..815e8b9 100644 --- a/nixos/.sops.yaml +++ b/nixos/.sops.yaml @@ -1,7 +1,7 @@ keys: hosts: - &laptop age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v - - &nixos-homelab-00 age1nxqlqldr5pmcxjpdl99ntzx42aclflmesx73qvs9czewzh9k8elsj3skt9 + - &nixos-homelab-00 age1zatrq2gra0p2qfuhn3efe4ykk3ch69sa4g5mp8gd77u3j0z5madsrcn7fm creation_rules: - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ key_groups: @@ -13,3 +13,8 @@ creation_rules: - *nixos-homelab-00 - *nixos-homelab-00 - *nixos-homelab-00 + - *nixos-homelab-00 + - *nixos-homelab-00 + - *nixos-homelab-00 + - *nixos-homelab-00 + - *nixos-homelab-00 diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 8cc7927..58f8589 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -66,7 +66,7 @@ services.tests-service = { enable = true; port = 8080; - nginx = { + default-nginx = { enable = true; hostname = "test.roypository.com"; }; @@ -101,7 +101,7 @@ interfaces.eth0.ipv4.addresses = [ { - adress = config.ipAddrs.${meta.hostname}; + address = config.ipAddrs.${meta.hostname}; prefixLength = 24; } ]; diff --git a/nixos/flake.lock b/nixos/flake.lock index 1234e86..4d72dec 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -160,16 +160,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748421225, - "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -182,11 +182,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748564405, - "narHash": "sha256-uCmQLJmdg0gKWBs+vhNmS9RIPJW8/ddo6TvQ/a4gupc=", + "lastModified": 1748639243, + "narHash": "sha256-ICAAEp++1evOodQCHDnKc+Gs28SvE6cIAHwlM581u/4=", "owner": "nix-community", "repo": "nixvim", - "rev": "8b3a69cfea5ba2fa008c6c57ab79c99c513a349b", + "rev": "6c456efc96f60213019460046d07f5691e0fafa3", "type": "github" }, "original": { @@ -315,11 +315,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1748833284, - "narHash": "sha256-FM9LIsGBx9lYjggcUy8jgh3vJ79+DQGDNYoSBINe3L8=", + "lastModified": 1748878963, + "narHash": "sha256-5TXHYFkUCiqDzRXrV5rURr+syqbSuW6AiI+wco9JG3M=", "owner": "RoyDumblauskas", "repo": "tests-service", - "rev": "7dbf79ace0d0bdd03a9a71e72439ae71ff0bbde6", + "rev": "f3ccaaa26778960fe595d4078423ed87ffcc64c9", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index 399dc5f..aa4a299 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -52,7 +52,7 @@ sops-nix.nixosModules.sops quasiSecrets.nixosModules.ipAddrs quasiSecrets.nixosModules.serviceList - tests-service.nixosModules."x86_64-linux" + tests-service.nixosModules.default home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/nixos/secrets/build.json b/nixos/secrets/build.json index 0501a2b..5aca2eb 100644 --- a/nixos/secrets/build.json +++ b/nixos/secrets/build.json @@ -8,11 +8,11 @@ "age": [ { "recipient": "age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzWUxvOEtwNkhodDdsWFoz\ndytudERqT3hKaWJITmExOGZleU4yc1U5RTJzClh5UHdhMDhIbXB6WEFKNC9IZWx6\nbXE0YVZzMUdCSDc1OUI3ZGNmbDFBTGcKLS0tIDRySGc3YkVVckJVZmtUbUduSUtQ\nSFUvUTJ0MU9sVXJ5Mnh1WWp3TTdZV1EKZ8qea9sub3I0vxIzMYVCqalYE9XdBOV7\ng/ITnSr4uKraz0X5xFMno5pR0ab43NWeyPfABwzoh+zBnlQMUgusQA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVTFg0ZUl4V0JURG1rSzRZ\nYVk5dW5kcHFjU1Z0K1pmWUc1U0NJVzZKLzJnCmsxS3czNkFmRWNDRjdDV0hRZU5n\nUXUzUnJxeHBDN0lqb2hoVzJGUnJRemcKLS0tIEFzaDlKeGw5OW1YT21aT0pIaVpC\neVhudmtLcEtaMjJTRzA4a3NlWllFSU0Ker+UjfXVseN2xVBoCWtjXqCPR3vxM5BY\n6KiQcnpafQOlV3lyz/bAvaObd6K4THr0bhcu5kFfC1JvMxcQ+0Aejw==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1nxqlqldr5pmcxjpdl99ntzx42aclflmesx73qvs9czewzh9k8elsj3skt9", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4SnlWTGJ0WnZNYjlLUDZk\nZWo3ajlGNFhacm11bmJRSzNzU0lkNk4xTzBNCk1GUlBNZWNCWnhFVHc1aUhDTjFL\nUU5FUTU5TkZOVFRpRlp6ZHhXeitIWVkKLS0tIEovQjRPMVZKVDNvU2tQUlZwTjFD\nWXdBOXNNQm91N0tZdTc2QVBXTXhIZHMK6uxSjyenaObLyLNDXjn2IwCid1Gh48+m\nofB2b9a/nOj4fq8Gz0qvdpfjX/uv1YLFe/8qEW3Vwk9uuuQouL7HVw==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1zatrq2gra0p2qfuhn3efe4ykk3ch69sa4g5mp8gd77u3j0z5madsrcn7fm", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHbmMyeE94UkNaeWRHTGlk\nYnRUSnRPQTU1TklpK2N6T2VJSkM2M0N2OVNJCjJQRzhSOVE1czdHWEovOEcveC9H\nNGhlZGY1clFici90RFQ4blhiTEpQUWcKLS0tIElYWW9WNFZVWjlJc3JFNStxUjdx\nRkJTbGFUb1pGSVlKWXF5MXBYTU1BODQKTvamyOCxdujxdvs0ltxAez9i3jwlGHdb\neQW784QCm1W/7kVn4afrrmj6kAP5u98j5wMMUhs1hwDtaNIvNzSZHg==\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 148a5f0..6061d7b 100644 --- a/nixos/secrets/cloudflare.json +++ b/nixos/secrets/cloudflare.json @@ -9,11 +9,11 @@ "age": [ { "recipient": "age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFMHFVc2dHRzRuOGhJWGJF\nZTUrWFFzeDFudDV4OHJQQUlFV1pnWTU1dmdnCnp0OFBGbWk0Yy9MREZ0TWRwMWRx\nNGlWUmdaN2k2S0FjUWk1MjdTdXFIa1EKLS0tICtFb2VTaE5GN3I3ZkhRR0t5R09a\nR3paVzUrNm5odnBrT1REM2V2ckF4WXMKuWoAfnIi5WoGSSDvKdl9fP9IYDp+wCeY\ntM9gUl2/1QcA3HG7mReaX8OqXnPF+wAIjPwvjxW4wLsM3oysxsgPIA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzeVhnYnFyMzMxWEV5d3JU\nRE1UZEZURklxTWtHeEdJVVpoOXVLcERRZVhRCll5TFViMTJVNEpYNXR0ZVkyTTRJ\nZ3N4YWg2cGNtR2psU2xlWFhMYnhqWEEKLS0tIFJnVWkwM1dqWWEwQVpYYXFUYmFQ\nMlo3REYrMW5QaFkzS2NKQ2Y1SnBvU3MKKWtkZaWwAwfHtmXccOlAFTgPYlYfJFyJ\nSQ6VtD6kjY3M99uq6qM0P9sT2eiA9twHQ4peipb3Ca4WWKaqNY5gkA==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1nxqlqldr5pmcxjpdl99ntzx42aclflmesx73qvs9czewzh9k8elsj3skt9", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFRjU5a3VCTUt5dW9yWE9j\ncnM2cDNnRVNycG0va2VidzAwOFlmcE5uNnpRCi9MeWIvS3V4NDd4T1Z5ZGlFVGlH\nM2w0bVFGYXMxQUh1bktETXI5VW1IZ00KLS0tIFpBb2pFUzBiRHFpVDR1V3JBY09R\nRDVhTFBXT0pBYkpxOE9EUTNBd012TEkKW+eCIeM6+PthWtqiYgRr6pL1qMk6nnPq\nU/k6xFWOEMw4hhW3WETePbN8Qlochw3XjjkawyDqi3Sl/nmJJR3MBw==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1zatrq2gra0p2qfuhn3efe4ykk3ch69sa4g5mp8gd77u3j0z5madsrcn7fm", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYOXRZUjNPNGhoTmIyTjdR\nLy9zQms5UEsrTVppc1U4WWp0RmVvRGxnRHdZClQrNDVZQ2JFdktqelhNdU9tamZO\nbm0vUUx5WjFQUXBpK1lIRlNRaGhibkUKLS0tIFdVNkxPMnhOR2c3cnJaUXQyTHdU\nRExsaXVES2toTlo1N0ZURjBXME9yZTgKBi07x1+pbco2bBFLfkJd2R/d/xx3yCQ4\nHtPKA+YiA099Df+PScSorbgpEnP6wXST/l0QCZK06lk1A0Men3t8ig==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-04-28T04:15:19Z",