diff --git a/modules/nixos/user/rialo/default.nix b/modules/nixos/user/rialo/default.nix
new file mode 100644
index 0000000..0583aa5
--- /dev/null
+++ b/modules/nixos/user/rialo/default.nix
@@ -0,0 +1,34 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib;
+with lib.metacfg;
+let
+  cfg = config.metacfg.user.rialo;
+in
+{
+  options.metacfg.user.rialo = with types; {
+    enable = mkBoolOpt false "Whether or not to enable the rialo user.";
+  };
+
+  config = mkIf cfg.enable {
+    users.users.rialo = {
+      isNormalUser = true;
+      home = "/home/rialo";
+      group = "users";
+      shell = pkgs.bash;
+      uid = 1001;
+      extraGroups = [
+        "wheel"
+        "docker"
+        "dialout"
+        "tss"
+      ];
+    };
+
+    nix.settings.trusted-users = [ "rialo" ];
+  };
+}
diff --git a/systems/x86_64-linux/amd/default.nix b/systems/x86_64-linux/amd/default.nix
index e95fbe2..cbb7f02 100644
--- a/systems/x86_64-linux/amd/default.nix
+++ b/systems/x86_64-linux/amd/default.nix
@@ -13,7 +13,6 @@ with lib.metacfg;
     ./acme.nix
     ./nginx.nix
     ./opencode.nix
-    ./rialo.nix
   ];
 
   services.rustdesk-server.signal.enable = false;
@@ -44,6 +43,7 @@ with lib.metacfg;
     secureboot.enable = true;
     homeprinter.enable = true;
     build.enable = true;
+    user.rialo.enable = true;
 
     system = {
       limits = {
diff --git a/systems/x86_64-linux/amd/rialo.nix b/systems/x86_64-linux/amd/rialo.nix
deleted file mode 100644
index 56a4e3d..0000000
--- a/systems/x86_64-linux/amd/rialo.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-{
-  users.users.rialo = {
-    isNormalUser = true;
-    home = "/home/rialo";
-    group = "users";
-    shell = pkgs.bash;
-    uid = 1001;
-    extraGroups = [
-      "wheel"
-      "docker"
-      "dialout"
-      "tss"
-    ];
-  };
-
-  nix.settings.trusted-users = [ "rialo" ];
-}
diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix
index d6f7d2a..79a41ee 100644
--- a/systems/x86_64-linux/x1/default.nix
+++ b/systems/x86_64-linux/x1/default.nix
@@ -53,6 +53,7 @@ with lib.metacfg;
     podman.enable = true;
     secureboot.enable = true;
     homeprinter.enable = true;
+    user.rialo.enable = true;
 
     system = {
       limits = {