diff --git a/modules/core/bootloader.nix b/modules/core/bootloader.nix
index 1904160..85f4814 100644
--- a/modules/core/bootloader.nix
+++ b/modules/core/bootloader.nix
@@ -1,7 +1,11 @@
 { pkgs, ... }:
 {
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.systemd-boot.configurationLimit = 10;
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+      systemd-boot.configurationLimit = 10;
+    };
+  };
 }
diff --git a/modules/core/hardware.nix b/modules/core/hardware.nix
index 5ec65b0..fd285b3 100644
--- a/modules/core/hardware.nix
+++ b/modules/core/hardware.nix
@@ -1,10 +1,12 @@
 { pkgs, ... }:
 {  
-  hardware.opengl.enable = true;
-  hardware.opengl.driSupport = true;
-  hardware.opengl.driSupport32Bit = true;
-  hardware.enableRedistributableFirmware = true;
-  hardware.opengl.extraPackages = with pkgs; [
-    
-  ];
+  hardware = {
+    opengl = {
+      enable = true;
+      driSupport = true;
+      driSupport32Bit = true;
+      extraPackages = with pkgs; [];
+    };
+    enableRedistributableFirmware = true;
+  };
 }