diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix
index 94b2a9a0..b8a7cc93 100644
--- a/hosts/mauville/default.nix
+++ b/hosts/mauville/default.nix
@@ -4,7 +4,7 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [ 
       ./hardware-configuration.nix
       ../../users/aly.nix
       ../../system
@@ -16,36 +16,27 @@
 
   networking.hostName = "mauville"; # Define your hostname.
 
-  services.xserver.displayManager.gdm.autoSuspend = false;
-
-  # Delete generations older than 14 days.
-  nix.gc = {
-    options = lib.mkForce "--delete-older-than 14d";
+  services.xserver = {
+    # Prevent system sleep after reboot to login screen.
+    displayManager.gdm.autoSuspend = false;
+    # Add AMDGPU driver.
+    videoDrivers = [ "amdgpu" ];
   };
 
-  services.xserver.videoDrivers = [ "amdgpu" ];
-  hardware.opengl.extraPackages = with pkgs; [
-    rocmPackages.clr.icd
-    amdvlk
-  ];
-
-  hardware.opengl.driSupport32Bit = true;
-  # For 32 bit applications 
-  hardware.opengl.extraPackages32 = with pkgs; [
-    driversi686Linux.amdvlk
-  ];
+  hardware.opengl = {
+    # Add ROCM annd AMD Vulkan driver.
+    extraPackages = with pkgs; [
+      rocmPackages.clr.icd
+      amdvlk
+    ];
+    # Add support for 32bit apps.
+    driSupport32Bit = true;
+    opengl.extraPackages32 = with pkgs; [
+      driversi686Linux.amdvlk
+    ];
+  };
 
   environment.systemPackages = [ pkgs.backblaze-b2 ];
   
-  # Removed because it defaults the session to X11 instead of Wayland
-  # services.xserver.displayManager.autoLogin.enable = true;
-  # services.xserver.displayManager.autoLogin.user = "aly";
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "23.11";
 }
diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix
index f24fc0c5..964c40d2 100644
--- a/hosts/rustboro/default.nix
+++ b/hosts/rustboro/default.nix
@@ -1,4 +1,4 @@
-# Lenovo Thinkpad R440p with a Core i5 4210M, 16GB RAM, 512GB SSD.
+# Lenovo Thinkpad T440p with a Core i5 4210M, 16GB RAM, 512GB SSD.
 
 { config, pkgs, ... }: