move user settings from nixosModules to userModules

flake.nix

@@ -78,6 +78,9 @@
     nixosModules.nixos =
       import ./nixosModules inputs;
 
+    nixosModules.users =
+      import ./userModules inputs;
+
     nixosConfigurations =
       inputs.nixpkgs.lib.genAttrs [
         "fallarbor"
@@ -100,6 +103,7 @@
               inputs.nur.nixosModules.nur
               inputs.raffauflabs.nixosModules.raffauflabs
               self.nixosModules.nixos
+              self.nixosModules.users
 
               {
                 home-manager = {

hosts/fallarbor/default.nix

@@ -4,7 +4,6 @@
   inputs,
   lib,
   pkgs,
-  self,
   ...
 }: {
   imports = [

nixosModules/default.nix

@@ -10,6 +10,5 @@ inputs: {
     ./desktop
     ./options.nix
     ./services
-    ./users
   ];
 }

nixosModules/options.nix

@@ -108,67 +108,5 @@
         };
       };
     };
-
-    users = {
-      defaultGroups = lib.mkOption {
-        description = "Default groups for desktop users.";
-        default = [
-          "dialout"
-          "docker"
-          "libvirtd"
-          "lp"
-          "networkmanager"
-          "scanner"
-          "transmission"
-          "video"
-          "wheel"
-        ];
-      };
-
-      aly = {
-        enable = lib.mkEnableOption "Aly's user.";
-
-        manageHome = lib.mkOption {
-          description = "Whether to enable aly's home directory.";
-          type = lib.types.bool;
-          default = config.ar.users.aly.enable;
-        };
-
-        password = lib.mkOption {
-          description = "Hashed password for aly.";
-          type = lib.types.str;
-        };
-      };
-
-      dustin = {
-        enable = lib.mkEnableOption "Dustin's user.";
-
-        manageHome = lib.mkOption {
-          description = "Whether to manage dustin's home directory.";
-          type = lib.types.bool;
-          default = config.ar.users.dustin.enable;
-        };
-
-        password = lib.mkOption {
-          description = "Hashed password for dustin.";
-          type = lib.types.str;
-        };
-      };
-
-      morgan = {
-        enable = lib.mkEnableOption "Morgan's user.";
-
-        manageHome = lib.mkOption {
-          description = "Whether to manage morgan's home directory.";
-          type = lib.types.bool;
-          default = config.ar.users.morgan.enable;
-        };
-
-        password = lib.mkOption {
-          description = "Hashed password for morgan.";
-          type = lib.types.str;
-        };
-      };
-    };
   };
 }

nixosModules/services/syncthing/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   imports = [./syncMusic.nix];

nixosModules/users/default.nix

@@ -1,25 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  pkgs,
-  self,
-  ...
-}: {
-  imports = [
-    ./aly
-    ./dustin
-    ./morgan
-  ];
-
-  users = {
-    mutableUsers = false;
-
-    users.root.openssh.authorizedKeys.keyFiles = [
-      ../../secrets/publicKeys/aly_lavaridge.pub
-      ../../secrets/publicKeys/aly_mauville.pub
-      ../../secrets/publicKeys/aly_petalburg.pub
-      ../../secrets/publicKeys/aly_rustboro.pub
-    ];
-  };
-}

userModules/aly/default.nix

@@ -8,7 +8,7 @@
     home-manager.users.aly =
       lib.attrsets.optionalAttrs
       config.ar.users.aly.manageHome
-      (import ../../../homes/aly);
+      (import ../../homes/aly);
 
     users.users.aly = {
       description = "Aly Raffauf";
@@ -24,10 +24,10 @@
         ];
 
         keyFiles = [
-          ../../../secrets/publicKeys/aly_lavaridge.pub
-          ../../../secrets/publicKeys/aly_mauville.pub
-          ../../../secrets/publicKeys/aly_petalburg.pub
-          ../../../secrets/publicKeys/aly_rustboro.pub
+          ../../secrets/publicKeys/aly_lavaridge.pub
+          ../../secrets/publicKeys/aly_mauville.pub
+          ../../secrets/publicKeys/aly_petalburg.pub
+          ../../secrets/publicKeys/aly_rustboro.pub
         ];
       };
 

userModules/default.nix

@@ -0,0 +1,24 @@
+inputs: {
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  imports = [
+    ./aly
+    ./dustin
+    ./morgan
+    ./options.nix
+  ];
+
+  users = {
+    mutableUsers = false;
+
+    users.root.openssh.authorizedKeys.keyFiles = [
+      ../secrets/publicKeys/aly_lavaridge.pub
+      ../secrets/publicKeys/aly_mauville.pub
+      ../secrets/publicKeys/aly_petalburg.pub
+      ../secrets/publicKeys/aly_rustboro.pub
+    ];
+  };
+}

userModules/dustin/default.nix

@@ -8,7 +8,7 @@
     home-manager.users.dustin =
       lib.attrsets.optionalAttrs
       config.ar.users.dustin.manageHome
-      (import ../../../homes/dustin);
+      (import ../../homes/dustin);
 
     users.users.dustin = {
       description = "Dustin Raffauf";

userModules/morgan/default.nix

@@ -8,7 +8,7 @@
     home-manager.users.morgan =
       lib.attrsets.optionalAttrs
       config.ar.users.morgan.manageHome
-      (import ../../../homes/morgan);
+      (import ../../homes/morgan);
 
     users.users.morgan = {
       description = "Morgan Tamayo";

userModules/options.nix

@@ -0,0 +1,42 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  options.ar.users = let
+    mkUser = user: {
+      enable = lib.mkEnableOption "${user}.";
+
+      manageHome = lib.mkOption {
+        description = "Whether to manage ${user}'s home directory.";
+        type = lib.types.bool;
+        default = true;
+      };
+
+      password = lib.mkOption {
+        description = "Hashed password for ${user}.";
+        type = lib.types.str;
+      };
+    };
+  in {
+    defaultGroups = lib.mkOption {
+      description = "Default groups for desktop users.";
+      default = [
+        "dialout"
+        "docker"
+        "libvirtd"
+        "lp"
+        "networkmanager"
+        "scanner"
+        "transmission"
+        "video"
+        "wheel"
+      ];
+    };
+
+    aly = mkUser "aly";
+    dustin = mkUser "dustin";
+    morgan = mkUser "morgan";
+  };
+}