diff --git a/.sops.yaml b/.sops.yaml index 79be027..930d112 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -19,7 +19,6 @@ keys: - &traffic-stop-box-6 age1sgd9lvwgda2rgmhfxkve5u3ljdgjcrs79a2juq766jkvz23v34usgt039z # aachen - &traffic-stop-box-7 age1z5n0seu0qpt3y86gmz92mnmts0x8jd0a646e9ld2x5dqvvu5kgzsu93um4 - # - &mobile-box creation_rules: - path_regex: secrets/[^/]+\.yaml$ key_groups: diff --git a/flake.lock b/flake.lock index 07cae53..94471cf 100644 --- a/flake.lock +++ b/flake.lock @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1663358099, - "narHash": "sha256-4OV2rrWjNZYbdnserDPhlKndtkXQTkYornegO5eebcM=", + "lastModified": 1664236652, + "narHash": "sha256-OGvtPSD3R1uikYw48WUoLhE/aYKnj0UZ/IZVFMQFmPI=", "owner": "astro", "repo": "microvm.nix", - "rev": "b6613bbdb0f8ba2c7a00e1c7a561366b760ac51f", + "rev": "617b260f27c72c046b0160be2872275e9f384784", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1663587673, - "narHash": "sha256-4C4R/PV8+HjkgVd1Db8AuvHwhQp5vllVqOQEl6YDh3o=", + "lastModified": 1664178928, + "narHash": "sha256-+WVCZH/3Ifef4Da9N1tkGnmfX0QwtkJQz013QuImu10=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20dc478985d6545df53f0153f4af125eb014083d", + "rev": "b542cc75fa03a3a29350d4c3b69739e946268a93", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1663433994, - "narHash": "sha256-Bpthhv1PdZRrIFct8KbHACNvOu9bsYAMEaqoH83cvqM=", + "lastModified": 1664201777, + "narHash": "sha256-cUW9DqELUNi1jNMwVSbfq4yl5YGyOfeu+UHUUImbby0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17989edb05615c4f61803b9c427d80b84c289c6b", + "rev": "00f877f4927b6f7d7b75731b5a1e2ae7324eaf14", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1663475375, - "narHash": "sha256-uIhMyLFkU8Tp0uxLd7tKn++G/yHsB9r7YRvsBdoGvsk=", + "lastModified": 1664204020, + "narHash": "sha256-LAey3hr8b9EAt3n304Wt9Vm4uQFd8pSRtLX8leuYFDs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "bae718a9d1e31ec478ddfcb75149f66e9625a825", + "rev": "912f9ff41fd9353dec1f783170793699789fe9aa", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 10607be..60aef38 100644 --- a/flake.nix +++ b/flake.nix @@ -146,7 +146,7 @@ dump-dvb.nixosModules.disk-module { services.openssh.extraConfig = '' - PubkeyAcceptedKeyTypes sk-ecdsa-sha2-nistp256@openssh.com,sk-ssh-ed25519@openssh.com + PubkeyAcceptedKeyTypes sk-ecdsa-sha2-nistp256@openssh.com,sk-ssh-ed25519@openssh.com,ssh-ed25519,ssh-rsa,rsa-sha2-256,rsa-sha2-512 ''; users.users.root.openssh.authorizedKeys.keys = [ "sk-ssh-ed25519@openssh.com aaaagnnrlxnzac1lzdi1nte5qg9wzw5zc2guy29taaaaili3ylty7fwvohtwx8511v+gbtlzzmuv505fi1pj53v6aaaabhnzado=" @@ -163,7 +163,7 @@ dump-dvb.nixosModules.disk-module { services.openssh.extraConfig = '' - PubkeyAcceptedKeyTypes sk-ecdsa-sha2-nistp256@openssh.com,sk-ssh-ed25519@openssh.com + PubkeyAcceptedKeyTypes sk-ecdsa-sha2-nistp256@openssh.com,sk-ssh-ed25519@openssh.com,ssh-ed25519,ssh-rsa,rsa-sha2-256,rsa-sha2-512 ''; users.users.root.openssh.authorizedKeys.keys = [ "sk-ssh-ed25519@openssh.com aaaagnnrlxnzac1lzdi1nte5qg9wzw5zc2guy29taaaaili3ylty7fwvohtwx8511v+gbtlzzmuv505fi1pj53v6aaaabhnzado=" @@ -186,6 +186,7 @@ mobile-box-dresden-disk = self.nixosConfigurations.mobile-box-dresden.config.system.build.diskImage; mobile-box-muenster-vm = self.nixosConfigurations.mobile-box-muenster.config.system.build.vm; mobile-box-muenster-disk = self.nixosConfigurations.mobile-box-muenster.config.system.build.diskImage; + traffic-stop-box-7 = self.nixosConfigurations.traffic-stop-box-7.config.system.build.diskImage; staging-microvm = self.nixosConfigurations.staging-data-hoarder.config.microvm.declaredRunner; data-hoarder-microvm = self.nixosConfigurations.data-hoarder.config.microvm.declaredRunner; docs = pkgs.callPackage ./pkgs/documentation.nix {