summaryrefslogtreecommitdiffstats
path: root/shared/2configs/base.nix
diff options
context:
space:
mode:
authormiefda <miefda@miefda.de>2015-12-30 18:24:44 +0100
committermiefda <miefda@miefda.de>2015-12-30 18:24:44 +0100
commitc562e447ba927ea20bf7d2dfff9a4f4807ee4463 (patch)
tree57f5496e7acbc9dfeec7f406a6857687219625d0 /shared/2configs/base.nix
parentb96fd072e1ac5e5b6b5b3e92c678dc4bb4cb7e1f (diff)
parent9b890750e24f43182ebf1732871a60d9e0c74c89 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'shared/2configs/base.nix')
-rw-r--r--shared/2configs/base.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index df41eae1a..4d509d7a6 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -13,18 +13,22 @@ with lib;
];
};
+ # TODO rename shared user to "krebs"
+ krebs.build.user = mkDefault config.krebs.users.shared;
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80";
+ target-path = "/var/src/nixpkgs";
};
dir.secrets = {
host = config.krebs.current.host;
- path = "${getEnv "HOME"}/secrets/krebs/wolf";
+ path = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}";
};
dir.stockholm = {
host = config.krebs.current.host;
- path = "${getEnv "HOME"}/stockholm";
+ path = mkDefault "${getEnv "HOME"}/stockholm";
+ target-path = "/var/src/stockholm";
};
};
@@ -65,7 +69,7 @@ with lib;
config.krebs.users.lass.pubkey
config.krebs.users.makefu.pubkey
# TODO HARDER:
- (readFile ../../krebs/Zpubkeys/makefu_omo.ssh.pub)
+ config.krebs.users.makefu-omo.pubkey
config.krebs.users.tv.pubkey
];