Commit 6e8dc58e authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents dd3c7547 88d3861a

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -25070,6 +25070,12 @@ 
    github = "stasjok";

    githubId = 1353637;

  };

  staslyakhov = {

    name = "Stas Lyakhov";

    email = "nix@lyakhovs.dev";

    github = "staslyakhov";

    githubId = 19846456;

  };

  staticdev = {

    email = "staticdev-support@proton.me";

    github = "staticdev";

nixos/modules/config/console.nix

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ let 


  makeColor = i: lib.concatMapStringsSep "," (x: "0x" + lib.substring (2 * i) 2 x);



  isUnicode = lib.hasSuffix "UTF-8" (lib.toUpper config.i18n.defaultLocale);

  isUnicode = config.i18n.defaultCharset == "UTF-8" || cfg.useXkbConfig;



  optimizedKeymap =

    pkgs.runCommand "keymap"

nixos/modules/services/networking/sabnzbd/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ in 
          a writeable configuration, such as quota tracking, enable

          this option.

        '';

        default = lib.versionOlder config.system.stateVersion "25.11";

        default = lib.versionOlder config.system.stateVersion "26.05";

      };



      settings = mkOption {

nixos/modules/system/boot/loader/limine/limine-install.py

+6 −0
Original line number Diff line number Diff line
@@ -291,6 +291,12 @@ def config_entry(levels: int, bootspec: BootSpec, label: str, time: str) -> str: 
    entry += f'comment: {bootspec.label}, built on {time}\n'

    entry += 'kernel_path: ' + get_kernel_uri(bootspec.kernel) + '\n'

    entry += 'cmdline: ' + ' '.join(['init=' + bootspec.init] + bootspec.kernelParams).strip() + '\n'



    # Set framebuffer resolution for Linux boot entries if configured

    resolution = config('resolution')

    if resolution is not None:

        entry += f'resolution: {resolution}\n'



    if bootspec.initrd:

        entry += f'module_path: ' + get_kernel_uri(bootspec.initrd) + '\n'

nixos/modules/system/boot/loader/limine/limine.nix

+22 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ let 
      force = cfg.force;

      enrollConfig = cfg.enrollConfig;

      style = cfg.style;

      resolution = cfg.resolution;

      maxGenerations = if cfg.maxGenerations == null then 0 else cfg.maxGenerations;

      hostArchitecture = pkgs.stdenv.hostPlatform.parsed.cpu;

      timeout = if config.boot.loader.timeout != null then config.boot.loader.timeout else 10;
@@ -98,6 +99,27 @@ in 
      '';

    };



    resolution = lib.mkOption {

      default = null;

      type = lib.types.nullOr lib.types.str;

      example = "1920x1080x32";

      description = ''

        The framebuffer resolution to set when booting Linux entries.

        This controls the GOP mode that Limine sets before handing off to the kernel,

        which affects early boot graphics (e.g., simpledrm, efifb).



        Format: `<width>x<height>` or `<width>x<height>x<bpp>`.

        If bpp is omitted, defaults to 32.



        Note: Refresh rate is not supported because the UEFI GOP protocol only

        defines framebuffer dimensions and pixel format, not display timing.

        Refresh rate is determined later by the GPU driver based on EDID.



        This is distinct from {option}`boot.loader.limine.style.interface.resolution`

        which only affects the Limine bootloader's own menu interface.

      '';

    };



    additionalFiles = lib.mkOption {

      default = { };

      type = lib.types.attrsOf lib.types.path;