From 04626b6b0a0bcbf978735e6f2abb74b4f5631c9e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Sep 2017 16:16:37 +0200 Subject: l source: make overrideable --- lass/source.nix | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'lass/source.nix') diff --git a/lass/source.nix b/lass/source.nix index 26c66824..52b0d99f 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -1,24 +1,27 @@ with import ; -host@{ name, secure ? false }: let +host@{ name, secure ? false, override ? {} }: let builder = if getEnv "dummy_secrets" == "true" then "buildbot" else "lass"; _file = + "/lass/1systems/${name}/source.nix"; in - evalSource (toString _file) { - nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; - secrets.file = getAttr builder { - buildbot = toString ; - lass = "/home/lass/secrets/${name}"; - }; - stockholm.file = toString ; - nixpkgs.git = { - url = http://cgit.lassul.us/nixpkgs; - # nixos-17.03 - # + copytoram: - # 87a4615 & 334ac4f - # + acme permissions for groups - # fd7a8f1 - ref = "fe46ffc"; - }; - } + evalSource (toString _file) [ + { + nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; + nixpkgs.git = { + url = http://cgit.lassul.us/nixpkgs; + # nixos-17.03 + # + copytoram: + # 87a4615 & 334ac4f + # + acme permissions for groups + # fd7a8f1 + ref = "fe46ffc"; + }; + secrets.file = getAttr builder { + buildbot = toString ; + lass = "/home/lass/secrets/${name}"; + }; + stockholm.file = toString ; + } + override + ] -- cgit v1.2.3