diff options
| author | makefu <github@syntax-fehler.de> | 2018-03-07 01:49:57 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-03-07 01:49:57 +0100 |
| commit | 6b647a237a5f4db23b7eff70f305be7106da7711 (patch) | |
| tree | 3542eabb416599e0d2dea8a2f2358f27f4b911e2 /jeschli | |
| parent | 194e7011d42ed75c76dc7a7efea450ba6497d2f1 (diff) | |
| parent | 02f67eed443ba552d775d1a0ab7860d439f7552b (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'jeschli')
| -rw-r--r-- | jeschli/1systems/brauerei/config.nix | 2 | ||||
| -rw-r--r-- | jeschli/source.nix | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index e4109c638..eb2bb11d2 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -79,6 +79,8 @@ jetbrains.goland # document viewer zathura + # xorg + xorg.xbacklight ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/jeschli/source.nix b/jeschli/source.nix index 382dd61bc..fe1de8fd1 100644 --- a/jeschli/source.nix +++ b/jeschli/source.nix @@ -4,6 +4,11 @@ host@{ name, secure ? false, override ? {} }: let then "buildbot" else "jeschli"; _file = <stockholm> + "/jeschli/1systems/${name}/source.nix"; + pkgs = import <nixpkgs> { + overlays = map import [ + <stockholm/krebs/5pkgs> + ]; + }; in evalSource (toString _file) [ { @@ -17,6 +22,7 @@ in jeschli = "${getEnv "HOME"}/secrets/${name}"; }; stockholm.file = toString <stockholm>; + stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; } override ] |