From 532a573ffc3b6b6896bd371c9045746c39ebb806 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Sun, 4 Sep 2022 04:09:33 -0400
Subject: [PATCH] whoop

---
 machines/tablet/configuration.nix |  6 +++++-
 modules/linux/default.nix         | 17 -----------------
 modules/nix-on-droid/default.nix  |  2 ++
 modules/options.nix               | 20 +++++++++++++++++++-
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/machines/tablet/configuration.nix b/machines/tablet/configuration.nix
index e3d9969..d09ce79 100644
--- a/machines/tablet/configuration.nix
+++ b/machines/tablet/configuration.nix
@@ -1,6 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
-
+  nathan = {
+    config = {
+      isDesktop = true;
+    };
+  };
   home-manager.config = import ./home.nix;
 }
diff --git a/modules/linux/default.nix b/modules/linux/default.nix
index 2966452..8276906 100644
--- a/modules/linux/default.nix
+++ b/modules/linux/default.nix
@@ -112,23 +112,6 @@ in
           description = "Whether to install the 'nathan' user";
           type = lib.types.bool;
         };
-        # Name of the user to install
-        user = mkOption {
-          default = "nathan";
-          example = "nathan";
-          description = "Username to use for common configuration";
-          type = lib.types.str;
-        };
-        # Name of the user to install
-        email = mkOption {
-          default = "nathan@mccarty.io";
-          example = "nathan@mccarty.io";
-          description = "Email to use for common configuration";
-          type = lib.types.str;
-        };
-        # Is this system a desktop?
-        # Off by default
-        isDesktop = mkEnableOption "Desktop specific settings";
         # Should we harden this system?
         # On by default
         harden = mkEnableOptionT "Apply system hardening";
diff --git a/modules/nix-on-droid/default.nix b/modules/nix-on-droid/default.nix
index b43c203..759ed24 100644
--- a/modules/nix-on-droid/default.nix
+++ b/modules/nix-on-droid/default.nix
@@ -25,5 +25,7 @@ in
 
     # Set login shell
     user.shell = "${pkgs.fish}/bin/fish";
+
+    nathan.config.user = "nix-on-droid";
   };
 }
diff --git a/modules/options.nix b/modules/options.nix
index d47dcb2..546629d 100644
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -18,7 +18,25 @@ in
         };
       };
       # General system configuration
-      config = { };
+      config = {
+        # Name of the user to install
+        user = mkOption {
+          default = "nathan";
+          example = "nathan";
+          description = "Username to use for common configuration";
+          type = lib.types.str;
+        };
+        # Name of the user to install
+        email = mkOption {
+          default = "nathan@mccarty.io";
+          example = "nathan@mccarty.io";
+          description = "Email to use for common configuration";
+          type = lib.types.str;
+        };
+        # Is this system a desktop?
+        # Off by default
+        isDesktop = mkEnableOption "Desktop specific settings";
+      };
     };
   };
 }