diff --git a/common/desktop/vnc.nix b/common/desktop/vnc.nix
old mode 100644
new mode 100755
diff --git a/hosts/focalor/backup.nix b/hosts/focalor/backup.nix
index a97777f..d17b906 100755
--- a/hosts/focalor/backup.nix
+++ b/hosts/focalor/backup.nix
@@ -8,13 +8,20 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "uas" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [
+     "vfio" "vfio_iommu_type1" "vfio_pci"
+     "nvidia" "nvidia-modeset" "nvidia_uvm" "nvidia_drm" 
+  ];
   boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelParams = [
+    "amd_iommu=on"
+    "vfio-pci.ids=10de:2484,10de228b,1022:149c,15b7:5045"
+  ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/2009b305-f22d-4a5c-c49a2303232b";
+    { device = "/dev/disk/by-uuid/2009b305-f22d-4d5c-a9d3-c49a2303232b";
       fsType = "ext4";
     };
 
@@ -24,9 +31,7 @@
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  swapDevices =
-    [ #{ device = "/dev/disk/by-uuid/3029e270-a5f5-4a97-a29b-f2bc3e3a33a8"; }
-    ];
+  swapDevices = [ ];
 
   # 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
diff --git a/hosts/focalor/default.nix b/hosts/focalor/default.nix
index b7e3f8a..5fde37e 100755
--- a/hosts/focalor/default.nix
+++ b/hosts/focalor/default.nix
@@ -6,7 +6,7 @@
     # Host-specific hardware
     ./hardware.nix
     ./secrets.nix
-    ./vfio.nix
+    #./vfio.nix
     
     # Common modules shared across hosts
     ../../common/system.nix
@@ -26,7 +26,7 @@
     #../../host-secrets.nix
   ];
 
-  system.stateVersion = "24.11";
+  system.stateVersion = "25.05";
 
   # pin host platform & microcode
   nixpkgs.hostPlatform               = lib.mkDefault "x86_64-linux";
diff --git a/hosts/focalor/hardware.nix b/hosts/focalor/hardware.nix
index d17b906..b290f2f 100755
--- a/hosts/focalor/hardware.nix
+++ b/hosts/focalor/hardware.nix
@@ -8,27 +8,20 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [
-     "vfio" "vfio_iommu_type1" "vfio_pci"
-     "nvidia" "nvidia-modeset" "nvidia_uvm" "nvidia_drm" 
-  ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "uas" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
-  boot.kernelParams = [
-    "amd_iommu=on"
-    "vfio-pci.ids=10de:2484,10de228b,1022:149c,15b7:5045"
-  ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/2009b305-f22d-4d5c-a9d3-c49a2303232b";
+    { device = "/dev/disk/by-uuid/5d42a325-ba0d-4d40-906b-d28603b433ef";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/E53C-502F";
+    { device = "/dev/disk/by-uuid/404A-728D";
       fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices = [ ];
@@ -37,7 +30,7 @@
   # (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.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
 
diff --git a/hosts/focalor/vfio.nix b/hosts/focalor/vfio.nix
old mode 100644
new mode 100755