refactor: sane.programs.$foo.service: specify type concretely

modules/programs/default.nix

@@ -216,7 +216,7 @@ let
         '';
       };
       services = mkOption {
-        type = types.attrsOf types.anything; # options.sane.users.value.type;
+        type = options.sane.user._options.services.type;
         default = {};
         description = ''
           user services to define if this package is enabled.

modules/users/default.nix

@@ -108,8 +108,7 @@ let
       ];
     };
   });
-  userOptions = {
-    options = with lib; {
+  userOptions = with lib; {
     fs = mkOption {
       # map to listOf attrs so that we can allow multiple assigners to the same path
       # w/o worrying about merging at this layer, and defer merging to modules/fs instead.
@@ -155,11 +154,10 @@ let
       '';
     };
   };
-  };
   userModule = let
     nixConfig = config;
   in with lib; types.submodule ({ name, config, ... }: {
-    options = userOptions.options // {
+    options = userOptions// {
       default = mkOption {
         type = types.bool;
         default = false;
@@ -335,11 +333,13 @@ in
     };
 
     sane.user = mkOption {
-      type = types.nullOr (types.submodule userOptions);
+      type = types.nullOr (types.submodule { options = userOptions; });
       default = null;
       description = ''
         options to pass down to the default user
       '';
+    } // {
+      _options = userOptions;
     };
 
     sane.defaultUser = mkOption {