From 0cc302ce6a88e5f5f4700ecfcd604e91f331ba20 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Thu, 2 Feb 2017 17:15:17 +0100
Subject: [PATCH] move files out of subdirs

---
 frumar/configuration.nix => logical/frumar.nix                  | 2 +-
 pennyworth/configuration.nix => logical/pennyworth.nix          | 2 +-
 woodhouse/configuration.nix => logical/woodhouse.nix            | 2 +-
 frumar/hardware-configuration.nix => physical/frumar.nix        | 0
 .../hardware-configuration.nix => physical/pennyworth.nix       | 0
 woodhouse/hardware-configuration.nix => physical/woodhouse.nix  | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename frumar/configuration.nix => logical/frumar.nix (96%)
 rename pennyworth/configuration.nix => logical/pennyworth.nix (97%)
 rename woodhouse/configuration.nix => logical/woodhouse.nix (98%)
 rename frumar/hardware-configuration.nix => physical/frumar.nix (100%)
 rename pennyworth/hardware-configuration.nix => physical/pennyworth.nix (100%)
 rename woodhouse/hardware-configuration.nix => physical/woodhouse.nix (100%)

diff --git a/frumar/configuration.nix b/logical/frumar.nix
similarity index 96%
rename from frumar/configuration.nix
rename to logical/frumar.nix
index 7da4f79..fac885c 100644
--- a/frumar/configuration.nix
+++ b/logical/frumar.nix
@@ -10,7 +10,7 @@ in
 {
   imports =
     [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
+      ../psysical/frumar.nix
       ../roles/common.nix
      ../modules/nginx.nix
       ../modules/gogs.nix # todo: better separation here
diff --git a/pennyworth/configuration.nix b/logical/pennyworth.nix
similarity index 97%
rename from pennyworth/configuration.nix
rename to logical/pennyworth.nix
index 3e142c7..c392ca2 100644
--- a/pennyworth/configuration.nix
+++ b/logical/pennyworth.nix
@@ -13,7 +13,7 @@ let
 in
 {
   imports = [
-      ./hardware-configuration.nix
+      ../physical/pennyworth.nix
       ../roles/common.nix
       ../roles/collectd.nix
       ../roles/graphs.nix
diff --git a/woodhouse/configuration.nix b/logical/woodhouse.nix
similarity index 98%
rename from woodhouse/configuration.nix
rename to logical/woodhouse.nix
index d7dae89..b15ffa6 100644
--- a/woodhouse/configuration.nix
+++ b/logical/woodhouse.nix
@@ -9,7 +9,7 @@ in
 {
   imports =
     [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
+      ../physical/woodhouse.nix
       ../roles/common.nix
       ../roles/collectd.nix
       ../modules/tor-hidden-service.nix
diff --git a/frumar/hardware-configuration.nix b/physical/frumar.nix
similarity index 100%
rename from frumar/hardware-configuration.nix
rename to physical/frumar.nix
diff --git a/pennyworth/hardware-configuration.nix b/physical/pennyworth.nix
similarity index 100%
rename from pennyworth/hardware-configuration.nix
rename to physical/pennyworth.nix
diff --git a/woodhouse/hardware-configuration.nix b/physical/woodhouse.nix
similarity index 100%
rename from woodhouse/hardware-configuration.nix
rename to physical/woodhouse.nix