summaryrefslogtreecommitdiffstats
path: root/lass/2configs/default.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-07-13 00:37:54 +0200
committertv <tv@krebsco.de>2017-07-13 00:37:54 +0200
commitbc6c6a3164d31141f39333914c1b15ff261e7859 (patch)
tree8bff8dd19f1d9f9fcc2b78b7c8d3fb81a332aab4 /lass/2configs/default.nix
parent4da01794605291bdb7bd9fa9dc7109764f4faf58 (diff)
parent7212de210bb7fc751ffade00d6b1b08f195ddf47 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs/default.nix')
-rw-r--r--lass/2configs/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 27b74a30b..22a7b1c19 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
@@ -36,6 +35,7 @@ with import <stockholm/lib>;
extraGroups = [
"audio"
"fuse"
+ "wheel"
];
openssh.authorizedKeys.keys = [
config.krebs.users.lass.pubkey
@@ -71,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;