diff --git a/configuration.nix b/configuration.nix
index 9a50195..49e730d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,29 +9,6 @@
       ./global
   ];
 
-  
-  boot.plymouth.enable = true;
-
-  #boot.loader.systemd-boot.enable = true;
-  #boot.loader.systemd-boot.configurationLimit = 2;
-
-  boot.loader.efi.canTouchEfiVariables = true;
-  #boot.loader.efi.efiSysMountPoint = "/boot/efi";
-  boot.loader.grub = {
-    configurationLimit = 2;
-    efiSupport = true;
-    device = "nodev";
-    mirroredBoots = [
-      {
-        devices = [ "nodev" ];
-        path = "/boot";
-      }
-    ];
-  };
-
-  # Use xanmod kernel
-  boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
-
   system.autoUpgrade = {
     enable = true;
     flake = "git+https://git.sense-t.eu.org/NixOS/gpd-configurations#gpd";
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 5c12100..19d68e6 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -8,10 +8,44 @@
         (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-    boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-    boot.initrd.kernelModules = [ ];
-    boot.kernelModules = [ "kvm-intel" ];
-    boot.extraModulePackages = [ ];
+    
+    boot = {
+        plymouth.enable = true;
+        # Use xanmod kernel
+        kernelPackages = pkgs.linuxPackages_xanmod_latest;
+        kernelParams = [ "quiet" ];
+        kernelModules = [ "kvm-intel" ];
+        consoleLogLevel = 0;
+
+        initrd = {
+            #verbose = false;
+            availableKernelModules = [ 
+                "xhci_pci" 
+                "ahci" 
+                "nvme" 
+                "usb_storage" 
+                "usbhid" 
+                "sd_mod" 
+            ];
+        };
+        
+        loader = {
+            efi.canTouchEfiVariables = true;
+
+            grub = {
+                configurationLimit = 10;
+                efiSupport = true;
+                device = "nodev";
+
+                mirroredBoots = [
+                    {
+                        devices = [ "nodev" ];
+                        path = "/boot";
+                    }
+                ];
+            };
+        };
+    };
 
     fileSystems."/boot" = { 
         device = "/dev/disk/by-uuid/8095-BE1B";