Merge branch 'LnL7:master' into masterHEADmaster

1 files changed, 9 insertions, 17 deletions

diff --git a/modules/users/group.nix b/modules/users/group.nix
index cfda76f..da3feb1 100644
--- a/modules/users/group.nix
+++ b/modules/users/group.nix
@@ -1,41 +1,33 @@
 { name, lib, ... }:
 
-with lib;
-
 {
-  options = {
+  options = let
+    inherit (lib) mkOption types;
+  in {
     name = mkOption {
       type = types.str;
-      description = lib.mdDoc ''
+      default = name;
+      description = ''
         The group's name. If undefined, the name of the attribute set
         will be used.
       '';
     };
 
     gid = mkOption {
-      type = mkOptionType {
-        name = "gid";
-        check = t: isInt t && t > 501;
-      };
-      description = lib.mdDoc "The group's GID.";
+      type = types.int;
+      description = "The group's GID.";
     };
 
     members = mkOption {
       type = types.listOf types.str;
       default = [];
-      description = lib.mdDoc "The group's members.";
+      description = "The group's members.";
     };
 
     description = mkOption {
       type = types.str;
       default = "";
-      description = lib.mdDoc "The group's description.";
+      description = "The group's description.";
     };
   };
-
-  config = {
-
-    name = mkDefault name;
-
-  };
 }