diff options
| -rw-r--r-- | doc/guix.texi | 28 | ||||
| -rw-r--r-- | gnu/bootloader/grub.scm | 13 |
2 files changed, 6 insertions, 35 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 6e3f175488..df1ba428a5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25923,22 +25923,9 @@ 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 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 +For now only GRUB has theme support. GRUB themes are created using +the @code{grub-theme} form, which is not documented yet. @defvr {Scheme Variable} %default-theme This is the default GRUB theme used by the operating system if no @@ -25949,17 +25936,6 @@ 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} diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 55e6344285..f13685ac9d 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -3,7 +3,6 @@ ;;; 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. ;;; @@ -89,9 +88,7 @@ denoting a file name." (color-normal grub-theme-color-normal (default '((fg . cyan) (bg . blue)))) (color-highlight grub-theme-color-highlight - (default '((fg . white) (bg . blue)))) - (gfxmode grub-gfxmode - (default '("auto")))) ;list of string + (default '((fg . white) (bg . blue))))) (define %background-image (grub-image @@ -152,10 +149,8 @@ system string---e.g., \"x86_64-linux\"." ;; 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) - (string-append " - set gfxmode=" (string-join - (grub-gfxmode (bootloader-configuration-theme config)) - ";") " + " + # Leave 'gfxmode' to 'auto'. insmod video_bochs insmod video_cirrus insmod gfxterm @@ -171,7 +166,7 @@ system string---e.g., \"x86_64-linux\"." insmod vbe insmod vga fi -") +" "")) (define (setup-gfxterm config font-file) |