nixos/kernel: drop boot.vesa (#518397)

nixos/doc/manual/configuration/profiles/headless.section.md

@@ -2,7 +2,7 @@
 
 Common configuration for headless machines (e.g., Amazon EC2 instances).
 
-Disables [vesa](#opt-boot.vesa), serial consoles,
+Disables serial consoles,
 [emergency mode](#opt-systemd.enableEmergencyMode),
 [grub splash images](#opt-boot.loader.grub.splashImage)
 and configures the kernel to reboot automatically on panic.

nixos/doc/manual/release-notes/rl-2611.section.md

@@ -16,7 +16,7 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- Create the first release note entry in this section!
+- `boot.vesa` has been removed. It was deprecated in 2020 because Xorg now works better with kernel modesetting. If you still need the legacy VESA 800x600 fallback, set `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly.
 
 ## Other Notable Changes {#sec-release-26.11-notable-changes}
 

nixos/modules/system/boot/kernel.nix

@@ -35,6 +35,15 @@ in
 
 {
 
+  imports = [
+    (mkRemovedOptionModule [ "boot" "vesa" ] ''
+      The `boot.vesa` option has been removed. It was deprecated in 2020
+      because Xorg now works better with kernel modesetting. If you still
+      need the legacy VESA 800x600 fallback, set
+      `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly.
+    '')
+  ];
+
   ###### interface
 
   options = {
@@ -181,19 +190,6 @@ in
       '';
     };
 
-    boot.vesa = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        (Deprecated) This option, if set, activates the VESA 800x600 video
-        mode on boot and disables kernel modesetting. It is equivalent to
-        specifying `[ "vga=0x317" "nomodeset" ]` in the
-        {option}`boot.kernelParams` option. This option is
-        deprecated as of 2020: Xorg now works better with modesetting, and
-        you might want a different VESA vga setting, anyway.
-      '';
-    };
-
     boot.extraModulePackages = mkOption {
       type = types.listOf types.package;
       default = [ ];
@@ -427,10 +423,6 @@ in
       # (so you don't need to reboot to have changes take effect).
       boot.kernelParams = [
         "loglevel=${toString config.boot.consoleLogLevel}"
-      ]
-      ++ optionals config.boot.vesa [
-        "vga=0x317"
-        "nomodeset"
       ];
 
       boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel;