From 2a441c59adcec203091401f5f6b72c5ac1e87c51 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 18 Dec 2017 01:05:30 +0100
Subject: l: get secrets from pass

---
 lass/source.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'lass/source.nix')

diff --git a/lass/source.nix b/lass/source.nix
index 710bfdf2d..66cdacea8 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -12,9 +12,12 @@ in
         url = https://github.com/nixos/nixpkgs;
         ref = "cb751f9";
       };
-      secrets.file = getAttr builder {
-        buildbot = toString <stockholm/lass/2configs/tests/dummy-secrets>;
-        lass = "/home/lass/secrets/${name}";
+      secrets = getAttr builder {
+        buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>;
+        lass.pass = {
+          dir = "${getEnv "HOME"}/.password-store";
+          name = "hosts/${name}";
+        };
       };
       stockholm.file = toString <stockholm>;
     }
-- 
cgit v1.2.3


From 8f80cd6fb41f963362d8044187f38b54244c227a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 18 Dec 2017 11:01:35 +0100
Subject: l nixpkgs: cb751f9 -> af7e479

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

(limited to 'lass/source.nix')

diff --git a/lass/source.nix b/lass/source.nix
index 66cdacea8..bf992d4d2 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -10,7 +10,7 @@ in
       nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
       nixpkgs.git = {
         url = https://github.com/nixos/nixpkgs;
-        ref = "cb751f9";
+        ref = "af7e479";
       };
       secrets = getAttr builder {
         buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>;
-- 
cgit v1.2.3


From c90f3a34934e5487c32e9424239a0040b4036e44 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 20 Dec 2017 14:20:47 +0100
Subject: l nixpkgs: af7e479 -> ed3b1bc

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

(limited to 'lass/source.nix')

diff --git a/lass/source.nix b/lass/source.nix
index bf992d4d2..403156000 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -10,7 +10,7 @@ in
       nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
       nixpkgs.git = {
         url = https://github.com/nixos/nixpkgs;
-        ref = "af7e479";
+        ref = "ed3b1bc";
       };
       secrets = getAttr builder {
         buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>;
-- 
cgit v1.2.3


From b73b1c45e57e3bab0300f5ecbed261c6d45a5d53 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Dec 2017 21:39:14 +0100
Subject: l nixpkgs: ed3b1bc -> 53e6d67

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

(limited to 'lass/source.nix')

diff --git a/lass/source.nix b/lass/source.nix
index 403156000..de7351604 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -10,7 +10,7 @@ in
       nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
       nixpkgs.git = {
         url = https://github.com/nixos/nixpkgs;
-        ref = "ed3b1bc";
+        ref = "53e6d67";
       };
       secrets = getAttr builder {
         buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>;
-- 
cgit v1.2.3