diff --git a/Droidnix/README.org b/Droidnix/README.org
index 14e023181..663bb24a9 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -72,39 +72,76 @@ The Nix flake definition for Droidnix.
 #+BEGIN_SRC nix :tangle flake.nix :noweb tangle :mkdirp yes :eval never-html
 {
   description = "Droidnix: A dendritic NixOS + Home Manager configuration";
+
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
-                    };
+    };
+
     hyprland.url = "github:hyprwm/Hyprland";
     flake-parts.url = "github:hercules-ci/flake-parts";
     import-tree.url = "github:vic/import-tree";
+
     stylix = {
-          url = "github:nix-community/stylix";
-          inputs.nixpkgs.follows = "nixpkgs";
-            };
+      url = "github:nix-community/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     emacs-overlay = {
       url = "github:nix-community/emacs-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
-                    };
+    };
+
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
-                  };
+    };
   };
 
-  outputs = inputs@{flake-parts, self, nixpkgs,home-manager, emacs-overlay, zen-browser, hyprland, stylix, import-tree,...}:
-  flake-parts.lib.mkFlake { inherit inputs; }
-      {
-        # flake-parts requires you to define systems
-        systems = [ "x86_64-linux" ];
-        imports = [
-          (import-tree ./generated/modules)             # Auto-loads your modules
-          ./generated/hosts/traveldroid/traveldroid.nix  # Explicitly load grouped host
-        ];
+  outputs = inputs@{
+    flake-parts,
+    self,
+    nixpkgs,
+    home-manager,
+    emacs-overlay,
+    zen-browser,
+    hyprland,
+    stylix,
+    import-tree,
+    ...
+  }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+
+      # Declare supported systems for flake-parts
+      systems = [ "x86_64-linux" ];
+
+      # Import dendritic/flake modules here
+      imports = [
+        (import-tree ./generated/modules)  # Only mySystem.* stuff
+      ];
+
+      # Define NixOS configurations for hosts
+      flake = {
+        nixosConfigurations.traveldroid =
+          nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+
+            modules = [
+              # Host-specific configuration (NixOS context)
+              ./generated/hosts/traveldroid/traveldroid.nix
+
+              # Boot configuration (NixOS context)
+              ./generated/hosts/traveldroid/boot.nix
+
+              # Stylix NixOS module
+              stylix.nixosModules.default
+            ];
+          };
       };
+    };
 }
 #+END_SRC
 
@@ -339,8 +376,8 @@ in
 }
 #+END_SRC
 
-** =generated/modules/system/boot.nix=
-#+BEGIN_SRC nix :tangle generated/modules/system/boot.nix :noweb tangle :mkdirp yes :eval never-html
+** =generated/hosts/traveldroid/boot.nix=
+#+BEGIN_SRC nix :tangle generated/hosts/traveldroid/boot.nix :noweb tangle :mkdirp yes :eval never-html
 # ./generated/hosts/traveldroid/traveldroid.nix
 { config, pkgs, lib, ... }:
 
diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index 3d45439c0..71ec339cb 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -1,36 +1,73 @@
 {
   description = "Droidnix: A dendritic NixOS + Home Manager configuration";
+
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
-                    };
+    };
+
     hyprland.url = "github:hyprwm/Hyprland";
     flake-parts.url = "github:hercules-ci/flake-parts";
     import-tree.url = "github:vic/import-tree";
+
     stylix = {
-          url = "github:nix-community/stylix";
-          inputs.nixpkgs.follows = "nixpkgs";
-            };
+      url = "github:nix-community/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     emacs-overlay = {
       url = "github:nix-community/emacs-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
-                    };
+    };
+
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
-                  };
+    };
   };
 
-  outputs = inputs@{flake-parts, self, nixpkgs,home-manager, emacs-overlay, zen-browser, hyprland, stylix, import-tree,...}:
-  flake-parts.lib.mkFlake { inherit inputs; }
-      {
-        # flake-parts requires you to define systems
-        systems = [ "x86_64-linux" ];
-        imports = [
-          (import-tree ./generated/modules)             # Auto-loads your modules
-          ./generated/hosts/traveldroid/traveldroid.nix  # Explicitly load grouped host
-        ];
+  outputs = inputs@{
+    flake-parts,
+    self,
+    nixpkgs,
+    home-manager,
+    emacs-overlay,
+    zen-browser,
+    hyprland,
+    stylix,
+    import-tree,
+    ...
+  }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+
+      # Declare supported systems for flake-parts
+      systems = [ "x86_64-linux" ];
+
+      # Import dendritic/flake modules here
+      imports = [
+        (import-tree ./generated/modules)  # Only mySystem.* stuff
+      ];
+
+      # Define NixOS configurations for hosts
+      flake = {
+        nixosConfigurations.traveldroid =
+          nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+
+            modules = [
+              # Host-specific configuration (NixOS context)
+              ./generated/hosts/traveldroid/traveldroid.nix
+
+              # Boot configuration (NixOS context)
+              ./generated/hosts/traveldroid/boot.nix
+
+              # Stylix NixOS module
+              stylix.nixosModules.default
+            ];
+          };
       };
+    };
 }
diff --git a/Droidnix/generated/hosts/traveldroid/boot.nix b/Droidnix/generated/hosts/traveldroid/boot.nix
new file mode 100644
index 000000000..74926f7ee
--- /dev/null
+++ b/Droidnix/generated/hosts/traveldroid/boot.nix
@@ -0,0 +1,28 @@
+# ./generated/hosts/traveldroid/traveldroid.nix
+{ config, pkgs, lib, ... }:
+
+let
+  coreEnabled = config.mySystem.system.core.enable or false;
+in lib.mkIf coreEnabled {
+  boot = {
+    initrd = {
+      verbose = false;
+      kernelModules = [ ];
+    };
+
+    extraModulePackages = [ ];
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernelParams = [ "silent" ];
+
+    consoleLogLevel = 0;
+    plymouth.enable = true;
+    supportedFilesystems = [ "ntfs" ];
+
+    loader = {
+      systemd-boot.enable = true;
+      systemd-boot.configurationLimit = 10;
+      efi.canTouchEfiVariables = true;
+      timeout = 5;
+    };
+  };
+}