diff --git a/flake.nix b/flake.nix
index 16e284e..af28329 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,7 @@
       "g13"
       "g14"
       "g17"
+      "g18-next"
     ];
   in
   {
diff --git a/hosts/g18-next/configuration.nix b/hosts/g18-next/configuration.nix
index b6225d2..e255628 100644
--- a/hosts/g18-next/configuration.nix
+++ b/hosts/g18-next/configuration.nix
@@ -16,12 +16,16 @@
     nginx.enableCodeServer = false;
     nvidia.enable = false;
   };
+  boot.loader.systemd-boot.enable = lib.mkForce false;
+  boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/vda";
   networking.hostName = lib.mkForce "g18-next";
   networking.hostId = "11f1fad0";
   systemd.network.networks."10-veth0" = {
     matchConfig.Name = "enp1s0";
     networkConfig = {
-      DHCP = "yes";
+      DHCP = "no";
       IPv6AcceptRA = true;
     };
     address = [ "192.168.122.118/24" ];
diff --git a/hosts/g18-next/hardware-configuration.nix b/hosts/g18-next/hardware-configuration.nix
index 7226dca..782f319 100644
--- a/hosts/g18-next/hardware-configuration.nix
+++ b/hosts/g18-next/hardware-configuration.nix
@@ -24,6 +24,11 @@
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
+  fileSystems."/data0" =
+    { device = "192.168.122.1:/data0";
+      fsType = "nfs";
+    };
+
   swapDevices =
     [ { device = "/dev/disk/by-uuid/ba441743-a8b0-4f0c-af9c-294ca4526350"; }
     ];
diff --git a/hosts/modules/nasp.nix b/hosts/modules/nasp.nix
index 9b0770a..f54e8aa 100644
--- a/hosts/modules/nasp.nix
+++ b/hosts/modules/nasp.nix
@@ -353,8 +353,7 @@ in
       };
     })
     # g series
-    (lib.mkIf (gCfg.enable) (let
-      ipSuffix = (builtins.toString (gCfg.serial + 100)); in {
+    (lib.mkIf (gCfg.enable) {
       ## network
       networking.hostName = assert (gCfg.serial > 0); "g" + (builtins.toString gCfg.serial);
       networking.search = [ "nasp" ];
@@ -404,7 +403,7 @@ in
         enable = true;
         servers = [ "192.168.16.118" ];
       };
-    }))
+    })
     (lib.mkIf (gCfg.enable && gCfg.eth0Name != "") {
       systemd.network.networks."10-eth0" = {
         matchConfig.Name = gCfg.eth0Name;
@@ -412,7 +411,7 @@ in
           DHCP = "no";
           IPv6AcceptRA = true;
         };
-        address = [ "192.168.16.${ipSuffix}/24" ];
+        address = [ "192.168.16.${builtins.toString (gCfg.serial + 100)}/24" ];
         routes = [
           {
             routeConfig = {
@@ -445,7 +444,7 @@ in
     (lib.mkIf (gCfg.enable && gCfg.eth2Name != "") {
       systemd.network.networks."10-eth2" = {
         matchConfig.Name = gCfg.eth2Name;
-        address = [ "12.12.12.${ipSuffix}/24" ];
+        address = [ "12.12.12.${builtins.toString (gCfg.serial + 100)}/24" ];
         linkConfig.RequiredForOnline = "no";
       };
       networking.rxe = {