From 7704f80890c75f65c2906ecc17cdd89761d308ad Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 15 Jul 2017 19:01:02 +0200
Subject: ma: replace path to 2configs, init source.nix

---
 makefu/1systems/x/config.nix | 70 ++++++++++++++++++++++----------------------
 makefu/1systems/x/source.nix |  4 +++
 2 files changed, 39 insertions(+), 35 deletions(-)
 create mode 100644 makefu/1systems/x/source.nix

(limited to 'makefu/1systems/x')

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 235862e85..b84394cd2 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -7,61 +7,61 @@ with import <stockholm/lib>;
 {
   imports =
     [ # base
-      ../.
-      ../2configs/main-laptop.nix
-      ../2configs/extra-fonts.nix
-      ../2configs/tools/all.nix
-      ../2configs/laptop-backup.nix
-      ../2configs/dnscrypt.nix
-      ../2configs/avahi.nix
+      <stockholm/makefu>
+      <stockholm/makefu/2configs/main-laptop.nix>
+      <stockholm/makefu/2configs/extra-fonts.nix>
+      <stockholm/makefu/2configs/tools/all.nix>
+      <stockholm/makefu/2configs/laptop-backup.nix>
+      <stockholm/makefu/2configs/dnscrypt.nix>
+      <stockholm/makefu/2configs/avahi.nix>
 
       # Debugging
-      # ../2configs/disable_v6.nix
+      # <stockholm/makefu/2configs/disable_v6.nix>
 
       # Testing
-      # ../2configs/lanparty/lancache.nix
-      # ../2configs/lanparty/lancache-dns.nix
-      # ../2configs/deployment/dirctator.nix
-      # ../2configs/vncserver.nix
-      # ../2configs/deployment/led-fader
-      # ../2configs/deployment/hound
+      # <stockholm/makefu/2configs/lanparty/lancache.nix>
+      # <stockholm/makefu/2configs/lanparty/lancache-dns.nix>
+      # <stockholm/makefu/2configs/deployment/dirctator.nix>
+      # <stockholm/makefu/2configs/vncserver.nix>
+      # <stockholm/makefu/2configs/deployment/led-fader>
+      # <stockholm/makefu/2configs/deployment/hound>
 
       # development
-      ../2configs/sources
+      <stockholm/makefu/2configs/sources>
 
       # Krebs
-      ../2configs/tinc/retiolum.nix
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
 
       # applications
-      ../2configs/exim-retiolum.nix
-      ../2configs/mail-client.nix
-      ../2configs/printer.nix
-      ../2configs/task-client.nix
+      <stockholm/makefu/2configs/exim-retiolum.nix>
+      <stockholm/makefu/2configs/mail-client.nix>
+      <stockholm/makefu/2configs/printer.nix>
+      <stockholm/makefu/2configs/task-client.nix>
 
       # Virtualization
-      ../2configs/virtualization.nix
-      ../2configs/docker.nix
-      ../2configs/virtualization-virtualbox.nix
+      <stockholm/makefu/2configs/virtualization.nix>
+      <stockholm/makefu/2configs/docker.nix>
+      <stockholm/makefu/2configs/virtualization-virtualbox.nix>
 
       # Services
-      ../2configs/git/brain-retiolum.nix
-      ../2configs/tor.nix
-      ../2configs/steam.nix
-      # ../2configs/buildbot-standalone.nix
+      <stockholm/makefu/2configs/git/brain-retiolum.nix>
+      <stockholm/makefu/2configs/tor.nix>
+      <stockholm/makefu/2configs/steam.nix>
+      # <stockholm/makefu/2configs/buildbot-standalone.nix>
 
       # Hardware
-      ../2configs/hw/tp-x230.nix
-      ../2configs/hw/rtl8812au.nix
-      ../2configs/hw/exfat-nofuse.nix
-      ../2configs/hw/wwan.nix
-      # ../2configs/hw/stk1160.nix
-      # ../2configs/rad1o.nix
+      <stockholm/makefu/2configs/hw/tp-x230.nix>
+      <stockholm/makefu/2configs/hw/rtl8812au.nix>
+      <stockholm/makefu/2configs/hw/exfat-nofuse.nix>
+      <stockholm/makefu/2configs/hw/wwan.nix>
+      # <stockholm/makefu/2configs/hw/stk1160.nix>
+      # <stockholm/makefu/2configs/rad1o.nix>
 
       # Filesystem
-      ../2configs/fs/sda-crypto-root-home.nix
+      <stockholm/makefu/2configs/fs/sda-crypto-root-home.nix>
 
       # Security
-      ../2configs/sshd-totp.nix
+      <stockholm/makefu/2configs/sshd-totp.nix>
 
     ];
 
diff --git a/makefu/1systems/x/source.nix b/makefu/1systems/x/source.nix
new file mode 100644
index 000000000..54ec3c8a9
--- /dev/null
+++ b/makefu/1systems/x/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/makefu/source.nix> {
+  name="x";
+  full = true;
+}
-- 
cgit v1.2.3