diff options
-rw-r--r-- | custom/tinc/yggdrasil.nix | 2 | ||||
-rw-r--r-- | ymir.nix | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix index f17d9b4e..4c19e0e7 100644 --- a/custom/tinc/yggdrasil.nix +++ b/custom/tinc/yggdrasil.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { pkgs, name, ip }: | 1 | { config, pkgs, name, ip }: |
2 | 2 | ||
3 | { | 3 | { |
4 | config.services.tinc = { | 4 | config.services.tinc = { |
@@ -19,6 +19,10 @@ in { | |||
19 | ./ymir-hw.nix | 19 | ./ymir-hw.nix |
20 | ./custom/zsh.nix | 20 | ./custom/zsh.nix |
21 | ./users.nix | 21 | ./users.nix |
22 | ((import ./custom/tinc.nix) { | ||
23 | name = "ymir"; | ||
24 | ip = {}; | ||
25 | }) | ||
22 | ]; | 26 | ]; |
23 | 27 | ||
24 | boot.loader.grub = { | 28 | boot.loader.grub = { |
@@ -140,12 +144,4 @@ in { | |||
140 | members = [ "gkleen" | 144 | members = [ "gkleen" |
141 | ]; | 145 | ]; |
142 | }; | 146 | }; |
143 | } // ((import ./custom/tinc/yggdrasil.nix) { | 147 | } |
144 | inherit pkgs; | ||
145 | name = "ymir"; | ||
146 | ip = { | ||
147 | ip4 = [ | ||
148 | { address = "10.141.4.1"; prefixLength = 16; } | ||
149 | ]; | ||
150 | }; | ||
151 | }) | ||