From 17e4feb542ed93ba4b9c7c0297c872d315767816 Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Sat, 19 Feb 2022 23:03:59 +0000
Subject: [PATCH] Extract default user to separate module

---
 flake.nix                |  1 +
 nixos/modules/common.nix | 54 +++-------------------------------------
 nixos/modules/user.nix   | 52 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 51 deletions(-)
 create mode 100644 nixos/modules/user.nix

diff --git a/flake.nix b/flake.nix
index b484a26..b0cafe4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -92,6 +92,7 @@
 
       modules = mapAttrs (_: f: ./. + "/nixos/modules/${f}") {
         common = "common.nix";
+        user = "user.nix";
         build = "build.nix";
         dynamic-motd = "dynamic-motd.nix";
         tmproot = "tmproot.nix";
diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix
index 01f321c..d55ef55 100644
--- a/nixos/modules/common.nix
+++ b/nixos/modules/common.nix
@@ -1,29 +1,11 @@
-{ lib, pkgs, pkgs', inputs, options, config, ... }:
+{ lib, pkgs, pkgs', inputs, config, ... }:
 let
-  inherit (builtins) attrValues;
-  inherit (lib) flatten optional mkIf mkDefault mkMerge mkOption mkAliasDefinitions;
-  inherit (lib.my) mkOpt' mkBoolOpt' dummyOption mkDefault';
+  inherit (lib) flatten optional mkIf mkDefault mkMerge;
+  inherit (lib.my) mkBoolOpt' dummyOption;
 in
 {
   options = with lib.types; {
     my = {
-      # TODO: Move to separate module
-      user = {
-        enable = mkBoolOpt' true "Whether to create a primary user.";
-        config = mkOption {
-          type = options.users.users.type.nestedTypes.elemType;
-          default = { };
-          description = "User definition (as `users.users.*`).";
-        };
-        homeConfig = mkOption {
-          type = options.home-manager.users.type.nestedTypes.elemType;
-          default = { };
-          # Prevent docs traversing into all of home-manager
-          visible = "shallow";
-          description = "Home configuration (as `home-manager.users.*`)";
-        };
-      };
-
       ssh = {
         strictModes = mkBoolOpt' true
           ("Specifies whether sshd(8) should check file modes and ownership of the user's files and home directory "+
@@ -36,36 +18,6 @@ in
   };
 
   config = mkMerge [
-    (let
-      cfg = config.my.user;
-      user' = cfg.config;
-    in mkIf cfg.enable
-    {
-      my = {
-        user = {
-          config = {
-            name = mkDefault' "dev";
-            isNormalUser = true;
-            uid = mkDefault 1000;
-            extraGroups = mkDefault [ "wheel" ];
-            password = mkDefault "hunter2"; # TODO: secrets...
-            openssh.authorizedKeys.keyFiles = [ lib.my.authorizedKeys ];
-          };
-          # In order for this option to evaluate on its own, home-manager expects the `name` (which is derived from the
-          # parent attr name) to be the users name, aka `home-manager.users.<name>`
-          homeConfig = { _module.args.name = lib.mkForce user'.name; };
-        };
-
-        deploy.authorizedKeys = mkDefault user'.openssh.authorizedKeys;
-      };
-
-        # mkAliasDefinitions will copy the unmerged defintions to allow the upstream submodule to deal with
-      users.users.${user'.name} = mkAliasDefinitions options.my.user.config;
-
-      # NOTE: As the "outermost" module is still being evaluated in NixOS land, special params (e.g. pkgs) won't be
-      # passed to it
-      home-manager.users.${user'.name} = mkAliasDefinitions options.my.user.homeConfig;
-    })
     {
       home-manager = {
         # Installs packages in the system config instead of in the local profile on activation
diff --git a/nixos/modules/user.nix b/nixos/modules/user.nix
new file mode 100644
index 0000000..11852c0
--- /dev/null
+++ b/nixos/modules/user.nix
@@ -0,0 +1,52 @@
+{ lib, options, config, ... }:
+let
+  inherit (lib) mkIf mkDefault mkOption mkAliasDefinitions;
+  inherit (lib.my) mkBoolOpt' mkDefault';
+
+  cfg = config.my.user;
+  user' = cfg.config;
+in
+{
+  options.my.user = with lib.types; {
+    enable = mkBoolOpt' true "Whether to create a primary user.";
+    config = mkOption {
+      type = options.users.users.type.nestedTypes.elemType;
+      default = { };
+      description = "User definition (as `users.users.*`).";
+    };
+    homeConfig = mkOption {
+      type = options.home-manager.users.type.nestedTypes.elemType;
+      default = { };
+      # Prevent docs traversing into all of home-manager
+      visible = "shallow";
+      description = "Home configuration (as `home-manager.users.*`)";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    my = {
+      user = {
+        config = {
+          name = mkDefault' "dev";
+          isNormalUser = true;
+          uid = mkDefault 1000;
+          extraGroups = mkDefault [ "wheel" ];
+          password = mkDefault "hunter2"; # TODO: secrets...
+          openssh.authorizedKeys.keyFiles = [ lib.my.authorizedKeys ];
+        };
+        # In order for this option to evaluate on its own, home-manager expects the `name` (which is derived from the
+        # parent attr name) to be the users name, aka `home-manager.users.<name>`
+        homeConfig = { _module.args.name = lib.mkForce user'.name; };
+      };
+
+      deploy.authorizedKeys = mkDefault user'.openssh.authorizedKeys;
+    };
+
+    # mkAliasDefinitions will copy the unmerged defintions to allow the upstream submodule to deal with
+    users.users.${user'.name} = mkAliasDefinitions options.my.user.config;
+
+    # NOTE: As the "outermost" module is still being evaluated in NixOS land, special params (e.g. pkgs) won't be
+    # passed to it
+    home-manager.users.${user'.name} = mkAliasDefinitions options.my.user.homeConfig;
+  };
+}