diff --git a/hosts/brontes/default.nix b/hosts/brontes/default.nix
index c456a0d..880faf9 100644
--- a/hosts/brontes/default.nix
+++ b/hosts/brontes/default.nix
@@ -1,10 +1,12 @@
 # vim:fileencoding=utf-8:foldmethod=marker
 {
   pkgs,
-  username,
   config,
   ...
 }:
+let
+  inherit (config.modules.meta) username;
+in
 {
   imports = [
     ./hardware-configuration.nix
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index a3c750c..d45ddb5 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -1,10 +1,12 @@
 {
   pkgs,
-  username,
   config,
   inputs,
   ...
 }:
+let
+  inherit (config.modules.meta) username;
+in
 {
   imports = [
     ../../modules/home-manager.nix
diff --git a/hosts/default.nix b/hosts/default.nix
index cfdf10b..334f33c 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -7,10 +7,12 @@ let
     name = sys.hostname;
     value = mkSystem ({ inherit withSystem; } // sys);
   };
+  username = "ny";
 in
 {
   flake.nixosConfigurations = listToAttrs [
     (mkSystem' {
+      inherit username;
       hostname = "marr";
       system = "x86_64-linux";
       extraModules = [
@@ -20,12 +22,14 @@ in
     })
 
     (mkSystem' {
+      inherit username;
       hostname = "brontes";
       system = "x86_64-linux";
       extraModules = [ inputs.agenix.nixosModules.default ];
     })
 
     (mkSystem' {
+      inherit username;
       hostname = "shan";
       system = "x86_64-linux";
       extraModules = [
@@ -35,6 +39,7 @@ in
     })
 
     (mkSystem' {
+      inherit username;
       hostname = "raptus";
       system = "x86_64-linux";
       extraModules = [
@@ -44,6 +49,7 @@ in
     })
 
     (mkSystem' {
+      inherit username;
       hostname = "nihilus";
       system = "aarch64-linux";
       extraModules = [
diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix
index 354d8f4..17c7490 100644
--- a/hosts/marr/default.nix
+++ b/hosts/marr/default.nix
@@ -1,10 +1,13 @@
 # vim:fileencoding=utf-8:foldmethod=marker
 {
+  config,
   pkgs,
   inputs,
-  username,
   ...
 }:
+let
+  inherit (config.modules.meta) username;
+in
 {
   imports = [
     ./hardware-configuration.nix
diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix
index 49f430c..a607674 100644
--- a/hosts/marr/home.nix
+++ b/hosts/marr/home.nix
@@ -1,10 +1,12 @@
 {
-  username,
   pkgs,
   config,
   inputs,
   ...
 }:
+let
+  inherit (config.modules.meta) username;
+in
 {
   imports = [
     ../../modules/home-manager.nix
diff --git a/modules/users/ny.nix b/modules/users/ny.nix
index 8c9fa71..04a6ada 100644
--- a/modules/users/ny.nix
+++ b/modules/users/ny.nix
@@ -1,4 +1,7 @@
-{ username, pkgs, ... }:
+{ config, pkgs, ... }:
+let
+  inherit (config.modules.meta) username;
+in
 {
   users.users.${username} = {
     isNormalUser = true;
diff --git a/options/meta.nix b/options/meta.nix
index 93601a9..2ca3067 100644
--- a/options/meta.nix
+++ b/options/meta.nix
@@ -1,14 +1,28 @@
 { lib, ... }:
 let
-  inherit (lib) mkOption;
-  inherit (lib.types) nullOr str;
+  inherit (lib) mkOption stringLength;
+  inherit (lib.types) str strMatching;
+
+  validateUserName =
+    x:
+    assert (
+      stringLength x < 32 || abort "Username '${x}' is longer than 31 characters which is not allowed!"
+    );
+    x;
 in
 {
   options.modules.meta = {
     hostname = mkOption {
-      default = null;
-      type = nullOr str;
+      type = strMatching "^[[:alnum:]]([[:alnum:]_-]{0,61}[[:alnum:]])?$";
+      default = "";
       description = "The system's hostname.";
     };
+    username = mkOption {
+      default = "";
+      type = str;
+      apply = validateUserName;
+      # Should handle multiple users one day? maybe...
+      description = "This system's primary user.";
+    };
   };
 }
diff --git a/parts/lib/functions.nix b/parts/lib/functions.nix
index 0749f15..17d15d9 100644
--- a/parts/lib/functions.nix
+++ b/parts/lib/functions.nix
@@ -32,6 +32,7 @@ in
     {
       withSystem,
       hostname,
+      username,
       extraModules ? [ ],
       system,
     }:
@@ -43,13 +44,12 @@ in
           "${self}/hosts/${hostname}"
           "${self}/options"
           "${self}/modules"
-          { modules.meta.hostname = hostname; }
+          { modules.meta = { inherit hostname username; }; }
         ] ++ extraModules;
         specialArgs = {
           inherit inputs inputs';
           inherit self self';
           pubkeys = import ../../options/keys.nix { inherit lib; };
-          username = "ny";
         };
       }
     );