From 611dabf6530fb0231bfb48dc1866309836aa05c1 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 19 Jun 2020 18:20:10 +0200
Subject: [PATCH] server7: move yggaddr.nix out to shared lib/ directory

---
 hosts/server7/containers/outer-defaults.nix          | 2 +-
 hosts/server7/default.nix                            | 2 +-
 hosts/server7/yggdrasil-prefix.nix                   | 2 +-
 lib/default.nix                                      | 2 +-
 hosts/server7/yggaddr.nix => lib/server7-yggaddr.nix | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename hosts/server7/yggaddr.nix => lib/server7-yggaddr.nix (100%)

diff --git a/hosts/server7/containers/outer-defaults.nix b/hosts/server7/containers/outer-defaults.nix
index 680bec38..f168c4f4 100644
--- a/hosts/server7/containers/outer-defaults.nix
+++ b/hosts/server7/containers/outer-defaults.nix
@@ -1,6 +1,6 @@
 name:
 
-let yggaddr = import ../yggaddr.nix;
+let yggaddr = import ../../../lib/server7-yggaddr.nix;
 in {
   # These the container defaults from the perspective of the host.
 
diff --git a/hosts/server7/default.nix b/hosts/server7/default.nix
index c04ad2de..267b409c 100644
--- a/hosts/server7/default.nix
+++ b/hosts/server7/default.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-let yggaddr = import ./yggaddr.nix;
+let yggaddr = import ../../lib/server7-yggaddr.nix;
 in {
   imports = [
     # <nixpkgs/nixos/modules/profiles/minimal.nix>
diff --git a/hosts/server7/yggdrasil-prefix.nix b/hosts/server7/yggdrasil-prefix.nix
index 349b7811..9d1e0415 100644
--- a/hosts/server7/yggdrasil-prefix.nix
+++ b/hosts/server7/yggdrasil-prefix.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-let yggaddr = import ./yggaddr.nix;
+let yggaddr = import ../../lib/server7-yggaddr.nix;
 in {
   boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
 
diff --git a/lib/default.nix b/lib/default.nix
index 0ee90201..9724d75a 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -8,7 +8,7 @@ let
   hqPrefix64 = "fd23:42:c3d2:523";
   # TODO: Is this stable? Is there a better place to specifiy this?
 
-  server7Ygg = import ../hosts/server7/yggaddr.nix;
+  server7Ygg = import ./server7-yggaddr.nix;
 
   # Generate a deterministic IPv6 address for a 64 bit prefix
   # and seed string. Prefix must not contain trailing ':'.
diff --git a/hosts/server7/yggaddr.nix b/lib/server7-yggaddr.nix
similarity index 100%
rename from hosts/server7/yggaddr.nix
rename to lib/server7-yggaddr.nix