mad

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;

modules/overlays.nix

@@ -1,7 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  nixpkgs.overlays = [ (import ../overlays/immich) ];
-}

modules/type.nix

@@ -1,10 +0,0 @@
-{
-  config,
-  deviceType,
-  ...
-}:
-{
-  imports = [
-    (./. + "/${deviceType}") # specific modules
-  ];
-}

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";