modules: move colors to home/modules, explicitly import all

flake.nix

@@ -145,7 +145,7 @@
         configuration = {
           imports = [
             ./home/home.nix
-            ./modules
+            ./modules/machineVars.nix
           ];
 
           machineVars = {
@@ -167,7 +167,8 @@
           inherit (pkgs) lib;
           modules = [
             "${home-manager}/nixos"
-            ./modules
+            ./modules/machineVars.nix
+            ./modules/socketActivation.nix
             ./hosts/common.nix
             ./hosts/${name}/configuration.nix
 
@@ -205,7 +206,7 @@
                   inherit pkgs;
                   inherit inputs;
                   inherit (pkgs) lib;
-                  inherit (config) machineVars colors;
+                  inherit (config) machineVars;
                   inherit (self) extendedLib;
                 };
               };

home/home.nix

@@ -1,9 +1,8 @@
-{ pkgs, lib, extendedLib, inputs, machineVars, colors, ... } @ args: let
+{ pkgs, lib, extendedLib, inputs, machineVars, ... } @ args: let
   inherit (lib) mkForce mkIf optionals;
   graphics = !machineVars.headless;
 in {
   inherit machineVars;
-  inherit colors;
 
   imports = [
     ./shellOptions.nix
@@ -25,7 +24,8 @@ in {
     ./programs/tmux.nix
     ./programs/zsh
 
-    ../modules
+    ../modules/machineVars.nix
+    ./modules/colors.nix
 
     inputs.secrets.outputs.home-config
   ] ++ optionals graphics [

modules/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./colors.nix
-    ./machineVars.nix
-  ];
-}

modules/machineVars.nix

@@ -3,6 +3,7 @@ let
   inherit (lib) types mkEnableOption mkOption mkIf;
   cfg = config.machineVars;
 in {
+  # TODO: namespace these options behind `local`
   options.machineVars = {
     headless = mkEnableOption "Whether or not the machine should have graphical output.";