summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tv/3modules/charybdis/default.nix11
-rw-r--r--tv/3modules/ejabberd/default.nix16
2 files changed, 5 insertions, 22 deletions
diff --git a/tv/3modules/charybdis/default.nix b/tv/3modules/charybdis/default.nix
index 0bab695..5cb0c55 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 51a3060..4077da2 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 {