diff options
author | nin <nineinchnade@gmail.com> | 2017-12-14 21:13:46 +0100 |
---|---|---|
committer | nin <nineinchnade@gmail.com> | 2017-12-14 21:13:46 +0100 |
commit | 37771ad34e18e0657636c8d0eb5b7392e3b89ba6 (patch) | |
tree | 8abda683b425494d2a273fc42d7573499b97a657 /krebs/3modules/per-user.nix | |
parent | 7ed6fd18bb99884889a76ad9f597193861f44dc9 (diff) | |
parent | 04f7ae22d6d0720d06f78c712eb9cd245cefce82 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules/per-user.nix')
-rw-r--r-- | krebs/3modules/per-user.nix | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/krebs/3modules/per-user.nix b/krebs/3modules/per-user.nix index 1b8d092b..a7a07a8e 100644 --- a/krebs/3modules/per-user.nix +++ b/krebs/3modules/per-user.nix @@ -1,38 +1,34 @@ -{ config, lib, pkgs, ... }: - with import <stockholm/lib>; - -let +{ config, pkgs, ... }: let cfg = config.krebs.per-user; - - out = { - options.krebs.per-user = api; - config = imp; - }; - - api = mkOption { - type = with types; attrsOf (submodule { +in { + options.krebs.per-user = mkOption { + type = types.attrsOf (types.submodule { options = { packages = mkOption { - type = listOf path; + type = types.listOf types.path; default = []; }; }; }); default = {}; }; - - imp = { + config = { environment = { - etc = flip mapAttrs' cfg (name: { packages, ... }: { - name = "per-user/${name}"; - value.source = pkgs.symlinkJoin { - name = "per-user.${name}"; - paths = packages; - }; - }); + etc = + mapAttrs' + (name: per-user: { + name = "per-user/${name}"; + value.source = pkgs.buildEnv { + name = "per-user.${name}"; + paths = per-user.packages; + pathsToLink = [ + "/bin" + ]; + }; + }) + (filterAttrs (_: per-user: per-user.packages != []) cfg); profiles = ["/etc/per-user/$LOGNAME"]; }; }; - -in out +} |