diff --git a/default.nix b/default.nix
index b7c564f..3d99b14 100644
--- a/default.nix
+++ b/default.nix
@@ -3,6 +3,8 @@
 }:
 
 let
+  baseModules = import ./modules/module-list.nix;
+  modules = [ configuration packages ] ++ baseModules;
 
   packages = { config, lib, pkgs, ... }: {
     _file = ./default.nix;
@@ -13,73 +15,11 @@ let
   };
 
   eval = pkgs.lib.evalModules {
+    inherit modules;
+    args = { inherit baseModules modules; };
     specialArgs = { modulesPath = ./modules; };
     check = true;
-    modules =
-      [ configuration
-        packages
-        ./modules/alias.nix
-        ./modules/security/pki
-        ./modules/security/sandbox
-        ./modules/system
-        ./modules/system/checks.nix
-        ./modules/system/activation-scripts.nix
-        ./modules/system/applications.nix
-        ./modules/system/defaults-write.nix
-        ./modules/system/defaults/LaunchServices.nix
-        ./modules/system/defaults/NSGlobalDomain.nix
-        ./modules/system/defaults/dock.nix
-        ./modules/system/defaults/finder.nix
-        ./modules/system/defaults/screencapture.nix
-        ./modules/system/defaults/smb.nix
-        ./modules/system/defaults/trackpad.nix
-        ./modules/system/etc.nix
-        ./modules/system/keyboard.nix
-        ./modules/system/launchd.nix
-        ./modules/system/shells.nix
-        ./modules/system/version.nix
-        ./modules/time
-        ./modules/networking
-        ./modules/nix
-        ./modules/nix/nix-darwin.nix
-        ./modules/nix/nix-info.nix
-        ./modules/nix/nixpkgs.nix
-        ./modules/environment
-        ./modules/fonts
-        ./modules/launchd
-        ./modules/services/activate-system
-        ./modules/services/buildkite-agent.nix
-        ./modules/services/chunkwm.nix
-        ./modules/services/emacs.nix
-        ./modules/services/khd
-        ./modules/services/kwm
-        ./modules/services/mail/offlineimap.nix
-        ./modules/services/mopidy.nix
-        ./modules/services/nix-daemon.nix
-        ./modules/services/nix-gc
-        ./modules/services/ofborg
-        ./modules/services/postgresql
-        ./modules/services/privoxy
-        ./modules/services/redis
-        ./modules/services/skhd
-        ./modules/services/synapse-bt.nix
-        ./modules/services/synergy
-        ./modules/programs/bash
-        ./modules/programs/fish.nix
-        ./modules/programs/gnupg.nix
-        ./modules/programs/man.nix
-        ./modules/programs/info
-        ./modules/programs/nix-index
-        ./modules/programs/nix-script.nix
-        ./modules/programs/ssh
-        ./modules/programs/tmux.nix
-        ./modules/programs/vim.nix
-        ./modules/programs/zsh
-        ./modules/users
-        ./modules/users/nixbld
-      ];
   };
-
 in
 
 {
diff --git a/modules/module-list.nix b/modules/module-list.nix
new file mode 100644
index 0000000..d46ffc9
--- /dev/null
+++ b/modules/module-list.nix
@@ -0,0 +1,62 @@
+[
+  ./alias.nix
+  ./documentation
+  ./security/pki
+  ./security/sandbox
+  ./system
+  ./system/checks.nix
+  ./system/activation-scripts.nix
+  ./system/applications.nix
+  ./system/defaults-write.nix
+  ./system/defaults/LaunchServices.nix
+  ./system/defaults/NSGlobalDomain.nix
+  ./system/defaults/dock.nix
+  ./system/defaults/finder.nix
+  ./system/defaults/screencapture.nix
+  ./system/defaults/smb.nix
+  ./system/defaults/trackpad.nix
+  ./system/etc.nix
+  ./system/keyboard.nix
+  ./system/launchd.nix
+  ./system/shells.nix
+  ./system/version.nix
+  ./time
+  ./networking
+  ./nix
+  ./nix/nix-darwin.nix
+  ./nix/nix-info.nix
+  ./nix/nixpkgs.nix
+  ./environment
+  ./fonts
+  ./launchd
+  ./services/activate-system
+  ./services/buildkite-agent.nix
+  ./services/chunkwm.nix
+  ./services/emacs.nix
+  ./services/khd
+  ./services/kwm
+  ./services/mail/offlineimap.nix
+  ./services/mopidy.nix
+  ./services/nix-daemon.nix
+  ./services/nix-gc
+  ./services/ofborg
+  ./services/postgresql
+  ./services/privoxy
+  ./services/redis
+  ./services/skhd
+  ./services/synapse-bt.nix
+  ./services/synergy
+  ./programs/bash
+  ./programs/fish.nix
+  ./programs/gnupg.nix
+  ./programs/man.nix
+  ./programs/info
+  ./programs/nix-index
+  ./programs/nix-script.nix
+  ./programs/ssh
+  ./programs/tmux.nix
+  ./programs/vim.nix
+  ./programs/zsh
+  ./users
+  ./users/nixbld
+]