diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 1d25772..be50866 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -53,7 +53,6 @@
  # Enable CUPS to print documents.
   services.printing.enable = true;
   services.fprintd.enable = true;
-  services.tlp.enable = true;
   services.thermald.enable = true;
   powerManagement.powertop.enable = true;
   powerManagement.enable = true;
@@ -104,8 +103,10 @@
   intel-compute-runtime
   intel-media-driver 
   microcodeIntel
+  neovim
   ];
   networking.firewall.enable = true;
+  hardware.graphics.enable32Bit = true;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix
index 682c013..452986e 100644
--- a/hosts/laptop/hardware-configuration.nix
+++ b/hosts/laptop/hardware-configuration.nix
@@ -12,24 +12,19 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
-  hardware.opengl.driSupport32Bit = true;
-
-
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/9c2b187e-a9db-48f1-adce-dd9311675223";
+    { device = "/dev/disk/by-uuid/a7301069-c11f-411e-9a23-446744c3ae76";
       fsType = "ext4";
     };
 
-  boot.initrd.luks.devices."luks-665ec0f0-45b9-413f-adff-e7c4d734f832".device = "/dev/disk/by-uuid/665ec0f0-45b9-413f-adff-e7c4d734f832";
-
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/5D11-53E2";
+    { device = "/dev/disk/by-uuid/19F3-CD7E";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/0dfad18a-8bd0-430c-99c4-135daa6fb892"; }
+    [ { device = "/dev/disk/by-uuid/d9df94a1-5088-468c-839d-f4cd10cb7e5f"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -45,6 +40,4 @@
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.initrd.luks.devices."luks-4d1ff260-d134-4b6c-80ef-5f5b74c87988".device = "/dev/disk/by-uuid/4d1ff260-d134-4b6c-80ef-5f5b74c87988";
-
 }