From 43ab2f40b92030435bc0afe9ecf573be4df03375 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 24 Sep 2020 20:02:49 +0200 Subject: [PATCH] notmuch: inline `notmuch-accounts.nix` Having it in a separate file is a bit unnecessary. --- modules/programs/notmuch-accounts.nix | 5 ----- modules/programs/notmuch.nix | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 modules/programs/notmuch-accounts.nix diff --git a/modules/programs/notmuch-accounts.nix b/modules/programs/notmuch-accounts.nix deleted file mode 100644 index fd4a811d..00000000 --- a/modules/programs/notmuch-accounts.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: - -{ - options.notmuch = { enable = lib.mkEnableOption "notmuch indexing"; }; -} diff --git a/modules/programs/notmuch.nix b/modules/programs/notmuch.nix index 9070d755..b93cc6a5 100644 --- a/modules/programs/notmuch.nix +++ b/modules/programs/notmuch.nix @@ -145,7 +145,10 @@ in { }; accounts.email.accounts = mkOption { - type = with types; attrsOf (submodule (import ./notmuch-accounts.nix)); + type = with types; + attrsOf (submodule { + options.notmuch.enable = mkEnableOption "notmuch indexing"; + }); }; };