diff --git a/nix/lib/nixos/configuration.nix b/nix/lib/nixos/configuration.nix
index 1d2dc8a..317f8bb 100644
--- a/nix/lib/nixos/configuration.nix
+++ b/nix/lib/nixos/configuration.nix
@@ -12,6 +12,10 @@ in
 {
   imports = [ ../../modules/nixos/desktop ];
 
+  _module.args = {
+    inherit inputs self username;
+  };
+
   nixpkgs = {
     config = {
       allowUnfree = true;
diff --git a/nix/lib/nixos/default.nix b/nix/lib/nixos/default.nix
index ad7060d..bcbf6b5 100644
--- a/nix/lib/nixos/default.nix
+++ b/nix/lib/nixos/default.nix
@@ -41,16 +41,6 @@ inputs.nixpkgs.lib.nixosSystem {
       };
     }
 
-    (import ../../modules/nixos/autorandr.nix)
-    (import ../../modules/nixos/i3.nix {
-      inherit
-        inputs
-        pkgs
-        self
-        username
-        ;
-    })
-
     configuration
     hardwareConfiguration
 
diff --git a/nix/modules/nixos/autorandr.nix b/nix/modules/nixos/desktop/autorandr.nix
similarity index 100%
rename from nix/modules/nixos/autorandr.nix
rename to nix/modules/nixos/desktop/autorandr.nix
diff --git a/nix/modules/nixos/desktop/default.nix b/nix/modules/nixos/desktop/default.nix
index 641e847..75c3226 100644
--- a/nix/modules/nixos/desktop/default.nix
+++ b/nix/modules/nixos/desktop/default.nix
@@ -1,8 +1,10 @@
 {
   imports = [
     ../.
+    ./autorandr.nix
     ./fonts.nix
     ./gitea.nix
+    ./i3.nix
     ./immich.nix
     ./jellyfin.nix
     ./xbanish.nix
diff --git a/nix/modules/nixos/i3.nix b/nix/modules/nixos/desktop/i3.nix
similarity index 100%
rename from nix/modules/nixos/i3.nix
rename to nix/modules/nixos/desktop/i3.nix