diff --git a/flake.lock b/flake.lock index 412affc..b4bd684 100644 --- a/flake.lock +++ b/flake.lock @@ -129,11 +129,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1717591022, - "narHash": "sha256-gFdQoSIsj/mWtWMtlDjCfpHKCkkpiG4+EQ/fkDxA/aw=", + "lastModified": 1717601577, + "narHash": "sha256-8SOl2Ja43zOqX6dF2qj89Y8ZitO1XzrkvPY+65iYqwM=", "ref": "refs/heads/main", - "rev": "5ef170020d0db4bc1c4496f9b1d4a56cfdc9920d", - "revCount": 3036, + "rev": "764b53275fd5019f8ccd0d09f30cdacf99ee2c80", + "revCount": 3038, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, diff --git a/flake.nix b/flake.nix index f76cf16..b5d7dd0 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 [ ]; @@ -385,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 diff --git a/machines/cherry/facts/zerotier-ip b/machines/cherry/facts/zerotier-ip deleted file mode 100644 index 1993cf4..0000000 --- a/machines/cherry/facts/zerotier-ip +++ /dev/null @@ -1 +0,0 @@ -fd57:360d:35fa:969f:3c99:939a:ff50:1127 \ 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 f2266aa..0000000 --- a/machines/chungus/facts/zerotier-ip +++ /dev/null @@ -1 +0,0 @@ -fd16:b4e:cf13:87eb:6699:9316:b4e:cf13 \ 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 bbff88b..0000000 --- a/machines/chungus/facts/zerotier-network-id +++ /dev/null @@ -1 +0,0 @@ -160b4ecf1387eb66 \ 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 2625491..0000000 --- a/machines/cream/facts/zerotier-ip +++ /dev/null @@ -1 +0,0 @@ -fd57:360d:35fa:969f:3c99:9358:4f46:814a \ 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 b08cc59..0000000 --- a/machines/orbi/facts/zerotier-ip +++ /dev/null @@ -1 +0,0 @@ -fd20:764d:2397:f223:cb99:9320:764d:2397 \ No newline at end of file diff --git a/machines/orbi/facts/zerotier-network-id b/machines/orbi/facts/zerotier-network-id deleted file mode 100644 index da7b2b0..0000000 --- a/machines/orbi/facts/zerotier-network-id +++ /dev/null @@ -1 +0,0 @@ -20764d2397f223cb \ No newline at end of file