From 23616c2e13f63f0262d64538032b98ce83cc0ec2 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Wed, 15 Jul 2026 20:32:36 +0530 Subject: feat: renamed the options to reflect their changed directory stucture Renamed the options for the configurations based on the sub-module that they belong to --- modules/communication/neomutt/assertions.nix | 22 +++++++++++----------- modules/communication/neomutt/default.nix | 6 +++++- modules/communication/neomutt/theme.nix | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) (limited to 'modules/communication/neomutt') diff --git a/modules/communication/neomutt/assertions.nix b/modules/communication/neomutt/assertions.nix index 989d273..22434a4 100644 --- a/modules/communication/neomutt/assertions.nix +++ b/modules/communication/neomutt/assertions.nix @@ -3,31 +3,31 @@ { assertions = [ { - assertion = !config.programs.neomutt.enable || config.programs.less.enable; + assertion = !config.communication.neomutt.enable || config.terminal.less.enable; message = '' - programs.neomutt is enabled but programs.less.enable is not. - neomutt requires less as its pager. Please enable programs.less. + communication.neomutt is enabled but terminal.less.enable is not. + neomutt requires less as its pager. Please enable terminal.less. ''; } { - assertion = !config.programs.neomutt.enable || config.programs.bat.enable; + assertion = !config.communication.neomutt.enable || config.terminal.bat.enable; message = '' - programs.neomutt is enabled but programs.bat.enable is not. - neomutt requires bat for text/html filtering. Please enable programs.bat. + communication.neomutt is enabled but terminal.bat.enable is not. + neomutt requires bat for text/html filtering. Please enable terminal.bat. ''; } { - assertion = !config.programs.neomutt.enable || config.programs.email.enable; + assertion = !config.communication.neomutt.enable || config.communication.email.enable; message = '' - programs.neomutt is enabled but programs.email.enable is not. + communication.neomutt is enabled but communication.email.enable is not. neomutt requires the email module (mbsync + notmuch) to be enabled. ''; } { - assertion = !config.programs.neomutt.enable || config.programs.kitty.enable; + assertion = !config.communication.neomutt.enable || config.terminal.kitty.enable; message = '' - programs.neomutt is enabled but programs.kitty.enable is not. - neomutt's desktop entry requires kitty as the terminal launcher. Please enable programs.kitty. + communication.neomutt is enabled but terminal.kitty.enable is not. + neomutt's desktop entry requires kitty as the terminal launcher. Please enable terminal.kitty. ''; } ]; diff --git a/modules/communication/neomutt/default.nix b/modules/communication/neomutt/default.nix index 3626341..be3045d 100644 --- a/modules/communication/neomutt/default.nix +++ b/modules/communication/neomutt/default.nix @@ -25,7 +25,11 @@ in ./assertions.nix ./theme.nix ]; - config = lib.mkIf config.programs.neomutt.enable { + options.communication.neomutt = { + enable = lib.mkEnableOption "Enables neomutt."; + }; + + config = lib.mkIf config.communication.neomutt.enable { xdg.mimeApps.defaultApplications = { "x-scheme-handler/mailto" = "neomutt.desktop"; }; diff --git a/modules/communication/neomutt/theme.nix b/modules/communication/neomutt/theme.nix index 52845ee..1d62c55 100644 --- a/modules/communication/neomutt/theme.nix +++ b/modules/communication/neomutt/theme.nix @@ -3,7 +3,7 @@ # Colorscheme - True base16 OneDark colors for neomutt # Leverages Kitty's precise mapping to base16 (color0-15) { - config.programs.neomutt.extraConfig = lib.mkIf config.programs.neomutt.enable '' + config.programs.neomutt.extraConfig = lib.mkIf config.communication.neomutt.enable '' # vim: filetype=muttrc # # Base16 OneDark Dark terminal colors for neomutt -- cgit v1.2.3