ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bootloader: grub: Add gfxmode (resolution) override.

Browse source 
* 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:
Jan Nieuwenhuizen 2019-12-30 11:25:40 +01:00
parent 170d5844dd
commit f52fe7c3f2
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
doc/guix.texi
View file

@ -26101,9 +26101,22 @@ must @emph{not} be an OS device name such as @file{/dev/sda1}.
@end table
@end deftp
@cindex HDPI
@cindex HiDPI
@cindex resolution
@c FIXME: Write documentation once it's stable.
For now only GRUB has theme support. GRUB themes are created using
the @code{grub-theme} form, which is not documented yet.
For now only GRUB has theme support. GRUB themes are created using
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
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.
@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
@section Invoking @code{guix system}

19
gnu/bootloader/grub.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -88,7 +89,9 @@ (define-record-type* <grub-theme>
(color-normal grub-theme-color-normal
(default '((fg . cyan) (bg . blue))))
(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
(grub-image
@ -149,8 +152,16 @@ (define setup-gfxterm-body
;; most other modern architectures have no other mode and therefore don't
;; need to be switched.
(if (string-match "^(x86_64|i[3-6]86)-" system)
"
# Leave 'gfxmode' to 'auto'.
(string-append
"
"
(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_cirrus
insmod gfxterm
@ -166,7 +177,7 @@ (define setup-gfxterm-body
insmod vbe
insmod vga
fi
"
")
""))
(define (setup-gfxterm config font-file)