summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-12 19:11:29 +0200
committerlassulus <lassulus@lassul.us>2017-07-12 19:11:29 +0200
commitb19ebc2abd8f383d477d35040e833cd9c05319ab (patch)
tree778a882e0faebc82360c06165b4b00726468b8aa /lass/2configs
parent5efedd139a20d71268af2afd069dbd595414650f (diff)
parentcd47613a4d8daf185f4ac0f8ef43af11985a2f65 (diff)
Merge branch 'staging/source'
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/default.nix12
-rw-r--r--lass/2configs/nixpkgs.nix8
2 files changed, 1 insertions, 19 deletions
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 161db942..22a7b1c1 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -6,7 +6,6 @@ with import <stockholm/lib>;
../2configs/binary-cache/client.nix
../2configs/gc.nix
../2configs/mc.nix
- ../2configs/nixpkgs.nix
../2configs/vim.nix
../2configs/monitoring/client.nix
./htop.nix
@@ -72,16 +71,7 @@ with import <stockholm/lib>;
krebs = {
enable = true;
search-domain = "r";
- build = {
- user = config.krebs.users.lass;
- source = let inherit (config.krebs.build) host; in {
- nixos-config.symlink = "stockholm/lass/1systems/${host.name}.nix";
- secrets.file =
- if getEnv "dummy_secrets" == "true"
- then toString <stockholm/lass/2configs/tests/dummy-secrets>
- else "/home/lass/secrets/${host.name}";
- };
- };
+ build.user = config.krebs.users.lass;
};
nix.useSandbox = true;
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
deleted file mode 100644
index f5a3bbf8..00000000
--- a/lass/2configs/nixpkgs.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-
-{
- krebs.build.source.nixpkgs.git = {
- url = https://cgit.lassul.us/nixpkgs;
- ref = "d72efac";
- };
-}