summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-12-22 16:42:28 +0100
committermakefu <github@syntax-fehler.de>2015-12-22 16:42:28 +0100
commit9ec4c5df3d132db078e89cb577860b6ec416be04 (patch)
tree4f713cd1018afb32b0874628f9cfd2f58d99cc1e
parentadbe4a5b4aaed8ea9a7edf20e088f2b74ec3216b (diff)
s 2 base: fix user,pubkey,secrets path
-rw-r--r--shared/2configs/base.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index fceea67d1..c36061e38 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -13,6 +13,8 @@ with lib;
];
};
+ # TODO rename shared user to "krebs"
+ krebs.build.user = config.krebs.users.shared;
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
@@ -20,7 +22,7 @@ with lib;
};
dir.secrets = {
host = config.krebs.current.host;
- path = mkDefault "${getEnv "HOME"}/secrets/krebs/wolf";
+ path = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}";
};
dir.stockholm = {
host = config.krebs.current.host;
@@ -65,7 +67,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
];