diff --git a/devices/laptop.nix b/devices/laptop.nix
index a10b544..63297f7 100755
--- a/devices/laptop.nix
+++ b/devices/laptop.nix
@@ -191,4 +191,7 @@ inputs.nixpkgs.lib.nixosSystem {
     nixosModule
   ];
   system = "x86_64-linux";
+  specialArgs = {
+    deviceType = "primary";
+  };
 }
diff --git a/devices/mini-laptop.nix b/devices/mini-laptop.nix
index 20cee9c..e7069b4 100755
--- a/devices/mini-laptop.nix
+++ b/devices/mini-laptop.nix
@@ -37,4 +37,7 @@ inputs.nixpkgs.lib.nixosSystem {
     nixosModule
   ];
   system = "x86_64-linux";
+  specialArgs = {
+    deviceType = "primary";
+  };
 }
diff --git a/devices/mini-pc.nix b/devices/mini-pc.nix
index 8004942..fc1ca82 100755
--- a/devices/mini-pc.nix
+++ b/devices/mini-pc.nix
@@ -179,4 +179,7 @@ inputs.nixpkgs.lib.nixosSystem {
     nixosModule
   ];
   system = "x86_64-linux";
+  specialArgs = {
+    deviceType = "primary";
+  };
 }
diff --git a/devices/server.nix b/devices/server.nix
index 2bc116d..aca1fba 100755
--- a/devices/server.nix
+++ b/devices/server.nix
@@ -14,10 +14,7 @@ let
       };
 
       imports = with inputs; [
-        sops-nix.nixosModules.sops
         ./hardware/server.nix
-        self.nixosModules.default
-        self.homeConfigurations.default.nixosModule
 
         self.nixosModules.server.immich
         self.nixosModules.server.nextcloud
@@ -221,6 +218,13 @@ in
 inputs.nixpkgs.lib.nixosSystem {
   modules = with inputs; [
     nixosModule
+
+    self.nixosModules.default
+    self.homeConfigurations.default.nixosModule
+    sops-nix.nixosModules.sops
   ];
   system = "x86_64-linux";
+  specialArgs = {
+    deviceType = "server";
+  };
 }
diff --git a/devices/vds.nix b/devices/vds.nix
index c8ed011..9ec37df 100755
--- a/devices/vds.nix
+++ b/devices/vds.nix
@@ -157,4 +157,7 @@ inputs.nixpkgs.lib.nixosSystem {
     nixosModule
   ];
   system = "x86_64-linux";
+  specialArgs = {
+    deviceType = "vds";
+  };
 }
diff --git a/devices/wsl.nix b/devices/wsl.nix
index f26fb7d..e96d4e2 100755
--- a/devices/wsl.nix
+++ b/devices/wsl.nix
@@ -79,4 +79,7 @@ inputs.nixpkgs.lib.nixosSystem {
     nixosModule
   ];
   system = "x86_64-linux";
+  specialArgs = {
+    deviceType = "wsl";
+  };
 }
diff --git a/flake.nix b/flake.nix
index d1e332a..1a6a9f7 100755
--- a/flake.nix
+++ b/flake.nix
@@ -97,13 +97,16 @@
       immich-s = import ./pkgs/immich/default.nix { inherit pkgs; };
     in
     {
-      nixosConfigurations = {
-        atoridu = import ./devices/mini-pc.nix flakeContext; # atoridu
-        lamet = import ./devices/mini-laptop.nix flakeContext; # lamet
-        otreca = import ./devices/vds.nix flakeContext; # vds
-        sapphira = import ./devices/server.nix flakeContext; # sapphira
-        wsl = import ./devices/wsl.nix flakeContext; # wsl
-      };
+
+      #(import ./flake-part1.nix { inherit nixpkgs home-manager; system = "x86_64-linux"; })
+      # (import ./flake-part1.nix flakeContext)
+      # nixosConfigurations = {
+      #   atoridu = import ./devices/mini-pc.nix flakeContext; # atoridu
+      #   lamet = import ./devices/mini-laptop.nix flakeContext; # lamet
+      #   otreca = import ./devices/vds.nix flakeContext; # vds
+      #   sapphira = import ./devices/server.nix flakeContext; # sapphira
+      #   wsl = import ./devices/wsl.nix flakeContext; # wsl
+      # };
       nixosModules = {
         default = import ./modules/default.nix flakeContext;
         desktop = import ./modules/desktop/default.nix flakeContext;
@@ -150,3 +153,4 @@
       };
     };
 }
+// (import ./flake-part1.nix flakeContext)
diff --git a/modules/default.nix b/modules/default.nix
index 3bc43fd..6a6cabf 100755
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -2,24 +2,18 @@
 {
   config,
   lib,
+  xlib,
+  deviceType,
   ...
 }:
-let
-  xlib.device.type = config.xlib.device.type;
-  # isServer = config.xlib.device.type == "server";
-in
 {
-
-  _module.args.deviceType = config.xlib.device.type or "none";
-
   imports = with inputs; [
     ./essentials
     ./users.nix
     ./options.nix
     #./overlays.nix
     ./temp.nix
-    ./type.nix
-    #(./. + "/${deviceType}") # specific modules
+    (./. + "/${deviceType}") # specific modules
 
     home-manager.nixosModules.home-manager # home-manager module
     nix-index-database.nixosModules.nix-index # nix-index module
@@ -28,6 +22,7 @@ in
   #server.enable = (config.xlib.device.type == "server");
 
   _module.args.inputs = inputs;
+  _module.args.xlib = config.xlib;
   services.immich.package = lib.mkIf (
     config.xlib.device.type == "server"
   ) inputs.self.packages.x86_64-linux.immich;
diff --git a/modules/overlays.nix b/modules/overlays.nix
deleted file mode 100644
index 47c4b17..0000000
--- a/modules/overlays.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  nixpkgs.overlays = [ (import ../overlays/immich) ];
-}
diff --git a/modules/type.nix b/modules/type.nix
deleted file mode 100755
index 2c40938..0000000
--- a/modules/type.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  config,
-  deviceType,
-  ...
-}:
-{
-  imports = [
-    (./. + "/${deviceType}") # specific modules
-  ];
-}
diff --git a/modules/users.nix b/modules/users.nix
index 710be04..89c82af 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -1,5 +1,6 @@
 {
   config,
+  xlib,
   ...
 }:
 {
@@ -7,7 +8,7 @@
 
   users = {
     users = {
-      "${config.xlib.device.username}" = {
+      "${xlib.device.username}" = {
         isNormalUser = true;
         description = "Jor Oqyude";
         initialPassword = "1234";