From d9d4af195d78d20bd7d7970df7796ee7a1b29254 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 8 Feb 2018 23:32:59 +0100
Subject: [PATCH] Repariere leichte config probleme

---
 home/hosts/charon.nix                 | 2 +-
 system/hosts/apollo/configuration.nix | 6 +++---
 system/hosts/charon/configuration.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/home/hosts/charon.nix b/home/hosts/charon.nix
index 644c9817..aea78085 100644
--- a/home/hosts/charon.nix
+++ b/home/hosts/charon.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 let
   unstable = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {};
-  habitask = with pkgs; with unstable.rustPlatform; buildRustPackage rec {
+  habitask = with pkgs; with rustPlatform; buildRustPackage rec {
      name = "habitask";
      version = "0.1.0";
      src = ~/data/aktuell/it/code/habitask;
diff --git a/system/hosts/apollo/configuration.nix b/system/hosts/apollo/configuration.nix
index aa27c754..bd249b23 100644
--- a/system/hosts/apollo/configuration.nix
+++ b/system/hosts/apollo/configuration.nix
@@ -11,8 +11,8 @@ i18n.consoleKeyMap = "neo";
 
 imports = [
    ./hardware-configuration.nix
-   ../modules/cdarknet
-   ../snippets/common.nix
+   ../../modules/cdarknet
+   ../../snippets/common.nix
 ];
 
 # Use the systemd-boot EFI boot loader.
@@ -40,7 +40,7 @@ cdark_net = {
   enable = true;
   hostName = "maralorn_apollo";
   ed25519PrivateKeyFile = /etc/nixos/local/tinc/ed25519_key.priv;
-  hostsDirectory = /etc/nixos/config/cdarknet/hosts;
+  hostsDirectory = /etc/nixos/config/modules/cdarknet/hosts;
   ip6address = "fd23:42:cda:4342::2";
   ip4address = "172.20.71.2";
 };
diff --git a/system/hosts/charon/configuration.nix b/system/hosts/charon/configuration.nix
index 15d08456..52cbd10b 100644
--- a/system/hosts/charon/configuration.nix
+++ b/system/hosts/charon/configuration.nix
@@ -23,8 +23,8 @@ in
 
   imports = [
     ./hardware-configuration.nix
-    ../snippets/common.nix
-    ../snippets/init_ssh.nix
+    ../../snippets/common.nix
+    ../../snippets/init_ssh.nix
     /etc/nixos/local/config.nix
   ];