diff --git a/hosts/gaming/configuration.nix b/hosts/gaming/configuration.nix
index eb44176..26c785a 100644
--- a/hosts/gaming/configuration.nix
+++ b/hosts/gaming/configuration.nix
@@ -1,14 +1,10 @@
 { lib, ... }:
 {
-  swapDevices = [
-    {
-      device = "/var/lib/swapfile";
-      size = 2 * 1024;
-    }
-  ];
-
   imports = [
     ../../shared/base.nix
+
+    ../../shared/disko/zfs-impermanence.nix
+    ../../shared/hardware/impermanence.nix
     ../../shared/hardware/nvidia.nix
     ../../shared/hardware/vm.nix
 
diff --git a/hosts/gaming/state.nix b/hosts/gaming/state.nix
index f177860..f03a193 100644
--- a/hosts/gaming/state.nix
+++ b/hosts/gaming/state.nix
@@ -1,23 +1,5 @@
 { ... }:
 {
-  system.stateVersion = "24.11";
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/22c7a7ae-cedc-43db-b4f1-d591466d8f60";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/1C79-66D7";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
-    ];
-  };
-
-  fileSystems."/mnt/data" = {
-    device = "/dev/disk/by-uuid/dec871b2-5727-486c-978a-8bb2279bd2b8";
-    fsType = "ext4";
-  };
+  networking.hostId = "48434cbd";
+  system.stateVersion = "25.05";
 }
diff --git a/servers/gaming-server.nix b/servers/gaming-server.nix
index 738fbff..fc637c3 100644
--- a/servers/gaming-server.nix
+++ b/servers/gaming-server.nix
@@ -1,5 +1,30 @@
 { pkgs, ... }:
 {
+  systemd.tmpfiles.settings."vili-home"."/home/vili".d = {
+    user = "vili";
+    group = "users";
+    mode = "0700";
+  };
+  environment.persistence."/persist" = {
+    users.vili = {
+      directories = [
+        {
+          directory = ".parsec";
+          mode = "0755";
+        }
+        {
+          directory = ".parsec-persistent";
+          mode = "0755";
+        }
+        {
+          directory = ".config/sunshine";
+          mode = "0755";
+        }
+        ".local/share/Steam"
+      ];
+    };
+  };
+
   environment.systemPackages = with pkgs; [
     parsec-bin
   ];
diff --git a/shared/hardware/impermanence.nix b/shared/hardware/impermanence.nix
index fee61f7..9d5b115 100644
--- a/shared/hardware/impermanence.nix
+++ b/shared/hardware/impermanence.nix
@@ -21,7 +21,7 @@
   fileSystems."/persist".neededForBoot = true;
 
   services = {
-    fstrimg.interval = "daily";
+    fstrim.interval = "daily";
     zfs = {
       autoScrub.enable = true;
       autoSnapshot = {