Add grub theme, fixes

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" \
+    --mirror-binary "$MIRROR_URL" \
-    --parent-mirror-binary "mirror://mirrors.ubuntu.com/mirrors.txt" \
+    --parent-mirror-binary "$MIRROR_URL" \
     --keyring-packages ubuntu-keyring \
     --apt-options "--yes --option Acquire::Retries=5 --option Acquire::http::Timeout=100" \
     --cache-packages false \

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 ubuntu {
-menuentry "Start Ubuntu Sway Remix" --class ubuntudde {
 	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
 }
 

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"
+}

etc/config/includes.chroot/etc/greetd/config.toml

@@ -7,4 +7,4 @@ user = "greeter"
  
 [initial_session]
 command = "sway"
-user = "ubuntusway"
+user = "ubuntu"

etc/config/package-lists.calamares/desktop.list.chroot_install

@@ -1,2 +1,3 @@
-ubuntu-minimal
 ubuntusway-desktop
+
+@XORG_HWE

etc/config/package-lists.calamares/desktop.list.chroot_live

@@ -1,23 +1,5 @@
-casper
+ubuntusway-live
-expect
-gparted
-calamares-settings-ubuntusway
-cifs-utils
-language-pack-en
-language-pack-gnome-en
-xfsprogs
-jfsutils
-reiserfsprogs
 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