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/accounts/calendar.nix

@@ -149,9 +149,9 @@ in
       type = types.attrsOf (
         types.submodule [
           calendarOpts
-          (import ../programs/vdirsyncer-accounts.nix)
-          (import ../programs/khal-accounts.nix)
-          (import ../programs/khal-calendar-accounts.nix)
+          (import ../programs/vdirsyncer/accounts.nix)
+          (import ../programs/khal/accounts.nix)
+          (import ../programs/khal/calendar-accounts.nix)
         ]
       );
       default = { };

modules/accounts/contacts.nix

@@ -140,9 +140,9 @@ in
       type = types.attrsOf (
         types.submodule [
           contactOpts
-          (import ../programs/vdirsyncer-accounts.nix)
-          (import ../programs/khal-accounts.nix)
-          (import ../programs/khal-contact-accounts.nix)
+          (import ../programs/vdirsyncer/accounts.nix)
+          (import ../programs/khal/accounts.nix)
+          (import ../programs/khal/contact-accounts.nix)
         ]
       );
       default = { };

modules/modules.nix

@@ -57,457 +57,6 @@ let
       ./misc/xdg-user-dirs.nix
       ./misc/xdg.nix
       ./misc/xfconf.nix
-      ./programs/abook.nix
-      ./programs/aerc.nix
-      ./programs/aerospace.nix
-      ./programs/afew.nix
-      ./programs/aichat.nix
-      ./programs/alacritty.nix
-      ./programs/alot.nix
-      ./programs/antidote.nix
-      ./programs/anyrun.nix
-      ./programs/aria2.nix
-      ./programs/ashell.nix
-      ./programs/astroid.nix
-      ./programs/atuin.nix
-      ./programs/autojump.nix
-      ./programs/autorandr.nix
-      ./programs/awscli.nix
-      ./programs/bacon.nix
-      ./programs/bash.nix
-      ./programs/bashmount.nix
-      ./programs/bat.nix
-      ./programs/beets.nix
-      ./programs/bemenu.nix
-      ./programs/borgmatic.nix
-      ./programs/bottom.nix
-      ./programs/boxxy.nix
-      ./programs/broot.nix
-      ./programs/browserpass.nix
-      ./programs/btop.nix
-      ./programs/bun.nix
-      ./programs/carapace.nix
-      ./programs/cava.nix
-      ./programs/cavalier.nix
-      ./programs/chawan.nix
-      ./programs/chromium.nix
-      ./programs/clock-rs.nix
-      ./programs/cmus.nix
-      ./programs/codex.nix
-      ./programs/command-not-found/command-not-found.nix
-      ./programs/comodoro.nix
-      ./programs/darcs.nix
-      ./programs/dircolors.nix
-      ./programs/direnv.nix
-      ./programs/discocss.nix
-      ./programs/distrobox.nix
-      ./programs/earthly.nix
-      ./programs/eclipse.nix
-      ./programs/element-desktop.nix
-      ./programs/emacs.nix
-      ./programs/eww.nix
-      ./programs/eza.nix
-      ./programs/fastfetch.nix
-      ./programs/fd.nix
-      ./programs/feh.nix
-      ./programs/firefox.nix
-      ./programs/fish.nix
-      ./programs/floorp.nix
-      ./programs/foliate.nix
-      ./programs/foot.nix
-      ./programs/freetube.nix
-      ./programs/fuzzel.nix
-      ./programs/fzf.nix
-      ./programs/gallery-dl.nix
-      ./programs/getmail.nix
-      ./programs/gh-dash.nix
-      ./programs/gh.nix
-      ./programs/ghostty.nix
-      ./programs/git-cliff.nix
-      ./programs/git-credential-oauth.nix
-      ./programs/git-worktree-switcher.nix
-      ./programs/git.nix
-      ./programs/gitui.nix
-      ./programs/gnome-shell.nix
-      ./programs/gnome-terminal.nix
-      ./programs/go.nix
-      ./programs/gpg.nix
-      ./programs/gradle.nix
-      ./programs/granted.nix
-      ./programs/halloy.nix
-      ./programs/havoc.nix
-      ./programs/helix.nix
-      ./programs/hexchat.nix
-      ./programs/himalaya.nix
-      ./programs/home-manager.nix
-      ./programs/hstr.nix
-      ./programs/htop.nix
-      ./programs/hwatch.nix
-      ./programs/hyfetch.nix
-      ./programs/hyprlock.nix
-      ./programs/i3bar-river.nix
-      ./programs/i3blocks.nix
-      ./programs/i3status-rust.nix
-      ./programs/i3status.nix
-      ./programs/iamb.nix
-      ./programs/imv.nix
-      ./programs/info.nix
-      ./programs/inori.nix
-      ./programs/ion.nix
-      ./programs/irssi.nix
-      ./programs/java.nix
-      ./programs/jetbrains-remote.nix
-      ./programs/joplin-desktop.nix
-      ./programs/joshuto.nix
-      ./programs/jq.nix
-      ./programs/jqp.nix
-      ./programs/jujutsu.nix
-      ./programs/just.nix
-      ./programs/k9s.nix
-      ./programs/kakoune.nix
-      ./programs/keepassxc.nix
-      ./programs/keychain.nix
-      ./programs/khal.nix
-      ./programs/khard.nix
-      ./programs/kickoff.nix
-      ./programs/kitty.nix
-      ./programs/kodi.nix
-      ./programs/kubecolor.nix
-      ./programs/lapce.nix
-      ./programs/lazydocker.nix
-      ./programs/lazygit.nix
-      ./programs/lazysql.nix
-      ./programs/ledger.nix
-      ./programs/less.nix
-      ./programs/lesspipe.nix
-      ./programs/lf.nix
-      ./programs/librewolf.nix
-      ./programs/lieer.nix
-      ./programs/looking-glass-client.nix
-      ./programs/lsd.nix
-      ./programs/lutris.nix
-      ./programs/man.nix
-      ./programs/mangohud.nix
-      ./programs/matplotlib.nix
-      ./programs/mbsync.nix
-      ./programs/mc.nix
-      ./programs/mcfly.nix
-      ./programs/meli.nix
-      ./programs/mercurial.nix
-      ./programs/mergiraf.nix
-      ./programs/micro.nix
-      ./programs/mise.nix
-      ./programs/mods.nix
-      ./programs/mpv.nix
-      ./programs/mpvpaper.nix
-      ./programs/mr.nix
-      ./programs/msmtp.nix
-      ./programs/mu.nix
-      ./programs/mujmap.nix
-      ./programs/navi.nix
-      ./programs/ncmpcpp.nix
-      ./programs/ncspot.nix
-      ./programs/ne.nix
-      ./programs/neomutt.nix
-      ./programs/neovide.nix
-      ./programs/neovim.nix
-      ./programs/newsboat.nix
-      ./programs/nh.nix
-      ./programs/nheko.nix
-      ./programs/niriswitcher.nix
-      ./programs/nix-index.nix
-      ./programs/nix-init.nix
-      ./programs/nix-your-shell.nix
-      ./programs/nnn.nix
-      ./programs/noti.nix
-      ./programs/notmuch.nix
-      ./programs/numbat.nix
-      ./programs/nushell.nix
-      ./programs/nyxt.nix
-      ./programs/obs-studio.nix
-      ./programs/obsidian.nix
-      ./programs/octant.nix
-      ./programs/offlineimap.nix
-      ./programs/oh-my-posh.nix
-      ./programs/onagre.nix
-      ./programs/onedrive.nix
-      ./programs/onlyoffice.nix
-      ./programs/opam.nix
-      ./programs/openstackclient.nix
-      ./programs/pandoc.nix
-      ./programs/papis.nix
-      ./programs/password-store.nix
-      ./programs/pay-respects.nix
-      ./programs/pazi.nix
-      ./programs/pet.nix
-      ./programs/pgcli.nix
-      ./programs/pidgin.nix
-      ./programs/pistol.nix
-      ./programs/piston-cli.nix
-      ./programs/pls.nix
-      ./programs/poetry.nix
-      ./programs/powerline-go.nix
-      ./programs/pqiv.nix
-      ./programs/ptyxis.nix
-      ./programs/pubs.nix
-      ./programs/pyenv.nix
-      ./programs/pylint.nix
-      ./programs/pywal.nix
-      ./programs/qcal.nix
-      ./programs/qutebrowser.nix
-      ./programs/ranger.nix
-      ./programs/rbenv.nix
-      ./programs/rbw.nix
-      ./programs/rclone.nix
-      ./programs/readline.nix
-      ./programs/rio.nix
-      ./programs/ripgrep-all.nix
-      ./programs/ripgrep.nix
-      ./programs/rmpc.nix
-      ./programs/rofi-pass.nix
-      ./programs/rofi.nix
-      ./programs/rtorrent.nix
-      ./programs/ruff.nix
-      ./programs/sagemath.nix
-      ./programs/sapling.nix
-      ./programs/sbt.nix
-      ./programs/scmpuff.nix
-      ./programs/script-directory.nix
-      ./programs/senpai.nix
-      ./programs/sesh.nix
-      ./programs/sftpman.nix
-      ./programs/sioyek.nix
-      ./programs/sketchybar.nix
-      ./programs/skim.nix
-      ./programs/sm64ex.nix
-      ./programs/smug.nix
-      ./programs/spotify-player.nix
-      ./programs/sqls.nix
-      ./programs/ssh.nix
-      ./programs/starship.nix
-      ./programs/streamlink.nix
-      ./programs/superfile.nix
-      ./programs/sway-easyfocus.nix
-      ./programs/swayimg.nix
-      ./programs/swaylock.nix
-      ./programs/swayr.nix
-      ./programs/taskwarrior.nix
-      ./programs/tealdeer.nix
-      ./programs/television.nix
-      ./programs/terminator.nix
-      ./programs/termite.nix
-      ./programs/tex-fmt.nix
-      ./programs/texlive.nix
-      ./programs/thefuck.nix
-      ./programs/thunderbird.nix
-      ./programs/timidity.nix
-      ./programs/tint2.nix
-      ./programs/tiny.nix
-      ./programs/tmate.nix
-      ./programs/tmux.nix
-      ./programs/todoman.nix
-      ./programs/tofi.nix
-      ./programs/topgrade.nix
-      ./programs/translate-shell.nix
-      ./programs/urxvt.nix
-      ./programs/uv.nix
-      ./programs/vdirsyncer.nix
-      ./programs/vesktop.nix
-      ./programs/vifm.nix
-      ./programs/vim-vint.nix
-      ./programs/vim.nix
-      ./programs/vinegar.nix
-      ./programs/visidata.nix
-      ./programs/vscode.nix
-      ./programs/vscode/haskell.nix
-      ./programs/wallust.nix
-      ./programs/watson.nix
-      ./programs/waveterm.nix
-      ./programs/waybar.nix
-      ./programs/waylogout.nix
-      ./programs/wayprompt.nix
-      ./programs/wezterm.nix
-      ./programs/wlogout.nix
-      ./programs/wofi.nix
-      ./programs/xmobar.nix
-      ./programs/xplr.nix
-      ./programs/yambar.nix
-      ./programs/yazi.nix
-      ./programs/yt-dlp.nix
-      ./programs/z-lua.nix
-      ./programs/zathura.nix
-      ./programs/zed-editor.nix
-      ./programs/zellij.nix
-      ./programs/zk.nix
-      ./programs/zoxide.nix
-      ./programs/zplug.nix
-      ./programs/zsh.nix
-      ./programs/zsh/prezto.nix
-      ./programs/zsh/zsh-abbr.nix
-      ./services/activitywatch.nix
-      ./services/amberol.nix
-      ./services/arrpc.nix
-      ./services/autorandr.nix
-      ./services/avizo.nix
-      ./services/barrier.nix
-      ./services/batsignal.nix
-      ./services/betterlockscreen.nix
-      ./services/blanket.nix
-      ./services/blueman-applet.nix
-      ./services/borgmatic.nix
-      ./services/cachix-agent.nix
-      ./services/caffeine.nix
-      ./services/cbatticon.nix
-      ./services/clipcat.nix
-      ./services/cliphist.nix
-      ./services/clipman.nix
-      ./services/clipmenu.nix
-      ./services/clipse.nix
-      ./services/comodoro.nix
-      ./services/conky.nix
-      ./services/copyq.nix
-      ./services/darkman.nix
-      ./services/davmail.nix
-      ./services/devilspie2.nix
-      ./services/dropbox.nix
-      ./services/dunst.nix
-      ./services/dwm-status.nix
-      ./services/easyeffects.nix
-      ./services/emacs.nix
-      ./services/espanso.nix
-      ./services/etesync-dav.nix
-      ./services/flameshot.nix
-      ./services/fluidsynth.nix
-      ./services/fnott.nix
-      ./services/fusuma.nix
-      ./services/getmail.nix
-      ./services/git-sync.nix
-      ./services/glance.nix
-      ./services/gnome-keyring.nix
-      ./services/gpg-agent.nix
-      ./services/grobi.nix
-      ./services/gromit-mpx.nix
-      ./services/home-manager-auto-expire.nix
-      ./services/home-manager-auto-upgrade.nix
-      ./services/hound.nix
-      ./services/hypridle.nix
-      ./services/hyprpaper.nix
-      ./services/hyprpolkitagent.nix
-      ./services/hyprsunset.nix
-      ./services/imapnotify.nix
-      ./services/jankyborders.nix
-      ./services/jellyfin-mpv-shim.nix
-      ./services/kanshi.nix
-      ./services/kbfs.nix
-      ./services/kdeconnect.nix
-      ./services/keybase.nix
-      ./services/keynav.nix
-      ./services/librespot.nix
-      ./services/lieer.nix
-      ./services/linux-wallpaperengine.nix
-      ./services/listenbrainz-mpd.nix
-      ./services/lorri.nix
-      ./services/ludusavi.nix
-      ./services/lxqt-policykit-agent.nix
-      ./services/macos-remap-keys
-      ./services/mako.nix
-      ./services/mbsync.nix
-      ./services/megasync.nix
-      ./services/mopidy.nix
-      ./services/mpd-discord-rpc.nix
-      ./services/mpd-mpris.nix
-      ./services/mpd.nix
-      ./services/mpdris2.nix
-      ./services/mpdscribble.nix
-      ./services/mpris-proxy.nix
-      ./services/muchsync.nix
-      ./services/network-manager-applet.nix
-      ./services/nextcloud-client.nix
-      ./services/nix-gc.nix
-      ./services/notify-osd.nix
-      ./services/ollama.nix
-      ./services/opensnitch-ui.nix
-      ./services/osmscout-server.nix
-      ./services/owncloud-client.nix
-      ./services/pantalaimon.nix
-      ./services/parcellite.nix
-      ./services/pass-secret-service.nix
-      ./services/pasystray.nix
-      ./services/pbgopy.nix
-      ./services/picom.nix
-      ./services/plan9port.nix
-      ./services/playerctld.nix
-      ./services/plex-mpv-shim.nix
-      ./services/podman-linux
-      ./services/polkit-gnome.nix
-      ./services/polybar.nix
-      ./services/poweralertd.nix
-      ./services/psd.nix
-      ./services/pueue.nix
-      ./services/pulseeffects.nix
-      ./services/random-background.nix
-      ./services/recoll.nix
-      ./services/redshift-gammastep/gammastep.nix
-      ./services/redshift-gammastep/redshift.nix
-      ./services/remmina.nix
-      ./services/restic.nix
-      ./services/rsibreak.nix
-      ./services/safeeyes.nix
-      ./services/screen-locker.nix
-      ./services/sctd.nix
-      ./services/shikane.nix
-      ./services/signaturepdf.nix
-      ./services/skhd.nix
-      ./services/snixembed.nix
-      ./services/spotifyd.nix
-      ./services/ssh-agent.nix
-      ./services/stalonetray.nix
-      ./services/status-notifier-watcher.nix
-      ./services/swayidle.nix
-      ./services/swaync.nix
-      ./services/swayosd.nix
-      ./services/swww.nix
-      ./services/sxhkd.nix
-      ./services/syncthing.nix
-      ./services/systembus-notify.nix
-      ./services/taffybar.nix
-      ./services/tahoe-lafs.nix
-      ./services/taskwarrior-sync.nix
-      ./services/tldr-update.nix
-      ./services/trayer.nix
-      ./services/trayscale.nix
-      ./services/twmn.nix
-      ./services/udiskie.nix
-      ./services/unclutter.nix
-      ./services/unison.nix
-      ./services/vdirsyncer.nix
-      ./services/volnoti.nix
-      ./services/way-displays.nix
-      ./services/wayvnc.nix
-      ./services/window-managers/awesome.nix
-      ./services/window-managers/bspwm/default.nix
-      ./services/window-managers/fluxbox.nix
-      ./services/window-managers/herbstluftwm.nix
-      ./services/window-managers/hyprland.nix
-      ./services/window-managers/i3-sway/i3.nix
-      ./services/window-managers/i3-sway/sway.nix
-      ./services/window-managers/i3-sway/swaynag.nix
-      ./services/window-managers/labwc/labwc.nix
-      ./services/window-managers/river.nix
-      ./services/window-managers/spectrwm.nix
-      ./services/window-managers/wayfire.nix
-      ./services/window-managers/xmonad.nix
-      ./services/wlsunset.nix
-      ./services/wluma.nix
-      ./services/wob.nix
-      ./services/wpaperd.nix
-      ./services/xcape.nix
-      ./services/xembed-sni-proxy.nix
-      ./services/xidlehook.nix
-      ./services/xscreensaver.nix
-      ./services/xsettingsd.nix
-      ./services/xsuspender.nix
-      ./services/yubikey-agent.nix
       ./systemd.nix
       ./targets/darwin
       ./targets/generic-linux.nix
@@ -525,6 +74,20 @@ let
         KeePassX is no longer maintained.
       '')
     ]
+    ++ (lib.concatMap
+      (
+        dir:
+        lib.pipe dir [
+          builtins.readDir
+          (lib.filterAttrs (_path: kind: kind == "directory"))
+          (lib.mapAttrsToList (path: _kind: lib.path.append dir path))
+        ]
+      )
+      [
+        ./services
+        ./programs
+      ]
+    )
     ++ lib.optional useNixpkgsModule ./misc/nixpkgs.nix
     ++ lib.optional (!useNixpkgsModule) ./misc/nixpkgs-disabled.nix;
 

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));
     };
   };