diff --git a/flake.nix b/flake.nix index 4f09c4b..8ab8478 100644 --- a/flake.nix +++ b/flake.nix @@ -221,6 +221,7 @@ ./nixos/assets/ssh/palo_rsa.pub # backup key "${config.clanCore.clanDir}/machines/chungus/facts/ssh.syncoid.id_ed25519.pub" + "${config.clanCore.clanDir}/machines/chungus/facts/ssh.rbackup.id_ed25519.pub" ]; }) # configure nix @@ -340,7 +341,6 @@ cream = clanSetup { name = "cream"; host = "cream.bear"; - #host = "cream.private"; modules = [ nixos-hardware.nixosModules.framework-12th-gen-intel retiolum.nixosModules.retiolum @@ -361,9 +361,7 @@ cherry = clanSetup { name = "cherry"; - #host = "cherry"; host = "cherry.bear"; - #host = "cherry.private"; modules = [ nixos-hardware.nixosModules.framework-13th-gen-intel homeManagerModules @@ -382,9 +380,15 @@ chungus = clanSetup { name = "chungus"; - host = "chungus.bear"; - #host = "chungus.private"; + #host = "chungus.bear"; + host = "chungus"; modules = [ + { + clan.networking.zerotier.controller = { + enable = true; + public = false; + }; + } homeManagerModules stylixModules retiolum.nixosModules.retiolum @@ -404,15 +408,8 @@ orbi = clanSetup { name = "orbi"; host = "orbi.bear"; - #host = "orbi.private"; #host = "95.216.66.212"; modules = [ - { - clan.networking.zerotier.controller = { - enable = true; - public = false; - }; - } homeManagerModules stylixModules srvos.nixosModules.hardware-hetzner-online-intel diff --git a/machines/orbi/facts/zerotier-network-id b/machines/orbi/facts/zerotier-network-id deleted file mode 100644 index f795998..0000000 --- a/machines/orbi/facts/zerotier-network-id +++ /dev/null @@ -1 +0,0 @@ -19b35f6061699737 \ No newline at end of file diff --git a/nixos/components/network/syncthing.nix b/nixos/components/network/syncthing.nix index 60ec0bd..eaae9d0 100644 --- a/nixos/components/network/syncthing.nix +++ b/nixos/components/network/syncthing.nix @@ -24,6 +24,7 @@ with lib; { }; services.syncthing = { + enable = lib.mkForce false; guiAddress = lib.mkDefault "${config.networking.hostName}.${ config.clan.static-hosts.topLevelDomain }:8384"; overrideDevices = lib.mkDefault true; key = "/run/facts/syncthing.key";