diff --git a/configuration.nix b/configuration.nix
index a2e414e..fd6cf0c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -26,6 +26,10 @@
   systemd.targets.hibernate.enable = false;
   systemd.targets.hybrid-sleep.enable = false;
 
+  networking.extraHosts = ''
+    192.168.16.118 g18-nasp g18 nasp.fit git.nasp.fit
+  '';
+
   # Enable the X11 windowing system.
   #services.xserver.enable = true;
 
@@ -51,5 +55,6 @@
     vim zsh tmux git curl wget
   ];
 
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 }
+
diff --git a/flake.lock b/flake.lock
index fc36b35..695bab1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716633019,
-        "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
+        "lastModified": 1717696253,
+        "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
+        "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index f995f06..fdb11c8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "NixOS System Config";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
@@ -10,6 +10,7 @@
   let
     nixos-x86_64-hosts = [
       "g2"
+      "g14"
     ];
   in
   {
diff --git a/hosts/g14/configuration.nix b/hosts/g14/configuration.nix
new file mode 100644
index 0000000..6b3ca4d
--- /dev/null
+++ b/hosts/g14/configuration.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [
+      ./hardware-configuration.nix
+      ../modules/nasp.nix
+    ];
+  nasp = {
+    enable = true;
+    gSeries = {
+      enable = true;
+      serial = 14;
+      eth0Name = "eno1";
+      eth1Name = "eno2";
+      eth2Name = "enp2s0np0";
+    };
+  };
+  boot.supportedFilesystems = [ "zfs" ];
+  boot.zfs.forceImportRoot = false;
+  networking.hostId = "32137a88";
+  system.stateVersion = "24.05";
+}
diff --git a/hosts/g14/hardware-configuration.nix b/hosts/g14/hardware-configuration.nix
new file mode 100644
index 0000000..e1bc795
--- /dev/null
+++ b/hosts/g14/hardware-configuration.nix
@@ -0,0 +1,42 @@
+# 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 = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/65920f16-5aab-430c-8197-b7ddd8f2a92b";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/8B34-71AD";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/5af059c4-6066-43a1-b037-683fa9e0d6fd"; }
+    ];
+
+  # 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;
+}
diff --git a/hosts/modules/nasp.nix b/hosts/modules/nasp.nix
index 407e269..a48d149 100644
--- a/hosts/modules/nasp.nix
+++ b/hosts/modules/nasp.nix
@@ -211,7 +211,7 @@ in
           User = "root";
         };
         script = builtins.readFile ./scripts/registry.sh;
-        path = with pkgs; [ git bash su ];
+        path = with pkgs; [ git bash su shadow getent ];
       };
       security.sudo.extraConfig = ''
         %nasp ALL = (root) NOPASSWD: /run/current-system/sw/bin/docker