Major overhaul of the nix side of things.

nix/modules/system-manager.nix

@@ -1,20 +1,14 @@
 { lib
 , config
-, pkgs
 , ...
 }:
 {
+  imports = [
+    ./etc.nix
+    ./systemd.nix
+  ];
+
   options.system-manager = {
-    services = lib.mkOption {
-      type = with lib.types; listOf str;
-      default = [ ];
-    };
-
-    etcFiles = lib.mkOption {
-      type = with lib.types; listOf str;
-      default = [ ];
-    };
-
     allowAnyDistro = lib.mkEnableOption "the usage of system-manager on untested distributions";
 
     preActivationAssertions = lib.mkOption {
@@ -44,28 +38,6 @@
     };
     system.stateVersion = lib.mkDefault lib.trivial.release;
 
-    assertions =
-      lib.flip map config.system-manager.etcFiles
-        (entry:
-          {
-            assertion = lib.hasAttr entry config.environment.etc;
-            message = lib.concatStringsSep " " [
-              "The entry ${entry} that was passed to system-manager.etcFiles"
-              "is not present in environment.etc"
-            ];
-          }
-        ) ++
-      lib.flip map config.system-manager.services
-        (entry:
-          {
-            assertion = lib.hasAttr entry config.systemd.services;
-            message = lib.concatStringsSep " " [
-              "The entry ${entry} that was passed to system-manager.services"
-              "is not present in systemd.services"
-            ];
-          }
-        );
-
     system-manager.preActivationAssertions = {
       osVersion =
         let
@@ -86,66 +58,5 @@
           '';
         };
     };
-
-    # Add the system directory for systemd
-    system-manager.etcFiles = [ "systemd/system" ];
-
-    environment.etc =
-      let
-        allowCollisions = false;
-
-        enabledUnits =
-          lib.filterAttrs
-            (name: _: lib.elem
-              name
-              (map (name: "${name}.service") config.system-manager.services))
-            config.systemd.units;
-      in
-      {
-        "systemd/system".source = lib.mkForce (pkgs.runCommand "system-manager-units"
-          {
-            preferLocalBuild = true;
-            allowSubstitutes = false;
-          }
-          ''
-            mkdir -p $out
-
-            for i in ${toString (lib.mapAttrsToList (n: v: v.unit) enabledUnits)}; do
-              fn=$(basename $i/*)
-              if [ -e $out/$fn ]; then
-                if [ "$(readlink -f $i/$fn)" = /dev/null ]; then
-                  ln -sfn /dev/null $out/$fn
-                else
-                  ${if allowCollisions then ''
-                    mkdir -p $out/$fn.d
-                    ln -s $i/$fn $out/$fn.d/overrides.conf
-                  '' else ''
-                    echo "Found multiple derivations configuring $fn!"
-                    exit 1
-                  ''}
-                fi
-              else
-                ln -fs $i/$fn $out/
-              fi
-            done
-
-            ${lib.concatStrings (
-              lib.mapAttrsToList (name: unit:
-                lib.concatMapStrings (name2: ''
-                  mkdir -p $out/'${name2}.wants'
-                  ln -sfn '../${name}' $out/'${name2}.wants'/
-                '') (unit.wantedBy or [])
-              ) enabledUnits)}
-
-            ${lib.concatStrings (
-              lib.mapAttrsToList (name: unit:
-                lib.concatMapStrings (name2: ''
-                  mkdir -p $out/'${name2}.requires'
-                  ln -sfn '../${name}' $out/'${name2}.requires'/
-                '') (unit.requiredBy or [])
-              ) enabledUnits)}
-          ''
-        );
-      };
   };
 }