From c5f18dfdfe9874ba48834447c8d3259b115c1357 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 21 Feb 2016 06:39:12 +0100
Subject: tv.{charybdis,ejabberd}.user :: user

---
 tv/3modules/charybdis/default.nix | 11 +----------
 tv/3modules/ejabberd/default.nix  | 16 ++++------------
 2 files changed, 5 insertions(+), 22 deletions(-)

(limited to 'tv')

diff --git a/tv/3modules/charybdis/default.nix b/tv/3modules/charybdis/default.nix
index 0bab69529..5cb0c55b7 100644
--- a/tv/3modules/charybdis/default.nix
+++ b/tv/3modules/charybdis/default.nix
@@ -35,16 +35,7 @@ in {
       default = 6697;
     };
     user = mkOption {
-      type = types.submodule {
-        options = {
-          name = mkOption {
-            type = types.str;
-          };
-          home = mkOption {
-            type = types.str;
-          };
-        };
-      };
+      type = types.user;
       default = {
         name = "charybdis";
         home = "/var/lib/charybdis";
diff --git a/tv/3modules/ejabberd/default.nix b/tv/3modules/ejabberd/default.nix
index 51a3060fd..4077da286 100644
--- a/tv/3modules/ejabberd/default.nix
+++ b/tv/3modules/ejabberd/default.nix
@@ -30,19 +30,11 @@ in {
       default = cfg.certfile;
     };
     user = mkOption {
-      type = types.submodule {
-        options = {
-          name = mkOption {
-            type = types.str;
-            default = "ejabberd";
-          };
-          home = mkOption {
-            type = types.str;
-            default = "/var/ejabberd";
-          };
-        };
+      type = types.user;
+      default = {
+        name = "ejabberd";
+        home = "/var/ejabberd";
       };
-      default = {};
     };
   };
   config = lib.mkIf cfg.enable {
-- 
cgit v1.2.3