From 7fdc46bb9d911838edfa723d985ede6a604c0c5a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 6 Jul 2017 21:47:47 +0200
Subject: move source config from module system to 1systems/*/source.nix

---
 shell.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index e0c60e33..57957f82 100644
--- a/shell.nix
+++ b/shell.nix
@@ -43,9 +43,11 @@ let
   '';
 
   init.env = pkgs.writeText "init.env" /* sh */ ''
-    config=''${config-$LOGNAME/1systems/$system.nix}
+    config=''${config-$LOGNAME/1systems/$system/config.nix}
+    source=''${source-$LOGNAME/1systems/$system/source.nix}
 
     export config
+    export source
     export system
     export target
 
@@ -92,7 +94,7 @@ let
           --show-trace \
           --strict \
           -I nixos-config="$config" \
-          -E 'with import <stockholm>; config.krebs.build.source')
+          "$source")
       echo $_source |
       ${pkgs.populate}/bin/populate \
           "$target_user@$target_host:$target_port$target_path" \
-- 
cgit v1.2.3