diff --git a/nixos/components/network/sshd/known-hosts-private.nix b/nixos/components/network/sshd/known-hosts-private.nix index e56af94..804e1b0 100644 --- a/nixos/components/network/sshd/known-hosts-private.nix +++ b/nixos/components/network/sshd/known-hosts-private.nix @@ -46,6 +46,13 @@ ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJPlva+Vdj8WmQPlbQLN3qicMz5AAsyTzK53BincxtAz"; }; + "bobi.private" = { + hostNames = [ + "bobi.private" + config.module.cluster.services.tinc.private.hosts.bobi.tincIp + ]; + publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK0haepNVEaocfWh6kwVc4QsSg2iqO5k+hjarphBqMVk"; + }; "mobi.private" = { hostNames = [ "mobi.private" diff --git a/nixos/machines/mobi/configuration.nix b/nixos/machines/mobi/configuration.nix index e4e5e1d..03fae34 100644 --- a/nixos/machines/mobi/configuration.nix +++ b/nixos/machines/mobi/configuration.nix @@ -64,7 +64,7 @@ ''; services.openssh.enable = true; - desktop.ssh.onlyTinc = false; + component.network.sshd.onlyTincAccess = false; users.users.root.openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6uza62+Go9sBFs3XZE2OkugBv9PJ7Yv8ebCskE5WYPcahMZIKkQw+zkGI8EGzOPJhQEv2xk+XBf2VOzj0Fto4nh8X5+Llb1nM+YxQPk1SVlwbNAlhh24L1w2vKtBtMy277MF4EP+caGceYP6gki5+DzlPUSdFSAEFFWgN1WPkiyUii15Xi3QuCMR8F18dbwVUYbT11vwNhdiAXWphrQG+yPguALBGR+21JM6fffOln3BhoDUp2poVc5Qe2EBuUbRUV3/fOU4HwWVKZ7KCFvLZBSVFutXCj5HuNWJ5T3RuuxJSmY5lYuFZx9gD+n+DAEJt30iXWcaJlmUqQB5awcB1S2d9pJ141V4vjiCMKUJHIdspFrI23rFNYD9k2ZXDA8VOnQE33BzmgF9xOVh6qr4G0oEpsNqJoKybVTUeSyl4+ifzdQANouvySgLJV/pcqaxX1srSDIUlcM2vDMWAs3ryCa0aAlmAVZIHgRhh6wa+IXW8gIYt+5biPWUuihJ4zGBEwkyVXXf2xsecMWCAGPWPDL0/fBfY9krNfC5M2sqxey2ShFIq+R/wMdaI7yVjUCF2QIUNiIdFbJL6bDrDyHnEXJJN+rAo23jUoTZZRv7Jq3DB/A5H7a73VCcblZyUmwMSlpg3wos7pdw5Ctta3zQPoxoAKGS1uZ+yTeZbPMmdbw== contact@ingolf-wagner.de" ]; diff --git a/nixos/machines/sterni/packages.nix b/nixos/machines/sterni/packages.nix index 079e470..db82d57 100644 --- a/nixos/machines/sterni/packages.nix +++ b/nixos/machines/sterni/packages.nix @@ -74,7 +74,7 @@ in #fractal mirage-im - #tor-browser-bundle-bin + tor-browser-bundle-bin #(tor-browser-bundle-bin.overrideAttrs (old: rec { # version = "11.0.1"; # name = "tor-browser-bundle-${version}"; diff --git a/nixos/system/all/syncthing.nix b/nixos/system/all/syncthing.nix index 94b00ce..f6d34c8 100644 --- a/nixos/system/all/syncthing.nix +++ b/nixos/system/all/syncthing.nix @@ -26,6 +26,7 @@ with lib; { // (device "pepe" "SZLXFW3-VTAC7UB-V2Z7CHE-3VZAYPL-6D72AK6-OCDMPZP-G4FPY5P-FL6ZVAG") // (device "sterni" "ZFNNKPD-ZSOAYJQ-VROXXDB-5MD3UTJ-GDCNTSQ-G5POVV3-UZG5HFT-CCAU3AD") // (device "mobi" "NGI7UN6-MR2YPYI-L7DGN3I-JFZU2N3-RJBJV6K-2VZVQSJ-PWLZYOK-PXZYRAF") + // (device "bobi" "FOJ3D27-W5OJMQR-7S77A3V-AS5BCG2-CIGWVMP-UBSVQNN-QZLHAIZ-IO7GKAE") // { bumba = { name = "windows-bumba"; @@ -47,7 +48,7 @@ with lib; { private = { enable = lib.mkDefault false; watch = lib.mkDefault false; - devices = [ "pepe" "sterni" "mobi" ]; + devices = [ "pepe" "sterni" "mobi" "bobi" ]; versioning = { type = "simple"; params.keep = "10"; @@ -56,7 +57,7 @@ with lib; { password-store = { enable = lib.mkDefault false; watch = lib.mkDefault false; - devices = [ "pepe" "sterni" "mobi" ]; + devices = [ "pepe" "sterni" "mobi" "bobi" ]; versioning = { type = "simple"; params.keep = "10"; @@ -65,12 +66,12 @@ with lib; { desktop = { enable = lib.mkDefault false; watch = lib.mkDefault false; - devices = [ "pepe" "sterni" "mobi" ]; + devices = [ "pepe" "sterni" "mobi" "bobi" ]; }; finance = { enable = lib.mkDefault false; watch = lib.mkDefault false; - devices = [ "pepe" "sterni" "mobi" ]; + devices = [ "pepe" "sterni" "mobi" "bobi" ]; versioning = { type = "simple"; params.keep = "10";