diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-11-03 22:32:42 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-11-03 22:32:42 +0100 |
commit | f95ed850e13e43743571d917d9f7fbc1de5037f6 (patch) | |
tree | 2e95189537c8ead227bbf53086afc41199421033 /ymir.nix | |
parent | cee44dac3c73114bd10b7236e95ef288a0939582 (diff) | |
download | nixos-f95ed850e13e43743571d917d9f7fbc1de5037f6.tar nixos-f95ed850e13e43743571d917d9f7fbc1de5037f6.tar.gz nixos-f95ed850e13e43743571d917d9f7fbc1de5037f6.tar.bz2 nixos-f95ed850e13e43743571d917d9f7fbc1de5037f6.tar.xz nixos-f95ed850e13e43743571d917d9f7fbc1de5037f6.zip |
syntax poking
Diffstat (limited to 'ymir.nix')
-rw-r--r-- | ymir.nix | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -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 | }) | ||