nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

neomutt: support list in binds.map (#1885)

Browse source 
* neomutt: support list in binds.map
Closes #1245

Adds support for specifying programs.neomutt.binds[].map as a list. If
specified as a list, then the binds will be concatenated with a ",".

* neomutt: add deprecation warning for (binds|macros).map as string
Added note that specifying 'programs.neomutt.(binds|macros).map' as a string is deprecated. Instead, use the list form.

* neomutt: note deprecation warning in release notes
Added note that specifying 'programs.neomutt.(binds|macros).map' as a
single string is deprecated in favor of specifying it as a list

* neomutt: add assertion that map is not empty
Added an assertion that each 'programs.neomutt.(binds|macros).map' list contains at least one element.
This commit is contained in:
Sumner Evans 2021-04-03 17:47:40 -06:00 • committed by GitHub
parent 6e3d93d7cc
commit 25a6a6d298
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 247 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/modules/programs/neomutt/default.nix
View file

@ -2,4 +2,8 @@
neomutt-simple = ./neomutt.nix;
neomutt-with-msmtp = ./neomutt-with-msmtp.nix;
neomutt-not-primary = ./neomutt-not-primary.nix;
neomutt-with-binds = ./neomutt-with-binds.nix;
neomutt-with-binds-with-warning = ./neomutt-with-binds-with-warning.nix;
neomutt-with-binds-invalid-settings =
./neomutt-with-binds-invalid-settings.nix;
}

34
tests/modules/programs/neomutt/neomutt-with-binds-expected.conf Normal file
View file

@ -0,0 +1,34 @@
# Generated by Home Manager.
set header_cache = "/home/hm-user/.cache/neomutt/headers/"
set message_cachedir = "/home/hm-user/.cache/neomutt/messages/"
set editor = "$EDITOR"
set implicit_autoview = yes
alternative_order text/enriched text/plain text
set delete = yes
# Binds
bind editor <Tab> "complete-query"
bind index,pager \Cp "sidebar-prev"
# Macros
macro index s "<save-message>?<tab>"
macro index,pager c "<change-folder>?<change-dir><home>^K=<enter><tab>"
# Extra configuration
# Register accounts
# register account hm@example.com
mailboxes "/home/hm-user/Mail/hm@example.com/Inbox"
folder-hook /home/hm-user/Mail/hm@example.com/ " \
source /home/hm-user/.config/neomutt/hm@example.com "
# Source primary account
source /home/hm-user/.config/neomutt/hm@example.com

27
tests/modules/programs/neomutt/neomutt-with-binds-invalid-settings.nix Normal file
View file

@ -0,0 +1,27 @@
{ config, lib, pkgs, ... }:
with lib;
{
config = {
programs.neomutt = {
enable = true;
binds = [{
action = "complete-query";
key = "<Tab>";
map = [ ];
}];
macros = [{
action = "<change-folder>?<change-dir><home>^K=<enter><tab>";
key = "c";
map = [ ];
}];
};
test.asserts.assertions.expected = [
"The 'programs.neomutt.(binds|macros).map' list must contain at least one element."
];
};
}

71
tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix Normal file
View file

@ -0,0 +1,71 @@
{ config, lib, pkgs, ... }:
with lib;
{
imports = [ ../../accounts/email-test-accounts.nix ];
config = {
accounts.email.accounts = {
"hm@example.com" = {
notmuch.enable = true;
neomutt = {
enable = true;
extraConfig = ''
color status cyan default
'';
};
imap.port = 993;
};
};
programs.neomutt = {
enable = true;
vimKeys = false;
binds = [
{
action = "complete-query";
key = "<Tab>";
map = "editor";
}
{
action = "sidebar-prev";
key = "\\Cp";
map = [ "index" "pager" ];
}
];
macros = [
{
action = "<save-message>?<tab>";
key = "s";
map = "index";
}
{
action = "<change-folder>?<change-dir><home>^K=<enter><tab>";
key = "c";
map = [ "index" "pager" ];
}
];
};
nixpkgs.overlays =
[ (self: super: { neomutt = pkgs.writeScriptBin "dummy-neomutt" ""; }) ];
test.asserts.warnings.expected = [
"Specifying 'programs.neomutt.(binds|macros).map' as a string is deprecated, use a list of strings instead. See https://github.com/nix-community/home-manager/pull/1885."
];
nmt.script = ''
assertFileExists home-files/.config/neomutt/neomuttrc
assertFileExists home-files/.config/neomutt/hm@example.com
assertFileContent home-files/.config/neomutt/neomuttrc ${
./neomutt-with-binds-expected.conf
}
assertFileContent home-files/.config/neomutt/hm@example.com ${
./hm-example.com-expected
}
'';
};
}

67
tests/modules/programs/neomutt/neomutt-with-binds.nix Normal file
View file

@ -0,0 +1,67 @@
{ config, lib, pkgs, ... }:
with lib;
{
imports = [ ../../accounts/email-test-accounts.nix ];
config = {
accounts.email.accounts = {
"hm@example.com" = {
notmuch.enable = true;
neomutt = {
enable = true;
extraConfig = ''
color status cyan default
'';
};
imap.port = 993;
};
};
programs.neomutt = {
enable = true;
vimKeys = false;
binds = [
{
action = "complete-query";
key = "<Tab>";
map = [ "editor" ];
}
{
action = "sidebar-prev";
key = "\\Cp";
map = [ "index" "pager" ];
}
];
macros = [
{
action = "<save-message>?<tab>";
key = "s";
map = [ "index" ];
}
{
action = "<change-folder>?<change-dir><home>^K=<enter><tab>";
key = "c";
map = [ "index" "pager" ];
}
];
};
nixpkgs.overlays =
[ (self: super: { neomutt = pkgs.writeScriptBin "dummy-neomutt" ""; }) ];
nmt.script = ''
assertFileExists home-files/.config/neomutt/neomuttrc
assertFileExists home-files/.config/neomutt/hm@example.com
assertFileContent home-files/.config/neomutt/neomuttrc ${
./neomutt-with-binds-expected.conf
}
assertFileContent home-files/.config/neomutt/hm@example.com ${
./hm-example.com-expected
}
'';
};
}