From 7f9c31ecad41ab7d9679f7c0bd34e06d98695b78 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Sat, 18 Jul 2026 15:13:58 +0530 Subject: refactor(neomutt): just some whitespace formatting --- modules/communication/default.nix | 1 - modules/communication/neomutt/account/default.nix | 30 +++++++++------------- .../neomutt/account/flavors/gmail.nix | 1 - modules/communication/neomutt/account/options.nix | 1 - modules/communication/neomutt/assertions.nix | 1 - modules/communication/neomutt/default.nix | 1 - modules/communication/neomutt/sync/default.nix | 1 - modules/communication/neomutt/sync/mbsync.nix | 5 +--- modules/communication/neomutt/sync/notmuch.nix | 5 +--- 9 files changed, 14 insertions(+), 32 deletions(-) (limited to 'modules/communication') diff --git a/modules/communication/default.nix b/modules/communication/default.nix index ccb7188..4dc805b 100644 --- a/modules/communication/default.nix +++ b/modules/communication/default.nix @@ -1,6 +1,5 @@ # Communication - Email client modules { ... }: - { imports = [ ./neomutt diff --git a/modules/communication/neomutt/account/default.nix b/modules/communication/neomutt/account/default.nix index 4d32ad7..e6e60d2 100644 --- a/modules/communication/neomutt/account/default.nix +++ b/modules/communication/neomutt/account/default.nix @@ -1,15 +1,9 @@ # Account - Converts neomutt account options into home-manager email config { config, lib, ... }: - -with lib; - -let - inherit (lib) types; -in { - options.communication.neomutt.accounts = mkOption { - type = types.attrsOf ( - types.submodule { + options.communication.neomutt.accounts = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.submodule { imports = [ ./options.nix ./flavors/gmail.nix @@ -49,8 +43,8 @@ in ]; } - // mkIf config.communication.neomutt.enable { - accounts.email.accounts = mapAttrs ( + // lib.mkIf config.communication.neomutt.enable { + accounts.email.accounts = lib.mapAttrs ( name: account: let a = account; @@ -71,8 +65,8 @@ in folders = { inherit (a.folders) inbox trash; } - // optionalAttrs (a.folders.drafts != null) { drafts = a.folders.drafts; } - // optionalAttrs (a.folders.sent != null) { sent = a.folders.sent; }; + // lib.optionalAttrs (a.folders.drafts != null) { drafts = a.folders.drafts; } + // lib.optionalAttrs (a.folders.sent != null) { sent = a.folders.sent; }; neomutt = { enable = true; @@ -101,7 +95,7 @@ in }; }; - imap = optionalAttrs (a.imap.host != null) { + imap = lib.optionalAttrs (a.imap.host != null) { host = a.imap.host; port = a.imap.port; tls = { @@ -110,7 +104,7 @@ in }; }; - smtp = optionalAttrs (a.smtp.host != null) { + smtp = lib.optionalAttrs (a.smtp.host != null) { host = a.smtp.host; port = a.smtp.port; tls = { @@ -119,18 +113,18 @@ in }; }; - gpg = optionalAttrs (a.gpg.key != null) { + gpg = lib.optionalAttrs (a.gpg.key != null) { key = a.gpg.key; signByDefault = a.gpg.signByDefault; encryptByDefault = a.gpg.encryptByDefault; }; - signature = optionalAttrs (a.signature.text != null || a.signature.command != null) { + signature = lib.optionalAttrs (a.signature.text != null || a.signature.command != null) { text = a.signature.text; command = a.signature.command; showSignature = a.signature.showSignature; }; } - ) (filterAttrs (n: a: a.enable) config.communication.neomutt.accounts); + ) (lib.filterAttrs (n: a: a.enable) config.communication.neomutt.accounts); }; } diff --git a/modules/communication/neomutt/account/flavors/gmail.nix b/modules/communication/neomutt/account/flavors/gmail.nix index 24035b2..28653c9 100644 --- a/modules/communication/neomutt/account/flavors/gmail.nix +++ b/modules/communication/neomutt/account/flavors/gmail.nix @@ -5,7 +5,6 @@ name, ... }: - { config = lib.mkIf (config.flavor == "gmail.com") { folders = { diff --git a/modules/communication/neomutt/account/options.nix b/modules/communication/neomutt/account/options.nix index 8b34062..3dd6c9f 100644 --- a/modules/communication/neomutt/account/options.nix +++ b/modules/communication/neomutt/account/options.nix @@ -1,6 +1,5 @@ # Options - Email account option definitions (realName, address, folders, gpg, etc.) { lib, ... }: - { options = { enable = lib.mkEnableOption "this email account" // { diff --git a/modules/communication/neomutt/assertions.nix b/modules/communication/neomutt/assertions.nix index b7b58ad..dea9d41 100644 --- a/modules/communication/neomutt/assertions.nix +++ b/modules/communication/neomutt/assertions.nix @@ -1,6 +1,5 @@ # Assertions - Validates neomutt dependencies (less, bat, kitty) are enabled { config, ... }: - { assertions = [ { diff --git a/modules/communication/neomutt/default.nix b/modules/communication/neomutt/default.nix index 96b6f59..f12ad02 100644 --- a/modules/communication/neomutt/default.nix +++ b/modules/communication/neomutt/default.nix @@ -1,6 +1,5 @@ # Neomutt - Email suite entry point (neomutt + mbsync + notmuch) { config, lib, ... }: - { imports = [ ./account diff --git a/modules/communication/neomutt/sync/default.nix b/modules/communication/neomutt/sync/default.nix index 765b22a..2fcaa18 100644 --- a/modules/communication/neomutt/sync/default.nix +++ b/modules/communication/neomutt/sync/default.nix @@ -1,6 +1,5 @@ # Sync - Mail synchronization modules (mbsync, notmuch) { ... }: - { imports = [ ./mbsync.nix diff --git a/modules/communication/neomutt/sync/mbsync.nix b/modules/communication/neomutt/sync/mbsync.nix index 71a98a0..7642099 100644 --- a/modules/communication/neomutt/sync/mbsync.nix +++ b/modules/communication/neomutt/sync/mbsync.nix @@ -1,10 +1,7 @@ # Mbsync - Mailbox synchronization (isync/mbsync) { config, lib, ... }: - -with lib; - { - config = mkIf config.communication.neomutt.enable { + config = lib.mkIf config.communication.neomutt.enable { programs.mbsync.enable = true; }; } diff --git a/modules/communication/neomutt/sync/notmuch.nix b/modules/communication/neomutt/sync/notmuch.nix index 75f4c32..277b232 100644 --- a/modules/communication/neomutt/sync/notmuch.nix +++ b/modules/communication/neomutt/sync/notmuch.nix @@ -1,10 +1,7 @@ # Notmuch - Mail indexer for fast email search { config, lib, ... }: - -with lib; - { - config = mkIf config.communication.neomutt.enable { + config = lib.mkIf config.communication.neomutt.enable { programs.notmuch.enable = true; }; } -- cgit v1.2.3