From d662ef0284eb1bde70d8f4be3b654250d2577435 Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Thu, 5 May 2022 13:43:06 +0400 Subject: [PATCH] Add grub theme, fixes --- etc/auto/config | 6 +- etc/config/bootloaders/grub-pc/grub.cfg | 22 +++---- .../grub-pc/ubuntusway-theme/background.png | Bin 0 -> 1049 bytes .../grub-pc/ubuntusway-theme/logo.png | Bin 0 -> 15521 bytes .../grub-pc/ubuntusway-theme/theme.txt | 61 ++++++++++++++++++ .../includes.chroot/etc/greetd/config.toml | 2 +- .../desktop.list.chroot_install | 3 +- .../desktop.list.chroot_live | 20 +----- 8 files changed, 79 insertions(+), 35 deletions(-) create mode 100644 etc/config/bootloaders/grub-pc/ubuntusway-theme/background.png create mode 100644 etc/config/bootloaders/grub-pc/ubuntusway-theme/logo.png create mode 100644 etc/config/bootloaders/grub-pc/ubuntusway-theme/theme.txt diff --git a/etc/auto/config b/etc/auto/config index e9564ff..5535ae9 100755 --- a/etc/auto/config +++ b/etc/auto/config @@ -21,7 +21,7 @@ lb config noauto \ --parent-archive-areas "main restricted universe multiverse" \ --linux-packages linux-image \ --linux-flavours "$KERNEL_FLAVORS" \ - --bootappend-live "boot=casper username=ubuntusway" \ + --bootappend-live "boot=casper" \ --mirror-bootstrap "$MIRROR_URL" \ --parent-mirror-bootstrap "$MIRROR_URL" \ --mirror-chroot-security "http://security.ubuntu.com/ubuntu/" \ @@ -29,8 +29,8 @@ lb config noauto \ --mirror-binary-security "http://security.ubuntu.com/ubuntu/" \ --parent-mirror-binary-security "http://security.ubuntu.com/ubuntu/" \ --apt-source-archives false \ - --mirror-binary "mirror://mirrors.ubuntu.com/mirrors.txt" \ - --parent-mirror-binary "mirror://mirrors.ubuntu.com/mirrors.txt" \ + --mirror-binary "$MIRROR_URL" \ + --parent-mirror-binary "$MIRROR_URL" \ --keyring-packages ubuntu-keyring \ --apt-options "--yes --option Acquire::Retries=5 --option Acquire::http::Timeout=100" \ --cache-packages false \ diff --git a/etc/config/bootloaders/grub-pc/grub.cfg b/etc/config/bootloaders/grub-pc/grub.cfg index 0b23caa..f1a7bc1 100644 --- a/etc/config/bootloaders/grub-pc/grub.cfg +++ b/etc/config/bootloaders/grub-pc/grub.cfg @@ -17,6 +17,13 @@ load function_video { fi } +set color_normal=white/black +set color_highlight=black/light-gray +set timeout=10 +set timeout_style=menu + +set theme=/boot/grub/ubuntusway-theme/theme.txt + if loadfont /boot/grub/dejavu-bold-14.pf2 then set gfxmode=auto @@ -29,28 +36,21 @@ then export theme fi -set color_normal=white/black -set color_highlight=black/light-gray -set menu_color_normal=white/black -set menu_color_highlight=black/light-gray -set timeout=10 -set timeout_style=menu - -menuentry "Start Ubuntu Sway Remix" --class ubuntudde { +menuentry "Start Ubuntu Sway Remix" --class ubuntu { set gfxpayload=keep - linux /casper/vmlinuz boot=casper quiet splash --- + linux /casper/vmlinuz boot=casper --- initrd /casper/initrd.lz } menuentry "Start Ubuntu Sway Remix (Safe Graphics)" --class recovery { set gfxpayload=keep - linux /casper/vmlinuz boot=casper nomodeset quiet splash --- + linux /casper/vmlinuz boot=casper nomodeset --- initrd /casper/initrd.lz } menuentry "Check for Disk Defects" --class memtest { set gfxpayload=keep - linux /casper/vmlinuz boot=casper integrity-check quiet splash --- + linux /casper/vmlinuz boot=casper integrity-check --- initrd /casper/initrd.lz } diff --git a/etc/config/bootloaders/grub-pc/ubuntusway-theme/background.png b/etc/config/bootloaders/grub-pc/ubuntusway-theme/background.png new file mode 100644 index 0000000000000000000000000000000000000000..7e74c3df59e057b9c9a1921ca3d61ec67db39089 GIT binary patch literal 1049 zcmeAS@N?(olHy`uVBq!ia0y~yU}|7sV0^&A1Qgk|*?TjP;w|k}PqJC~?lu%}vcKVQ?-=O)N=GQ7F$W$xv|j^bH7a z+L~CMxd4^h5zgGJRCsGQ7{?;qaiQ=A@CtXXcGgYn78^&kma7P KelF{r5}E)5iz(p% literal 0 HcmV?d00001 diff --git a/etc/config/bootloaders/grub-pc/ubuntusway-theme/logo.png b/etc/config/bootloaders/grub-pc/ubuntusway-theme/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f4ada4fa60a957eb80bcab8a2c4340fb34716d73 GIT binary patch literal 15521 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 DV+&!f literal 0 HcmV?d00001 diff --git a/etc/config/bootloaders/grub-pc/ubuntusway-theme/theme.txt b/etc/config/bootloaders/grub-pc/ubuntusway-theme/theme.txt new file mode 100644 index 0000000..a8831e2 --- /dev/null +++ b/etc/config/bootloaders/grub-pc/ubuntusway-theme/theme.txt @@ -0,0 +1,61 @@ +title-text: "" +desktop-image: "background.png" +desktop-color: "#000000" +title-color: "#ffffff" +title-font: "DejaVu Sans Bold 16" +message-font: "Unifont Regular 16" + +terminal-left: "0" +terminal-top: "0" +terminal-width: "100%" +terminal-height: "100%" +terminal-border: "0" + +# Logo image ++ image { + left = 50%-50 + top = 50%-50 + file = "logo.png" +} + +#help bar at the bottom ++ label { + top = 100%-50 + left = 0 + width = 100% + height = 20 + text = "@KEYMAP_SHORT@" + align = "center" + color = "#ffffff" + font = "DejaVu Sans Bold 14" +} + +#boot menu ++ boot_menu { + left = 50%-150 + width = 500 + top = 50%+100 + height = 300 + + item_font = "DejaVu Sans Bold 14" + item_color = "#999" + selected_item_font = "DejaVu Sans Bold 14" + selected_item_color= "#fff" + + item_height = 26 + item_padding = 0 + item_icon_space = 0 + item_spacing = 1 + scrollbar = false +} + +# Show a countdown message using the label component ++ label { + top = 82% + left = 35% + width = 30% + align = "center" + id = "__timeout__" + text = "Booting in %d seconds" + color = "#f6f6f6" +} diff --git a/etc/config/includes.chroot/etc/greetd/config.toml b/etc/config/includes.chroot/etc/greetd/config.toml index 85296fa..c1562cb 100644 --- a/etc/config/includes.chroot/etc/greetd/config.toml +++ b/etc/config/includes.chroot/etc/greetd/config.toml @@ -7,4 +7,4 @@ user = "greeter" [initial_session] command = "sway" -user = "ubuntusway" +user = "ubuntu" diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_install b/etc/config/package-lists.calamares/desktop.list.chroot_install index 95ea814..67efc74 100644 --- a/etc/config/package-lists.calamares/desktop.list.chroot_install +++ b/etc/config/package-lists.calamares/desktop.list.chroot_install @@ -1,2 +1,3 @@ -ubuntu-minimal ubuntusway-desktop + +@XORG_HWE diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_live b/etc/config/package-lists.calamares/desktop.list.chroot_live index aeebcfb..161b7b6 100644 --- a/etc/config/package-lists.calamares/desktop.list.chroot_live +++ b/etc/config/package-lists.calamares/desktop.list.chroot_live @@ -1,23 +1,5 @@ -casper -expect -gparted -calamares-settings-ubuntusway -cifs-utils -language-pack-en -language-pack-gnome-en -xfsprogs -jfsutils -reiserfsprogs +ubuntusway-live ntfs-3g -lvm2 -dmraid -wamerican fwupdate -mokutil -qml-module-qtquick-dialogs -qml-module-qtquick-controls -qml-module-qtquick-layouts -qml-module-qtquick-window2 -zram-config shim-signed shim