From c213968c44befe32f115ec0122accebdabd89582 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 13 Jul 2017 23:39:48 +0200
Subject: shell: support --user

---
 shared/source.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared/source.nix')

diff --git a/shared/source.nix b/shared/source.nix
index 8ec9fbb6f..762a0c640 100644
--- a/shared/source.nix
+++ b/shared/source.nix
@@ -9,7 +9,7 @@ in
     nixos-config.symlink = "stockholm/shared/1systems/${name}/config.nix";
     secrets.file = getAttr builder {
       buildbot = toString <stockholm/shared/6tests/data/secrets>;
-      lass = "${getEnv "HOME"}/secrets/krebs/${host.name}";
+      shared = "${getEnv "HOME"}/secrets/krebs/${host.name}";
     };
     stockholm.file = toString <stockholm>;
     nixpkgs.git = {
-- 
cgit v1.2.3


From 58380c82848c3db0bd6c3d74904153f3464c2098 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 14 Jul 2017 00:17:58 +0200
Subject: merge shared into krebs

---
 shared/source.nix | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 shared/source.nix

(limited to 'shared/source.nix')

diff --git a/shared/source.nix b/shared/source.nix
deleted file mode 100644
index 762a0c640..000000000
--- a/shared/source.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-with import <stockholm/lib>;
-host@{ name, secure ? false }: let
-  builder = if getEnv "dummy_secrets" == "true"
-              then "buildbot"
-              else "shared";
-  _file = <stockholm> + "/shared/1systems/${name}/source.nix";
-in
-  evalSource (toString _file) {
-    nixos-config.symlink = "stockholm/shared/1systems/${name}/config.nix";
-    secrets.file = getAttr builder {
-      buildbot = toString <stockholm/shared/6tests/data/secrets>;
-      shared = "${getEnv "HOME"}/secrets/krebs/${host.name}";
-    };
-    stockholm.file = toString <stockholm>;
-    nixpkgs.git = {
-      url = https://github.com/NixOS/nixpkgs;
-      ref = "72c9ed78d0b1d9d5f531805ddf5bf06bfd447614"; # nixos-17.03 @ 2017-06-17
-    };
-  }
-- 
cgit v1.2.3