diff --git a/configuration.nix b/configuration.nix
index 3e4099e..80cf286 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -25,17 +25,16 @@ in {
 
   boot.kernelPackages = unstable.linuxPackages_latest;
   boot.blacklistedKernelModules = [ "nouveau" ];
-  boot.earlyVconsoleSetup = true;
+
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  console.font = "latarcyrheb-sun32";
+  console.keyMap = "us";
+  console.earlySetup = true;
 
   hardware.cpu.intel.updateMicrocode = true;
   hardware.enableRedistributableFirmware = true;
 
-  i18n = {
-    consoleFont = "latarcyrheb-sun32";
-    consoleKeyMap = "us";
-    defaultLocale = "en_US.UTF-8";
-  };
-
   swapDevices = [
     { device = "/var/swapfile";
       size = 32768; # MiB
diff --git a/desktop.nix b/desktop.nix
index 9f62ea0..fc31009 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -43,10 +43,11 @@ in {
 
   hardware.bluetooth = {
     enable = true;
-    extraConfig = "
-      [General]
-      Enable=Source,Sink,Media,Socket
-    ";
+    config = {
+      General = {
+        Enable = "Source,Sink,Media,Socket";
+      };
+    };
   };
 
   hardware.pulseaudio = {