Merge pull request #242 from aryankaran/patch-1

Fix background in terminal

common/makefont.sh

@@ -0,0 +1,5 @@
+#! /usr/bin/env bash
+
+grub2-mkfont -o unifont-16.pf2 -s 16 unifont.otf
+grub2-mkfont -o unifont-24.pf2 -s 24 unifont.otf
+grub2-mkfont -o unifont-32.pf2 -s 32 unifont.otf

config/theme-1080p.txt

@@ -7,8 +7,8 @@ desktop-image: "background.jpg"
 desktop-color: "#000000"
 terminal-font: "Terminus Regular 14"
 terminal-box: "terminal_box_*.png"
-terminal-left: "0"
-terminal-top: "0"
+#terminal-left: "0"
+#terminal-top: "0"
 terminal-width: "100%"
 terminal-height: "100%"
 terminal-border: "0"

config/theme-2k.txt

@@ -7,8 +7,8 @@ desktop-image: "background.jpg"
 desktop-color: "#000000"
 terminal-font: "Terminus Regular 18"
 terminal-box: "terminal_box_*.png"
-terminal-left: "0"
-terminal-top: "0"
+#terminal-left: "0"
+#terminal-top: "0"
 terminal-width: "100%"
 terminal-height: "100%"
 terminal-border: "0"
@@ -19,7 +19,7 @@ terminal-border: "0"
   top = 30%
   width = 40%
   height = 40%
-  item_font = "DejaVu Sans Regular 24"
+  item_font = "Unifont Regular 24"
   item_color = "#cccccc"
   selected_item_color = "#ffffff"
   icon_width = 48
@@ -48,5 +48,5 @@ terminal-border: "0"
   id = "__timeout__"
   text = "Booting in %d seconds"
   color = "#cccccc"
-  font = "DejaVu Sans Regular 24"
+  font = "Unifont Regular 24"
 }

config/theme-4k.txt

@@ -7,8 +7,8 @@ desktop-image: "background.jpg"
 desktop-color: "#000000"
 terminal-font: "Terminus Regular 18"
 terminal-box: "terminal_box_*.png"
-terminal-left: "0"
-terminal-top: "0"
+#terminal-left: "0"
+#terminal-top: "0"
 terminal-width: "100%"
 terminal-height: "100%"
 terminal-border: "0"
@@ -19,7 +19,7 @@ terminal-border: "0"
   top = 30%
   width = 40%
   height = 40%
-  item_font = "DejaVu Sans Regular 32"
+  item_font = "Unifont Regular 32"
   item_color = "#cccccc"
   selected_item_color = "#ffffff"
   icon_width = 64
@@ -48,5 +48,5 @@ terminal-border: "0"
   id = "__timeout__"
   text = "Booting in %d seconds"
   color = "#cccccc"
-  font = "DejaVu Sans Regular 32"
+  font = "Unifont Regular 32"
 }

config/theme-ultrawide.txt

@@ -7,8 +7,8 @@ desktop-image: "background.jpg"
 desktop-color: "#000000"
 terminal-font: "Terminus Regular 14"
 terminal-box: "terminal_box_*.png"
-terminal-left: "0"
-terminal-top: "0"
+#terminal-left: "0"
+#terminal-top: "0"
 terminal-width: "100%"
 terminal-height: "100%"
 terminal-border: "0"

config/theme-ultrawide2k.txt

@@ -7,8 +7,8 @@ desktop-image: "background.jpg"
 desktop-color: "#000000"
 terminal-font: "Terminus Regular 18"
 terminal-box: "terminal_box_*.png"
-terminal-left: "0"
-terminal-top: "0"
+#terminal-left: "0"
+#terminal-top: "0"
 terminal-width: "100%"
 terminal-height: "100%"
 terminal-border: "0"
@@ -19,7 +19,7 @@ terminal-border: "0"
   top = 30%
   width = 40%
   height = 40%
-  item_font = "DejaVu Sans Regular 24"
+  item_font = "Unifont Regular 24"
   item_color = "#cccccc"
   selected_item_color = "#ffffff"
   icon_width = 48
@@ -48,5 +48,5 @@ terminal-border: "0"
   id = "__timeout__"
   text = "Booting in %d seconds"
   color = "#cccccc"
-  font = "DejaVu Sans Regular 24"
+  font = "Unifont Regular 24"
 }

flake.nix

@@ -32,7 +32,15 @@
             src = "${self}";
             buildInputs = [ pkgs.imagemagick ];
             installPhase = ''
-              mkdir -p $out/grub/themes;
+              mkdir -p $out/grub/themes
+
+              # Create placeholder terminal box PNGs that install.sh expects
+              mkdir -p common
+              for box in c e n ne nw s se sw w; do
+                touch common/terminal_box_$box.png
+              done
+
+              # Run the install script
               bash ./install.sh \
                 --generate $out/grub/themes \
                 --screen ${cfg.screen} \
@@ -44,9 +52,11 @@
                 rm $out/grub/themes/${cfg.theme}/background.jpg;
                 ${pkgs.imagemagick}/bin/magick ${splashImage} $out/grub/themes/${cfg.theme}/background.jpg;
               fi;
+
               if [ ${pkgs.lib.trivial.boolToString cfg.footer} == "false" ]; then
                 sed -i ':again;$!N;$!b again; s/\+ image {[^}]*}//g' $out/grub/themes/${cfg.theme}/theme.txt;
               fi;
+
               if [ ${pkgs.lib.trivial.boolToString hasBootMenuConfig} == "true" ]; then
                 sed -i ':again;$!N;$!b again; s/\+ boot_menu {[^}]*}//g' $out/grub/themes/${cfg.theme}/theme.txt;
                 cat << EOF >> $out/grub/themes/${cfg.theme}/theme.txt
@@ -55,6 +65,7 @@
               }
               EOF
               fi;
+
               if [ ${pkgs.lib.trivial.boolToString hasTerminalConfig} == "true" ]; then
                 sed -i 's/^terminal-.*$//g' $out/grub/themes/${cfg.theme}/theme.txt
                 cat << EOF >> $out/grub/themes/${cfg.theme}/theme.txt

install.sh

@@ -97,7 +97,7 @@ generate() {
   prompt -i "\n Installing ${theme} ${icon} ${screen} theme..."
 
   # Don't preserve ownership because the owner will be root, and that causes the script to crash if it is ran from terminal by sudo
-  cp -a --no-preserve=ownership "${REO_DIR}/common/"{*.png,*.pf2} "${THEME_DIR}/${theme}"
+  cp -a --no-preserve=ownership "${REO_DIR}/common/"*.pf2 "${THEME_DIR}/${theme}"
   cp -a --no-preserve=ownership "${REO_DIR}/config/theme-${screen}.txt" "${THEME_DIR}/${theme}/theme.txt"
   cp -a --no-preserve=ownership "${REO_DIR}/backgrounds/${screen}/background-${theme}.jpg" "${THEME_DIR}/${theme}/background.jpg"
 
@@ -116,13 +116,14 @@ generate() {
 
   # Determine which configuration file and assets to use
   if [[ -n "$custom_resolution" ]]; then
+    install_depends ImageMagick
     asset_type=$(get_asset_type "$custom_resolution")
     cp -a --no-preserve=ownership "${REO_DIR}/config/theme-${asset_type}.txt" "${THEME_DIR}/${theme}/theme.txt"
     # Replace resolution in theme.txt
     sed -i "s/[0-9]\+x[0-9]\+/${custom_resolution}/" "${THEME_DIR}/${theme}/theme.txt"
     # Use appropriate background as base and resize it
     cp -a --no-preserve=ownership "${REO_DIR}/backgrounds/${asset_type}/background-${theme}.jpg" "${THEME_DIR}/${theme}/background.jpg"
-    convert "${THEME_DIR}/${theme}/background.jpg" -resize ${custom_resolution}^ -gravity center -extent ${custom_resolution} "${THEME_DIR}/${theme}/background.jpg"
+    magick "${THEME_DIR}/${theme}/background.jpg" -resize ${custom_resolution}^ -gravity center -extent ${custom_resolution} "${THEME_DIR}/${theme}/background.jpg"
   else
     cp -a --no-preserve=ownership "${REO_DIR}/config/theme-${screen}.txt" "${THEME_DIR}/${theme}/theme.txt"
     cp -a --no-preserve=ownership "${REO_DIR}/backgrounds/${screen}/background-${theme}.jpg" "${THEME_DIR}/${theme}/background.jpg"
@@ -130,9 +131,10 @@ generate() {
 
   # Use custom background.jpg as grub background image
   if [[ -f "${REO_DIR}/background.jpg" ]]; then
+    install_depends ImageMagick
     prompt -w "\n Using custom background.jpg as grub background image..."
     cp -a --no-preserve=ownership "${REO_DIR}/background.jpg" "${THEME_DIR}/${theme}/background.jpg"
-    convert -auto-orient "${THEME_DIR}/${theme}/background.jpg" "${THEME_DIR}/${theme}/background.jpg"
+    magick -auto-orient "${THEME_DIR}/${theme}/background.jpg" "${THEME_DIR}/${theme}/background.jpg"
   fi
 
   # Determine which assets to use based on custom resolution or screen
@@ -213,11 +215,8 @@ install() {
     fi
 
     if grep "GRUB_BACKGROUND=" /etc/default/grub 2>&1 >/dev/null; then
-      #Replace GRUB_BACKGROUND
-      sed -i "s|.*GRUB_BACKGROUND=.*|GRUB_BACKGROUND=\"${THEME_DIR}/${theme}/background.jpg\"|" /etc/default/grub
-    else
-      #Append GRUB_BACKGROUND
-      echo "GRUB_BACKGROUND=\"${THEME_DIR}/${theme}/background.jpg\"" >> /etc/default/grub
+      # remove GRUB_BACKGROUND
+      sed -i "s|.*GRUB_BACKGROUND=.*||" /etc/default/grub
     fi
 
     # Make sure the right resolution for grub is set
@@ -267,10 +266,18 @@ install() {
 
   #Check if password is cached (if cache timestamp has not expired yet)
   elif sudo -n true 2> /dev/null && echo; then
-    if [[ "${install_boot}" == 'true' ]]; then
-      sudo "$0" -t ${theme} -i ${icon} -s ${screen} -b
+    if [[ -n "$custom_resolution" ]]; then
+      if [[ "${install_boot}" == 'true' ]]; then
+        sudo "$0" -t ${theme} -i ${icon} -c ${custom_resolution} -b
+      else
+        sudo "$0" -t ${theme} -i ${icon} -c ${custom_resolution}
+      fi
     else
-      sudo "$0" -t ${theme} -i ${icon} -s ${screen}
+      if [[ "${install_boot}" == 'true' ]]; then
+        sudo "$0" -t ${theme} -i ${icon} -s ${screen} -b
+      else
+        sudo "$0" -t ${theme} -i ${icon} -s ${screen}
+      fi
     fi
   else
     #Ask for password
@@ -281,16 +288,30 @@ install() {
         else
           sudo -S $0 -t ${theme} -i ${icon} -s ${screen} <<< ${tui_root_login}
         fi
+      elif [[ -n "$custom_resolution" ]]; then
+        if [[ "${install_boot}" == 'true' ]]; then
+          sudo -S $0 -t ${theme} -i ${icon} -c ${custom_resolution} -b <<< ${tui_root_login}
+        else
+          sudo -S $0 -t ${theme} -i ${icon} -c ${custom_resolution} <<< ${tui_root_login}
+        fi
       fi
     else
       prompt -e "\n [ Error! ] -> Run me as root! "
       read -r -p " [ Trusted ] Specify the root password : " -t ${MAX_DELAY} -s
       if sudo -S echo <<< $REPLY 2> /dev/null && echo; then
         #Correct password, use with sudo's stdin
-        if [[ "${install_boot}" == 'true' ]]; then
-          sudo -S "$0" -t ${theme} -i ${icon} -s ${screen} -b <<< ${REPLY}
+        if [[ -n "$custom_resolution" ]]; then
+          if [[ "${install_boot}" == 'true' ]]; then
+            sudo "$0" -t ${theme} -i ${icon} -c ${custom_resolution} -b <<< ${REPLY}
+          else
+            sudo "$0" -t ${theme} -i ${icon} -c ${custom_resolution} <<< ${REPLY}
+          fi
         else
-          sudo -S "$0" -t ${theme} -i ${icon} -s ${screen} <<< ${REPLY}
+          if [[ "${install_boot}" == 'true' ]]; then
+            sudo "$0" -t ${theme} -i ${icon} -s ${screen} -b <<< ${REPLY}
+          else
+            sudo "$0" -t ${theme} -i ${icon} -s ${screen} <<< ${REPLY}
+          fi
         fi
       else
         #block for 3 seconds before allowing another attempt
@@ -391,14 +412,21 @@ updating_grub() {
     grub2-mkconfig -o /boot/grub2/grub.cfg
   # Check for Fedora (regular or Atomic)
   elif has_command dnf || has_command rpm-ostree; then
-    # Check for UEFI
-    if [[ -f /boot/efi/EFI/fedora/grub.cfg ]]; then
-      prompt -s "Find config file on /boot/efi/EFI/fedora/grub.cfg ...\n"
-      grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
     # Check for BIOS
-    elif [[ -f /boot/grub2/grub.cfg ]]; then
+    if [[ -f /boot/grub2/grub.cfg ]]; then
       prompt -s "Find config file on /boot/grub2/grub.cfg ...\n"
       grub2-mkconfig -o /boot/grub2/grub.cfg
+    # Check for UEFI
+    elif [[ -f /boot/efi/EFI/fedora/grub.cfg ]]; then
+      prompt -s "Find config file on /boot/efi/EFI/fedora/grub.cfg ...\n"
+      grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
+    fi
+
+    if [[ -f /boot/grub2/grub.cfg && -f /boot/efi/EFI/fedora/grub.cfg ]]; then
+      prompt -w "\n Under EFI, GRUB2 looks for its configuration in /boot/efi/EFI/fedora/grub.cfg,\n however the postinstall script of grub2-common installs a small shim which chains to the standard configuration at /boot/grub2/grub.cfg which is generated above.\n To reset this shim to defaults, delete the existing /boot/efi/EFI/fedora/grub.cfg and then reinstall grub2-common."
+
+      prompt -i "\n  sudo rm -f /boot/efi/EFI/fedora/grub.cfg"
+      prompt -i "sudo dnf reinstall grub2-common"
     fi
   fi
 
@@ -420,10 +448,12 @@ function install_program () {
   fi
 }
 
-install_dialog() {
-  if [ ! "$(which dialog 2> /dev/null)" ]; then
-    prompt -w "\n 'dialog' need to be installed for this shell"
-    install_program "dialog"
+install_depends() {
+  local depend=${1}
+
+  if [ ! "$(which '${depend}' 2> /dev/null)" ]; then
+    prompt -w "\n '${depend}' need to be installed for this shell"
+    install_program "${depend}"
   fi
 }
 
@@ -530,7 +560,7 @@ dialog_installer() {
         fi
       fi
     fi
-    install_dialog
+    install_depends dialog
   fi
   run_dialog
   install "${theme}" "${icon}" "${screen}"