diff --git a/machines/MacBookPro12.1-configuration.nix b/machines/luffy/configuration.nix
similarity index 93%
rename from machines/MacBookPro12.1-configuration.nix
rename to machines/luffy/configuration.nix
index a975522..2df3560 100644
--- a/machines/MacBookPro12.1-configuration.nix
+++ b/machines/luffy/configuration.nix
@@ -72,13 +72,13 @@
   };
 
   imports = [
-    ../modules/console.nix
-    ../modules/desktop.nix
-    ../modules/fonts.nix
-    ../modules/home-config.nix
-    ../modules/laptop.nix
-    ../modules/local-dev.nix
-    ../modules/nixos.nix
+    ../../modules/console.nix
+    ../../modules/desktop.nix
+    ../../modules/fonts.nix
+    ../../modules/home-config.nix
+    ../../modules/laptop.nix
+    ../../modules/local-dev.nix
+    ../../modules/nixos.nix
   ];
   services.eris-server = {
     enable = true;
diff --git a/machines/MacBookPro12.1-hardware-configuration.nix b/machines/luffy/hardware-configuration.nix
similarity index 97%
rename from machines/MacBookPro12.1-hardware-configuration.nix
rename to machines/luffy/hardware-configuration.nix
index 6af84b4..acd7bf3 100644
--- a/machines/MacBookPro12.1-hardware-configuration.nix
+++ b/machines/luffy/hardware-configuration.nix
@@ -87,8 +87,7 @@
   #nixpkgs.config.allowBroken = true;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  hardware.opengl.enable = true;
-  hardware.opengl.driSupport = true;
+  hardware.graphics.enable = true;
   powerManagement = {
     # Enable gradually increasing/decreasing CPU frequency, rather than using
     # "powersave", which would keep CPU frequency at 0.8GHz.