Use submodules for program email accounts

This reworks the way program specific email account options are
specified. In particular, we no longer use the deprecated `options`
field of `mkOption`. Instead submodules are used.
This commit is contained in:
Robert Helgesson 2018-08-16 21:37:42 +02:00
parent 99c900946d
commit 4b32f16747
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
5 changed files with 71 additions and 71 deletions

View file

@ -123,7 +123,7 @@ let
# gpgModule = types.submodule { # gpgModule = types.submodule {
# }; # };
mailAccount = types.submodule ({ name, config, ... }: { mailAccountOpts = { name, config, ... }: {
options = { options = {
name = mkOption { name = mkOption {
type = types.str; type = types.str;
@ -272,7 +272,7 @@ let
}; };
}) })
]; ];
}); };
in in
@ -294,7 +294,11 @@ in
}; };
accounts = mkOption { accounts = mkOption {
type = types.attrsOf mailAccount; type = types.attrsOf (types.submodule [
mailAccountOpts
(import ../programs/mbsync-accounts.nix)
(import ../programs/notmuch-accounts.nix)
]);
default = {}; default = {};
description = "List of email accounts."; description = "List of email accounts.";
}; };

View file

@ -0,0 +1,57 @@
{ lib, ... }:
with lib;
{
options.mbsync = {
enable = mkEnableOption "synchronization using mbsync";
flatten = mkOption {
type = types.nullOr types.str;
default = null;
example = ".";
description = ''
If set, flattens the hierarchy within the maildir by
substituting the canonical hierarchy delimiter
<literal>/</literal> with this value.
'';
};
create = mkOption {
type = types.enum [ "none" "maildir" "imap" "both" ];
default = "none";
example = "maildir";
description = ''
Automatically create missing mailboxes within the
given mail store.
'';
};
remove = mkOption {
type = types.enum [ "none" "maildir" "imap" "both" ];
default = "none";
example = "imap";
description = ''
Propagate mailbox deletions to the given mail store.
'';
};
expunge = mkOption {
type = types.enum [ "none" "maildir" "imap" "both" ];
default = "none";
example = "both";
description = ''
Permanently remove messages marked for deletion from
the given mail store.
'';
};
patterns = mkOption {
type = types.listOf types.str;
default = [ "*" ];
description = ''
Pattern of mailboxes to synchronize.
'';
};
};
}

View file

@ -132,64 +132,6 @@ in
''; '';
}; };
}; };
accounts.email.accounts = mkOption {
options = [
{
mbsync = {
enable = mkEnableOption "synchronization using mbsync";
flatten = mkOption {
type = types.nullOr types.str;
default = null;
example = ".";
description = ''
If set, flattens the hierarchy within the maildir by
substituting the canonical hierarchy delimiter
<literal>/</literal> with this value.
'';
};
create = mkOption {
type = types.enum [ "none" "maildir" "imap" "both" ];
default = "none";
example = "maildir";
description = ''
Automatically create missing mailboxes within the
given mail store.
'';
};
remove = mkOption {
type = types.enum [ "none" "maildir" "imap" "both" ];
default = "none";
example = "imap";
description = ''
Propagate mailbox deletions to the given mail store.
'';
};
expunge = mkOption {
type = types.enum [ "none" "maildir" "imap" "both" ];
default = "none";
example = "both";
description = ''
Permanently remove messages marked for deletion from
the given mail store.
'';
};
patterns = mkOption {
type = types.listOf types.str;
default = [ "*" ];
description = ''
Pattern of mailboxes to synchronize.
'';
};
};
}
];
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {

View file

@ -0,0 +1,7 @@
{ lib, ... }:
{
options.notmuch = {
enable = lib.mkEnableOption "notmuch indexing";
};
}

View file

@ -129,16 +129,6 @@ in
}; };
}; };
}; };
accounts.email.accounts = mkOption {
options = [
{
notmuch = {
enable = mkEnableOption "notmuch indexing";
};
}
];
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {