diff options
author | makefu <github@syntax-fehler.de> | 2015-10-01 18:49:34 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-10-01 18:49:34 +0200 |
commit | 49c00cf74f778152f4aed943dedb7bbf283b16e7 (patch) | |
tree | 29946a2fedb005b68a417acf3ac04d6f858f8aa1 /lass/1systems/mors.nix | |
parent | 73aa31010415ac5f7bf86d2bb77099fc3097905a (diff) | |
parent | 4af4fa89e50c3769d9331608cec2e6752ceb4fcb (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'lass/1systems/mors.nix')
-rw-r--r-- | lass/1systems/mors.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 4724fd3e3..b7291a8f2 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -22,18 +22,20 @@ ../2configs/retiolum.nix ../2configs/wordpress.nix ../2configs/bitlbee.nix + ../2configs/firefoxPatched.nix ]; krebs.build = { user = config.krebs.users.lass; - target = "root@mors"; host = config.krebs.hosts.mors; - deps = { - secrets = { - url = "/home/lass/secrets/${config.krebs.build.host.name}"; + source = { + dir.secrets = { + host = config.krebs.hosts.mors; + path = "/home/lass/secrets/${config.krebs.build.host.name}"; }; - stockholm = { - url = toString ../..; + dir.stockholm = { + host = config.krebs.hosts.mors; + path = "/home/lass/dev/stockholm"; }; }; }; @@ -172,6 +174,7 @@ environment.systemPackages = with pkgs; [ cac + get ]; #TODO: fix this shit |