diff --git a/modules/nixos/system/disk/default.nix b/modules/nixos/system/disk/default.nix
new file mode 100644
index 0000000..8be5b28
--- /dev/null
+++ b/modules/nixos/system/disk/default.nix
@@ -0,0 +1,54 @@
+{ config, lib, namespace, ... }:
+let
+  inherit (lib) mkIf mkOpt types;
+
+  cfg = config.${namespace}.system.disk;
+in
+{
+  options.${namespace}.system.disk = {
+    enable = lib.mkEnableOption "Disko Configuration";
+    diskPath = mkOpt types.str null "Device path for the main disk";
+  };
+
+  config = mkIf cfg.enable {
+    disko.devices = {
+      disk = {
+        main = {
+          type = "disk";
+          device = cfg.diskPath;
+          content = {
+            type = "gpt";
+            partitions = {
+              boot = {
+                size = "512M";
+                type = "EF00";
+                content = {
+                  type = "filesystem";
+                  format = "vfat";
+                  mountpoint = "/boot";
+                  mountOptions = [ "umask=0077" ];
+                };
+              };
+              root = {
+                size = "100%";
+                content = {
+                  type = "filesystem";
+                  format = "ext4";
+                  mountpoint = "/";
+                };
+              };
+              swap = {
+                size = "32G";
+                content = {
+                  type = "swap";
+                  discardPolicy = "both";
+                  resumeDevice = true;
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/systems/x86_64-linux/nixos-builder/default.nix b/systems/x86_64-linux/nixos-builder/default.nix
index 585ed60..141276d 100755
--- a/systems/x86_64-linux/nixos-builder/default.nix
+++ b/systems/x86_64-linux/nixos-builder/default.nix
@@ -6,7 +6,12 @@ in
   reichard = {
     system = {
       boot = enabled;
-      networking = enabled;
+      networking = enabled; # TODO - Network Config
+      disk = {
+        enable = true;
+        diskID = "/dev/xvda";
+      };
+      # TODO - Xen Guest
     };
 
     services = {
@@ -22,7 +27,7 @@ in
 
   networking = {
     defaultGateway = {
-      address = "10.0.50.130";
+      address = "10.0.50.254";
       interface = "enX0";
     };
     interfaces.enX0.ipv4.addresses = [{