bootloader: grub: Add gfxmode (resolution) override.
* gnu/bootloader/grub.scm (<grub-theme>): Add `gfxmode' entry. (eye-candy): Use it. * doc/guix.texi (Bootloader Configuration): Document it.
This commit is contained in:
parent
170d5844dd
commit
f52fe7c3f2
2 changed files with 41 additions and 6 deletions
|
@ -26101,9 +26101,22 @@ must @emph{not} be an OS device name such as @file{/dev/sda1}.
|
||||||
@end table
|
@end table
|
||||||
@end deftp
|
@end deftp
|
||||||
|
|
||||||
|
@cindex HDPI
|
||||||
|
@cindex HiDPI
|
||||||
|
@cindex resolution
|
||||||
@c FIXME: Write documentation once it's stable.
|
@c FIXME: Write documentation once it's stable.
|
||||||
For now only GRUB has theme support. GRUB themes are created using
|
For now only GRUB has theme support. GRUB themes are created using
|
||||||
the @code{grub-theme} form, which is not documented yet.
|
the @code{grub-theme} form, which is not fully documented yet.
|
||||||
|
|
||||||
|
@deftp {Data Type} grub-theme
|
||||||
|
Data type representing the configuration of the GRUB theme.
|
||||||
|
|
||||||
|
@table @asis
|
||||||
|
@item @code{gfxmode} (default: @code{'("auto")})
|
||||||
|
The GRUB @code{gfxmode} to set (a list of screen resolution strings, see
|
||||||
|
@pxref{gfxmode,,, grub, GNU GRUB manual}).
|
||||||
|
@end table
|
||||||
|
@end deftp
|
||||||
|
|
||||||
@defvr {Scheme Variable} %default-theme
|
@defvr {Scheme Variable} %default-theme
|
||||||
This is the default GRUB theme used by the operating system if no
|
This is the default GRUB theme used by the operating system if no
|
||||||
|
@ -26114,6 +26127,17 @@ It comes with a fancy background image displaying the GNU and Guix
|
||||||
logos.
|
logos.
|
||||||
@end defvr
|
@end defvr
|
||||||
|
|
||||||
|
For example, to override the default resolution, you may use something
|
||||||
|
like
|
||||||
|
|
||||||
|
@lisp
|
||||||
|
(bootloader
|
||||||
|
(grub-configuration
|
||||||
|
;; @dots{}
|
||||||
|
(theme (grub-theme
|
||||||
|
(inherit %default-theme)
|
||||||
|
(gfxmode '("1024x786x32" "auto"))))))
|
||||||
|
@end lisp
|
||||||
|
|
||||||
@node Invoking guix system
|
@node Invoking guix system
|
||||||
@section Invoking @code{guix system}
|
@section Invoking @code{guix system}
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
||||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
|
;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -88,7 +89,9 @@ denoting a file name."
|
||||||
(color-normal grub-theme-color-normal
|
(color-normal grub-theme-color-normal
|
||||||
(default '((fg . cyan) (bg . blue))))
|
(default '((fg . cyan) (bg . blue))))
|
||||||
(color-highlight grub-theme-color-highlight
|
(color-highlight grub-theme-color-highlight
|
||||||
(default '((fg . white) (bg . blue)))))
|
(default '((fg . white) (bg . blue))))
|
||||||
|
(gfxmode grub-gfxmode
|
||||||
|
(default '("auto")))) ;list of string
|
||||||
|
|
||||||
(define %background-image
|
(define %background-image
|
||||||
(grub-image
|
(grub-image
|
||||||
|
@ -149,8 +152,16 @@ system string---e.g., \"x86_64-linux\"."
|
||||||
;; most other modern architectures have no other mode and therefore don't
|
;; most other modern architectures have no other mode and therefore don't
|
||||||
;; need to be switched.
|
;; need to be switched.
|
||||||
(if (string-match "^(x86_64|i[3-6]86)-" system)
|
(if (string-match "^(x86_64|i[3-6]86)-" system)
|
||||||
"
|
(string-append
|
||||||
# Leave 'gfxmode' to 'auto'.
|
"
|
||||||
|
"
|
||||||
|
(let ((gfxmode (and=>
|
||||||
|
(and=> config bootloader-configuration-theme)
|
||||||
|
grub-gfxmode)))
|
||||||
|
(if gfxmode
|
||||||
|
(string-append "set gfxmode=" (string-join gfxmode ";"))
|
||||||
|
"# Leave 'gfxmode' to 'auto'."))
|
||||||
|
"
|
||||||
insmod video_bochs
|
insmod video_bochs
|
||||||
insmod video_cirrus
|
insmod video_cirrus
|
||||||
insmod gfxterm
|
insmod gfxterm
|
||||||
|
@ -166,7 +177,7 @@ system string---e.g., \"x86_64-linux\"."
|
||||||
insmod vbe
|
insmod vbe
|
||||||
insmod vga
|
insmod vga
|
||||||
fi
|
fi
|
||||||
"
|
")
|
||||||
""))
|
""))
|
||||||
|
|
||||||
(define (setup-gfxterm config font-file)
|
(define (setup-gfxterm config font-file)
|
||||||
|
|
Reference in a new issue