From 281f6585e22873db78e9c78a264df846eaeee841 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 6 Feb 2019 00:49:11 +0100
Subject: [PATCH] Use gitfetch for cdarknet

---
 hosts/apollo/configuration.nix      | 6 ++----
 system/default.nix                  | 5 +----
 system/modules/cdarknet/default.nix | 1 -
 system/modules/cdarknet/hosts       | 1 -
 system/modules/cdarknet/nixdark     | 1 -
 5 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 120000 system/modules/cdarknet/default.nix
 delete mode 160000 system/modules/cdarknet/hosts
 delete mode 160000 system/modules/cdarknet/nixdark

diff --git a/hosts/apollo/configuration.nix b/hosts/apollo/configuration.nix
index 941c87bb..2cbc25da 100644
--- a/hosts/apollo/configuration.nix
+++ b/hosts/apollo/configuration.nix
@@ -111,12 +111,10 @@ services = {
 cdark_net = {
   enable = true;
   hostName = "${me.user}_${config.networking.hostName}";
-  ed25519PrivateKeyFile = builtins.toPath "/etc/nixos/hosts/${config.networking.hostName}/secret/tinc/ed25519_key.priv";
-  hostsDirectory = /etc/nixos/system/modules/cdarknet/hosts;
+  ed25519PrivateKeyFile = /etc/nixos/hosts + "/${config.networking.hostName}" + /secret/tinc/ed25519_key.priv;
+  hostsDirectory = (builtins.fetchGit "ssh://git@git.darmstadt.ccc.de/cdark.net/hosts");
   ip6address = "fd23:42:cda:4342::2";
   ip4address = "172.20.71.2";
 };
 
-
-
 }
diff --git a/system/default.nix b/system/default.nix
index 8218f308..6eb469f8 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,17 +1,14 @@
 { pkgs, config, lib, ... }:
 let
   me = config.m-0.private.me;
-  unstable = import <unstable> {};
 in {
-  # channel = 18.03
-
   imports = [
     <home-manager/nixos>
     ../common
     ./modules/laptop.nix
     ./modules/server
     ./modules/standalone
-    ./modules/cdarknet
+    "${builtins.fetchGit "ssh://git@git.darmstadt.ccc.de/cdark.net/nixdark"}/default.nix"
     ./modules/loginctl-linger.nix
   ];
 
diff --git a/system/modules/cdarknet/default.nix b/system/modules/cdarknet/default.nix
deleted file mode 120000
index 035431df..00000000
--- a/system/modules/cdarknet/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-nixdark/default.nix
\ No newline at end of file
diff --git a/system/modules/cdarknet/hosts b/system/modules/cdarknet/hosts
deleted file mode 160000
index 6a05b795..00000000
--- a/system/modules/cdarknet/hosts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6a05b795d7333f23212427501c6d9dfbe1b73170
diff --git a/system/modules/cdarknet/nixdark b/system/modules/cdarknet/nixdark
deleted file mode 160000
index 8f95a4a0..00000000
--- a/system/modules/cdarknet/nixdark
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8f95a4a050889afe687fceb6875fd0d4006630df