From ae4cb860ea2bd99d80e66e48480e0d2a9731c2bd Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 12 Nov 2017 09:43:25 +0100
Subject: [PATCH] per-user module: factor away api and imp
---
krebs/3modules/per-user.nix | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/krebs/3modules/per-user.nix b/krebs/3modules/per-user.nix
index 1b8d092bb..9cbd9e1ea 100644
--- a/krebs/3modules/per-user.nix
+++ b/krebs/3modules/per-user.nix
@@ -1,28 +1,19 @@
-{ 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}";
@@ -34,5 +25,4 @@ let
profiles = ["/etc/per-user/$LOGNAME"];
};
};
-
-in out
+}