diff --git a/flake.nix b/flake.nix index 8ab8478..54bbf32 100644 --- a/flake.nix +++ b/flake.nix @@ -187,17 +187,17 @@ ./nixos/machines/${name}/configuration.nix # clan core configuration ({ pkgs, lib, ... }: { - imports = [ - # this magically adds all my machines in the zero tier network - # and makes the controller accept them. - # will automatic look into `/machines//facts/zerotier-ip - inputs.clan-core.clanModules.zerotier-static-peers - # Statically configure the host names of machines based on their respective zerotier-ip. - inputs.clan-core.clanModules.static-hosts - # generate ssh host keys with facts - # fixme: not working - # inputs.clan-core.clanModules.sshd - ]; + #imports = [ + # # this magically adds all my machines in the zero tier network + # # and makes the controller accept them. + # # will automatic look into `/machines//facts/zerotier-ip + # inputs.clan-core.clanModules.zerotier-static-peers + # # Statically configure the host names of machines based on their respective zerotier-ip. + # inputs.clan-core.clanModules.static-hosts + # # generate ssh host keys with facts + # # fixme: not working + # # inputs.clan-core.clanModules.sshd + #]; documentation.nixos.enable = true; clan.static-hosts.topLevelDomain = "bear"; #clan.static-hosts.excludeHosts = lib.mkForce [ ]; @@ -340,7 +340,8 @@ cream = clanSetup { name = "cream"; - host = "cream.bear"; + host = "cream"; + #host = "cream.bear"; modules = [ nixos-hardware.nixosModules.framework-12th-gen-intel retiolum.nixosModules.retiolum @@ -361,7 +362,8 @@ cherry = clanSetup { name = "cherry"; - host = "cherry.bear"; + #host = "cherry.bear"; + host = "cherry"; modules = [ nixos-hardware.nixosModules.framework-13th-gen-intel homeManagerModules @@ -383,12 +385,12 @@ #host = "chungus.bear"; host = "chungus"; modules = [ - { - clan.networking.zerotier.controller = { - enable = true; - public = false; - }; - } + #{ + # clan.networking.zerotier.controller = { + # enable = true; + # public = false; + # }; + #} homeManagerModules stylixModules retiolum.nixosModules.retiolum @@ -407,8 +409,8 @@ orbi = clanSetup { name = "orbi"; - host = "orbi.bear"; - #host = "95.216.66.212"; + #host = "orbi.bear"; + host = "95.216.66.212"; modules = [ homeManagerModules stylixModules diff --git a/machines/cherry/facts/zerotier-ip b/machines/cherry/facts/zerotier-ip deleted file mode 100644 index 5948fb4..0000000 --- a/machines/cherry/facts/zerotier-ip +++ /dev/null @@ -1 +0,0 @@ -fd65:4539:2a1:a471:7399:93bf:1d33:afd2 \ No newline at end of file diff --git a/machines/chungus/facts/zerotier-ip b/machines/chungus/facts/zerotier-ip deleted file mode 100644 index 096220c..0000000 --- a/machines/chungus/facts/zerotier-ip +++ /dev/null @@ -1 +0,0 @@ -fd65:4539:2a1:a471:7399:9365:4539:2a1 \ No newline at end of file diff --git a/machines/chungus/facts/zerotier-network-id b/machines/chungus/facts/zerotier-network-id deleted file mode 100644 index 70d8e94..0000000 --- a/machines/chungus/facts/zerotier-network-id +++ /dev/null @@ -1 +0,0 @@ -65453902a1a47173 \ No newline at end of file diff --git a/machines/cream/facts/zerotier-ip b/machines/cream/facts/zerotier-ip deleted file mode 100644 index f00f01a..0000000 --- a/machines/cream/facts/zerotier-ip +++ /dev/null @@ -1 +0,0 @@ -fd65:4539:2a1:a471:7399:93a9:d67:5e1c \ No newline at end of file diff --git a/machines/orbi/facts/zerotier-ip b/machines/orbi/facts/zerotier-ip deleted file mode 100644 index 989ae73..0000000 --- a/machines/orbi/facts/zerotier-ip +++ /dev/null @@ -1 +0,0 @@ -fd65:4539:2a1:a471:7399:9336:d19f:30f5 \ No newline at end of file diff --git a/machines/sternchen/facts/zerotier-ip b/machines/sternchen/facts/zerotier-ip deleted file mode 100644 index 281e2df..0000000 --- a/machines/sternchen/facts/zerotier-ip +++ /dev/null @@ -1 +0,0 @@ -fd65:4539:2a1:a471:7399:93af:55f:b379 \ No newline at end of file