diff --git a/common/hardware-configuration.nix b/common/hardware-configuration.nix
index c915eb0..44b6cc0 100644
--- a/common/hardware-configuration.nix
+++ b/common/hardware-configuration.nix
@@ -1 +1,14 @@
-{ ... }: { }
+{
+  pkgs,
+  ...
+}:
+{
+  boot = {
+    kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
+
+    kernelModules = [
+      "hid-logitech-dj"
+      "hid-logitech-hidpp"
+    ];
+  };
+}
diff --git a/desktop/hardware-configuration.nix b/desktop/hardware-configuration.nix
index 1eeeb99..355b101 100644
--- a/desktop/hardware-configuration.nix
+++ b/desktop/hardware-configuration.nix
@@ -28,12 +28,9 @@
       ];
     };
 
-    kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
     kernelModules = [
       "kvm-amd"
       "nct6683"
-      "hid-logitech-dj"
-      "hid-logitech-hidpp"
     ];
 
     extraModulePackages = with config.boot.kernelPackages; [
diff --git a/laptop/hardware-configuration.nix b/laptop/hardware-configuration.nix
index 3e6fdb9..a168c17 100644
--- a/laptop/hardware-configuration.nix
+++ b/laptop/hardware-configuration.nix
@@ -14,19 +14,24 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "uas"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "xhci_pci"
+        "ahci"
+        "nvme"
+        "uas"
+        "sd_mod"
+      ];
+      kernelModules = [ ];
+    };
+
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/02dad628-066d-4fba-ada7-bfdfbc2e4ca3";
+    device = "/dev/disk/by-uuid/7b31f189-b34a-4cf0-95c5-bbcd6830159e";
     fsType = "btrfs";
     options = [
       "subvol=@nix"
@@ -39,7 +44,7 @@
   };
 
   fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/02dad628-066d-4fba-ada7-bfdfbc2e4ca3";
+    device = "/dev/disk/by-uuid/7b31f189-b34a-4cf0-95c5-bbcd6830159e";
     fsType = "btrfs";
     options = [
       "subvol=@home"
@@ -52,7 +57,7 @@
   };
 
   fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/02dad628-066d-4fba-ada7-bfdfbc2e4ca3";
+    device = "/dev/disk/by-uuid/7b31f189-b34a-4cf0-95c5-bbcd6830159e";
     fsType = "btrfs";
     options = [
       "subvol=@nix_nix"
@@ -65,7 +70,7 @@
   };
 
   fileSystems."/var" = {
-    device = "/dev/disk/by-uuid/02dad628-066d-4fba-ada7-bfdfbc2e4ca3";
+    device = "/dev/disk/by-uuid/7b31f189-b34a-4cf0-95c5-bbcd6830159e";
     fsType = "btrfs";
     options = [
       "subvol=@nix_var"
@@ -78,7 +83,7 @@
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/C871-B294";
+    device = "/dev/disk/by-uuid/477C-4D52";
     fsType = "vfat";
     options = [
       "fmask=0022"
@@ -86,8 +91,16 @@
     ];
   };
 
-  swapDevices = [ ];
+  swapDevices = [
+    {
+      device = "/dev/disk/by-uuid/bea07563-dc23-415b-b12f-ba53138bd492";
+      priority = 0;
+      options = [
+        "defaults"
+      ];
+
+    }
+  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/laptop/modules/attic.nix b/laptop/modules/attic.nix
index 40bdbb9..8a9a5c2 100644
--- a/laptop/modules/attic.nix
+++ b/laptop/modules/attic.nix
@@ -1,4 +1,7 @@
-{ ... }: {
+{
+  ...
+}:
+{
   nix.settings = {
     substituters = [
       "https://attic.awroo.fun/my-config"
@@ -6,10 +9,13 @@
     ];
 
     trusted-public-keys = [
-      "my-config:zMLOKdd9wxVtJDK2jgI2fW6Uehtdc4WLyU0bOjNpyxM="
+      "my-config:51aC90S8+3+gS/UzwdnL7a7lu1NnY896SZp5njMwFDk="
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
     ];
 
-    trusted-users = [ "root" "@wheel" ];
+    trusted-users = [
+      "root"
+      "@wheel"
+    ];
   };
-}
\ No newline at end of file
+}