diff --git a/lib/config.nix b/lib/config.nix
index 1b8abc7..5463ac4 100644
--- a/lib/config.nix
+++ b/lib/config.nix
@@ -14,7 +14,10 @@ deviceName:
 let
   inherit (nixpkgs) lib;
 
-  CustomOptions = ../options;
+  DeviceCustomOptions = ../options/device;
+  HostCustomOptions = ../options/host;
+  HomeCustomOptions = ../options/home;
+
   DeviceConfig = ../devices/${deviceName};
   HostConfig = ../users/${hostName}/host;
   HomeConfig = ../users/${userName}/home;
@@ -57,6 +60,9 @@ lib.nixosSystem {
   specialArgs = additionalArgs;
 
   modules = [
+    DeviceCustomOptions
+    HostCustomOptions
+
     CustomOptions
     DeviceConfig
     HostConfig
@@ -74,6 +80,7 @@ lib.nixosSystem {
     {
       home-manager = {
         users.${userName} = import HomeConfig;
+        users.${userName} = import HomeCustomOptions;
         useGlobalPkgs = true;
         useUserPackages = true;
         extraSpecialArgs = additionalArgs;
diff --git a/options/default.nix b/options/device/default.nix
similarity index 100%
rename from options/default.nix
rename to options/device/default.nix
diff --git a/options/home/default.nix b/options/home/default.nix
new file mode 100644
index 0000000..afd0b87
--- /dev/null
+++ b/options/home/default.nix
@@ -0,0 +1,7 @@
+{ customFunctions, ... }:
+{
+  imports = customFunctions.scan {
+    path = ./.;
+    exclude = [ ./default.nix ];
+  };
+}
diff --git a/options/host/default.nix b/options/host/default.nix
new file mode 100644
index 0000000..afd0b87
--- /dev/null
+++ b/options/host/default.nix
@@ -0,0 +1,7 @@
+{ customFunctions, ... }:
+{
+  imports = customFunctions.scan {
+    path = ./.;
+    exclude = [ ./default.nix ];
+  };
+}