diff --git a/flake.nix b/flake.nix
index a4fc65d..51bfcc0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
     nixos-x86_64-hosts = [
       "g2"
       "g5"
+      "g6"
       "g7"
       "g10"
       "g11"
diff --git a/hosts/g6/configuration.nix b/hosts/g6/configuration.nix
new file mode 100644
index 0000000..4286f66
--- /dev/null
+++ b/hosts/g6/configuration.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [
+      ./hardware-configuration.nix
+      ../modules/nasp.nix
+    ];
+  nasp = {
+    enable = true;
+    gSeries = {
+      enable = true;
+      serial = 6;
+      eth0Name = "eno1";
+      eth1Name = "eno2";
+      eth2Name = "enp2s0np0";
+    };
+  };
+  boot.supportedFilesystems = [ "zfs" ];
+  boot.zfs.forceImportRoot = false;
+  networking.hostId = "94f672bf";
+  system.stateVersion = "24.05";
+}
diff --git a/hosts/g6/hardware-configuration.nix b/hosts/g6/hardware-configuration.nix
new file mode 100644
index 0000000..8b7a394
--- /dev/null
+++ b/hosts/g6/hardware-configuration.nix
@@ -0,0 +1,47 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "ehci_pci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/5ce2870d-bdc9-4505-80ec-28064e460c09";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/0B3E-FD64";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  fileSystems."/home2" =
+    { device = "/dev/ubuntu-vg/home2";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/f3e2b6f4-dc22-448a-824c-e8da8e62e663"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno2.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp2s0np0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}