diff --git a/configuration.nix b/configuration.nix
index c8189f8..837bd1a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,16 +1,10 @@
-{ config, pkgs, lib, ... }:
-
-let
-  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
-in
-{
+{ config, pkgs, lib, ... }: {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    (import "${home-manager}/nixos")
     ./nix-settings.nix
     ./boot.nix
-    ./users/servostar/user.nix
+    ./users
     ./.luks-swap.nix
     ./fonts.nix
     ./extra
diff --git a/users/default.nix b/users/default.nix
new file mode 100644
index 0000000..b277eef
--- /dev/null
+++ b/users/default.nix
@@ -0,0 +1,9 @@
+let
+    home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
+in
+{
+    imports = [
+        (import "${home-manager}/nixos")
+        ./servostar/user.nix
+    ];
+}