diff options
author | tv <tv@krebsco.de> | 2015-07-24 20:48:00 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2015-07-24 20:49:46 +0200 |
commit | 2154167857b6bd35c8b1cce2ad41521164abb2ff (patch) | |
tree | 99df541a14bd1baec6150a7da8fcaf2270edd0a1 /4lib | |
parent | e1d542e07d5ee9c26a04f273b0eb6ff8adccf756 (diff) |
{2 tv git -> 3 krebs}.users
Diffstat (limited to '4lib')
-rw-r--r-- | 4lib/krebs/default.nix | 10 | ||||
-rw-r--r-- | 4lib/krebs/types.nix | 11 | ||||
-rw-r--r-- | 4lib/tv/default.nix | 7 |
3 files changed, 20 insertions, 8 deletions
diff --git a/4lib/krebs/default.nix b/4lib/krebs/default.nix index 38c2a97..0c59076 100644 --- a/4lib/krebs/default.nix +++ b/4lib/krebs/default.nix @@ -1,6 +1,14 @@ { lib, ... }: -builtins // lib // { +with builtins; +with lib; + +builtins // lib // rec { + + addName = name: set: + set // { inherit name; }; + + addNames = mapAttrs addName; types = import ./types.nix { inherit lib; }; diff --git a/4lib/krebs/types.nix b/4lib/krebs/types.nix index 9d02c77..ca92c69 100644 --- a/4lib/krebs/types.nix +++ b/4lib/krebs/types.nix @@ -81,6 +81,17 @@ types // rec { merge = mergeOneOption; }; + user = submodule { + options = { + name = mkOption { + type = str; # TODO + }; + pubkey = mkOption { + type = str; + }; + }; + }; + # TODO addr = str; addr4 = str; diff --git a/4lib/tv/default.nix b/4lib/tv/default.nix index 267a858..16888c2 100644 --- a/4lib/tv/default.nix +++ b/4lib/tv/default.nix @@ -15,16 +15,9 @@ krebs // rec { inherit pkgs; }; - addName = name: set: - set // { inherit name; }; - - addNames = mapAttrs addName; - - # "7.4.335" -> "74" majmin = with lib; x : concatStrings (take 2 (splitString "." x)); - concat = xs : if xs == [] then "" |