diff --git a/nixos/machines/ryzen-shine-unencrypted.nix b/nixos/machines/ryzen-shine-original.nix
similarity index 77%
rename from nixos/machines/ryzen-shine-unencrypted.nix
rename to nixos/machines/ryzen-shine-original.nix
index 5922c36c..6aca1ed0 100644
--- a/nixos/machines/ryzen-shine-unencrypted.nix
+++ b/nixos/machines/ryzen-shine-original.nix
@@ -20,7 +20,6 @@
     enable = true;
     # extraFlags = ["--node-taint preferNoSchedule=true:NoSchedule"];
   };
-  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.loader.systemd-boot.configurationLimit = 5;
 
@@ -48,6 +47,15 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.luks.devices."cryptroot".device = "/dev/nvme0n1p5";
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+
+  # install nvidia drivers in addition to intel one
+  hardware.graphics.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
+  hardware.graphics.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
+  services.xserver = {
+    videoDrivers = [ "nvidia" ];
+  };
 
   hardware.nvidia.modesetting.enable = true;
 
@@ -57,12 +65,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/9bd06145-8151-4f7b-bcfe-f1809e0db1ea";
+    device = "/dev/disk/by-uuid/356173ab-d076-43e0-aeb6-6a6829c4402b";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/E1E1-909E";
+    device = "/dev/disk/by-uuid/B270-C7E6";
     fsType = "vfat";
   };
 
@@ -72,6 +80,10 @@
     options = [ "nofail" "uid=0" "gid=users" "umask=002" ];
   };
 
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; }
+  ];
+
   # nix.settings.maxJobs = lib.mkDefault 16;
   # High-DPI console
   console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
diff --git a/nixos/machines/ryzen-shine.nix b/nixos/machines/ryzen-shine.nix
index 6aca1ed0..5922c36c 100644
--- a/nixos/machines/ryzen-shine.nix
+++ b/nixos/machines/ryzen-shine.nix
@@ -20,6 +20,7 @@
     enable = true;
     # extraFlags = ["--node-taint preferNoSchedule=true:NoSchedule"];
   };
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.loader.systemd-boot.configurationLimit = 5;
 
@@ -47,15 +48,6 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.luks.devices."cryptroot".device = "/dev/nvme0n1p5";
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-
-  # install nvidia drivers in addition to intel one
-  hardware.graphics.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
-  hardware.graphics.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
-  services.xserver = {
-    videoDrivers = [ "nvidia" ];
-  };
 
   hardware.nvidia.modesetting.enable = true;
 
@@ -65,12 +57,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/356173ab-d076-43e0-aeb6-6a6829c4402b";
+    device = "/dev/disk/by-uuid/9bd06145-8151-4f7b-bcfe-f1809e0db1ea";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B270-C7E6";
+    device = "/dev/disk/by-uuid/E1E1-909E";
     fsType = "vfat";
   };
 
@@ -80,10 +72,6 @@
     options = [ "nofail" "uid=0" "gid=users" "umask=002" ];
   };
 
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; }
-  ];
-
   # nix.settings.maxJobs = lib.mkDefault 16;
   # High-DPI console
   console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";