treewide: implement auto importing for modules

Reduce maintenance burden and increase efficiency by automatically
importing modules following a specific convention.

Co-authored-by: awwpotato <awwpotato@voidq.com>
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>

modules/programs/aerc/default.nix

@@ -37,7 +37,7 @@ let
 
   sectionsOrLines = types.either types.lines confSections;
 
-  accounts = import ./aerc-accounts.nix {
+  accounts = import ./accounts.nix {
     inherit
       config
       pkgs

modules/programs/alot/default.nix

@@ -271,7 +271,7 @@ in
     };
 
     accounts.email.accounts = mkOption {
-      type = with types; attrsOf (submodule (import ./alot-accounts.nix pkgs));
+      type = with types; attrsOf (submodule (import ./accounts.nix pkgs));
     };
   };
 

modules/programs/astroid/default.nix

@@ -120,7 +120,7 @@ in
     };
 
     accounts.email.accounts = mkOption {
-      type = with types; attrsOf (submodule (import ./astroid-accounts.nix));
+      type = with types; attrsOf (submodule (import ./accounts.nix));
     };
   };
 

modules/programs/firefox/default.nix

@@ -11,7 +11,7 @@ let
 
   moduleName = lib.concatStringsSep "." modulePath;
 
-  mkFirefoxModule = import ./firefox/mkFirefoxModule.nix;
+  mkFirefoxModule = import ./mkFirefoxModule.nix;
 in
 {
   meta.maintainers = [

modules/programs/floorp/default.nix

@@ -7,7 +7,7 @@ let
 
   cfg = config.programs.floorp;
 
-  mkFirefoxModule = import ./firefox/mkFirefoxModule.nix;
+  mkFirefoxModule = import ../firefox/mkFirefoxModule.nix;
 in
 {
   meta.maintainers = [ lib.hm.maintainers.bricked ];

modules/programs/getmail/default.nix

@@ -53,7 +53,7 @@ in
 {
   options = {
     accounts.email.accounts = lib.mkOption {
-      type = with lib.types; attrsOf (submodule (import ./getmail-accounts.nix));
+      type = with lib.types; attrsOf (submodule (import ./accounts.nix));
     };
   };