Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@

/modules/programs/mu.nix @KarlJoad

/modules/programs/mujmap.nix @elizagamedev
/tests/modules/programs/mujmap @elizagamedev

/modules/programs/navi.nix @marsam

/modules/programs/ncmpcpp.nix @olmokramer
Expand Down
49 changes: 47 additions & 2 deletions modules/accounts/email.nix
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,38 @@ let
};
};

jmapModule = types.submodule {
options = {
host = mkOption {
type = types.nullOr types.str;
default = null;
example = "jmap.example.org";
description = ''
Hostname of JMAP server.
</para><para>
If both this option and <xref
linkend="opt-accounts.email.accounts._name_.jmap.sessionUrl"/> are specified,
<code>host</code> is preferred by applications when establishing a
session.
'';
};

sessionUrl = mkOption {
type = types.nullOr types.str;
default = null;
example = "https://jmap.example.org:443/.well-known/jmap";
description = ''
URL for the JMAP Session resource.
</para><para>
If both this option and <xref
linkend="opt-accounts.email.accounts._name_.jmap.host"/> are specified,
<code>host</code> is preferred by applications when establishing a
session.
'';
};
};
};

smtpModule = types.submodule {
options = {
host = mkOption {
Expand Down Expand Up @@ -205,7 +237,7 @@ let
indicate the nature of the provider.
</para><para>
When this indicates a specific provider then, for example,
the IMAP and SMTP server configuration may be set
the IMAP, SMTP, and JMAP server configuration may be set
automatically.
'';
};
Expand Down Expand Up @@ -234,7 +266,7 @@ let
default = null;
description = ''
The server username of this account. This will be used as
the SMTP and IMAP user name.
the SMTP, IMAP, and JMAP user name.
'';
};

Expand Down Expand Up @@ -299,6 +331,14 @@ let
'';
};

jmap = mkOption {
type = types.nullOr jmapModule;
default = null;
description = ''
The JMAP configuration to use for this account.
'';
};

signature = mkOption {
type = signatureModule;
default = { };
Expand Down Expand Up @@ -350,6 +390,11 @@ let
host = "smtp.fastmail.com";
port = if config.smtp.tls.useStartTls then 587 else 465;
};

jmap = {
host = "fastmail.com";
sessionUrl = "https://jmap.fastmail.com/.well-known/jmap";
};
})

(mkIf (config.flavor == "gmail.com") {
Expand Down
7 changes: 7 additions & 0 deletions modules/misc/news.nix
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,13 @@ in
A new module is available: 'services.mopidy'.
'';
}

{
time = "2022-06-21T22:29:37+00:00";
message = ''
A new module is available: 'programs.mujmap'.
'';
}
];
};
}
1 change: 1 addition & 0 deletions modules/modules.nix
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ let
./programs/mpv.nix
./programs/msmtp.nix
./programs/mu.nix
./programs/mujmap.nix
./programs/navi.nix
./programs/ncmpcpp.nix
./programs/ncspot.nix
Expand Down
Loading