diff --git a/flake.nix b/flake.nix
index 55e7ffa..0b565ab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -90,6 +90,7 @@
           stylix.nixosModules.stylix
 					nixvim.nixosModules.nixvim
           nur.nixosModules.nur
+					nixvim.nixosModules.nixvim
         ];
       };
 
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 831eeee..d7f7bf1 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -8,7 +8,7 @@
   ...
 }: {
   imports = [
-    ./../../modules/sys
+    ./../../modules/sys/configuration.nix
     ./hardware.nix
     ./boot.nix
     ./services.nix
diff --git a/hosts/laptop/environment.nix b/hosts/laptop/environment.nix
index f467e1d..aca3a1b 100644
--- a/hosts/laptop/environment.nix
+++ b/hosts/laptop/environment.nix
@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   environment = {
     variables = {
-      XCURSOR_SIZE = "24";
       PATH = "${pkgs.clang-tools}/bin:$PATH";
     };
     shells = with pkgs; [
diff --git a/hosts/laptop/hardware.nix b/hosts/laptop/hardware.nix
index 1c21635..4fec50b 100644
--- a/hosts/laptop/hardware.nix
+++ b/hosts/laptop/hardware.nix
@@ -18,23 +18,23 @@
   boot.extraModulePackages = [];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-partlabel/disk-main-root";
+    device = "/dev/sda4";
     fsType = "ext4";
   };
 
   fileSystems."/nix" = {
-    device = "/dev/disk/by-partlabel/disk-main-nix";
+    device = "/dev/sda3";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-partlabel/disk-main-ESP";
+    device = "/dev/sda2";
     fsType = "vfat";
     options = ["fmask=0077" "dmask=0077"];
   };
 
   fileSystems."/home" = {
-    device = "/dev/disk/by-partlabel/disk-main-home";
+    device = "/dev/sda5";
     fsType = "ext4";
   };