Fix GRUB theme, wallpaper, and netinstall config

- buildiso: copy Antergos GRUB theme to ISO boot directory
- profile.yaml: add antergos-grub-theme to rootfs packages
- netinstall: move antergos-grub-theme from optional Style to mandatory Default group
- main.xml: set Antergos wallpaper as KDE system default
- set-antergos-wallpaper.sh: add QDbus fallback, wait for plasmashell
- .gitignore: ignore linux-next/ and winver/

.gitignore

@@ -3,3 +3,5 @@ iso/
 out/
 install.log
 docs/_site/
+linux-next/
+winver/

buildiso

@@ -179,6 +179,13 @@ make_grub(){
 
         prepare_grub "${work_dir}/rootfs" "$layer"
 
+        # Copy Antergos GRUB theme to ISO boot (overrides Artix theme)
+        if [[ -d "${work_dir}/livefs/usr/share/grub/themes/antergos" ]]; then
+            cp -r "${work_dir}/livefs/usr/share/grub/themes/antergos" "${work_dir}/iso/boot/grub/themes/"
+        elif [[ -d "${work_dir}/rootfs/usr/share/grub/themes/antergos" ]]; then
+            cp -r "${work_dir}/rootfs/usr/share/grub/themes/antergos" "${work_dir}/iso/boot/grub/themes/"
+        fi
+
         if ${use_dracut}; then
             configure_grub_dracut
         else

iso-profiles/antergos/live-overlay/etc/calamares-online/modules/netinstall.yaml

@@ -10,6 +10,7 @@
     - grub
     - efibootmgr
     - sudo
+    - antergos-grub-theme
 
 - name: "Kernel"
   description: "Kernel and modules"
@@ -61,8 +62,7 @@
 - name: "Style"
   description: "Antergos themes, icons, branding"
   selected: false
-  packages:
+  packages: []
-    - antergos-grub-theme
 
 - name: "Desktop"
   description: "DE"

iso-profiles/antergos/live-overlay/etc/calamares/modules/netinstall.yaml

@@ -10,6 +10,7 @@
     - grub
     - efibootmgr
     - sudo
+    - antergos-grub-theme
 
 - name: "Kernel"
   description: "Kernel and modules"
@@ -61,8 +62,7 @@
 - name: "Style"
   description: "Antergos themes, icons, branding"
   selected: false
-  packages:
+  packages: []
-    - antergos-grub-theme
 
 - name: "Desktop"
   description: "DE"

iso-profiles/antergos/profile.yaml

@@ -29,6 +29,7 @@ rootfs:
     - antergos-welcome
     - antergos-next-memes
     - antergos-wallpapers
+    - antergos-grub-theme
     - hiredis
     - libdbi
     - libesmtp

iso-profiles/antergos/root-overlay/usr/local/bin/set-antergos-wallpaper.sh

@@ -22,16 +22,33 @@ fi
 
 echo "[$(date)] Wallpaper found, applying..." >> "$LOG"
 
-# Retry a few times in case desktop isn't ready yet
+# Wait for Plasma shell to be ready
-for i in 1 2 3; do
+for i in 1 2 3 4 5; do
-  /usr/bin/plasma-apply-wallpaperimage "$WALLPAPER" >> "$LOG" 2>&1
+  if qdbus org.kde.plasmashell >/dev/null 2>&1; then
-  RC=$?
+    echo "[$(date)] Plasmashell ready on attempt $i" >> "$LOG"
-  echo "[$(date)] plasma-apply-wallpaperimage attempt $i exit code: $RC" >> "$LOG"
-  if [[ $RC -eq 0 ]]; then
     break
   fi
+  echo "[$(date)] Waiting for plasmashell... (attempt $i)" >> "$LOG"
   sleep 2
 done
 
+echo "[$(date)] Trying plasma-apply-wallpaperimage..." >> "$LOG"
+/usr/bin/plasma-apply-wallpaperimage "$WALLPAPER" >> "$LOG" 2>&1
+RC=$?
+echo "[$(date)] plasma-apply-wallpaperimage exit code: $RC" >> "$LOG"
+
+if [[ $RC -ne 0 ]]; then
+  echo "[$(date)] Falling back to qdbus script..." >> "$LOG"
+  qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript "
+    desktops().forEach(function(d) {
+      d.currentConfigGroup = ['Wallpaper', 'org.kde.image', 'General'];
+      d.writeConfig('Image', 'file://${WALLPAPER}');
+      d.reloadConfig();
+    });
+  " >> "$LOG" 2>&1
+  FALLBACK_RC=$?
+  echo "[$(date)] qdbus fallback exit code: $FALLBACK_RC" >> "$LOG"
+fi
+
 touch "$MARKER"
 echo "[$(date)] Done" >> "$LOG"

iso-profiles/antergos/root-overlay/usr/share/plasma/wallpapers/org.kde.image/contents/config/main.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <kcfgfile name=""/>
+
+  <group name="General">
+    <entry name="Blur" type="bool">
+      <label>Blur background filling</label>
+      <default>false</default>
+    </entry>
+    <entry name="Color" type="Color">
+      <label>Color of the wallpaper</label>
+      <default>#ffffff</default>
+    </entry>
+    <entry name="Image" type="String">
+      <label>Wallpaper image path or wallpaper name</label>
+      <tooltip>
+        If the specified KPackage wallpaper contains dark images, then the following
+        URL fragments may be specified:
+
+        - #day-night: switch between light and dark images based on time of day
+        - #dark: only use the dark image
+        - #light: only use the light image
+        - if no fragment is specified, plasma will switch between dark and light
+          images depending on the currently used color scheme
+      </tooltip>
+      <default>file:///usr/share/wallpapers/antergos-wallpaper/contents/images/adwaita-morning.webp</default>
+    </entry>
+    <entry name="PreviewImage" type="String">
+      <label>Wallpaper preview image path</label>
+      <default>null</default>
+    </entry>
+    <entry name="FillMode" type="int">
+      <label>Sizing, cropping and positioning of the wallpaper image</label>
+      <default>2</default>
+    </entry>
+    <entry name="SlideshowFoldersFirst" type="bool">
+      <label>Display folders first when on slideshow</label>
+      <default>false</default>
+    </entry>
+    <entry name="SlidePaths" type="StringList">
+      <label>Paths used for the slideshow</label>
+      <default>preferred://wallpaperlocations</default>
+    </entry>
+    <entry name="SlideInterval" type="int">
+      <label>Interval between slides (s)</label>
+      <default>900</default>
+    </entry>
+    <entry name="UncheckedSlides" type="StringList">
+      <label>Unchecked Slides</label>
+      <default></default>
+    </entry>
+    <entry name="SlideshowMode" type="int">
+        <label>Ordering mode for the slideshow</label>
+        <default>0</default>
+    </entry>
+    <entry name="DynamicMode" type="UInt">
+        <label>Preferred dynamic wallpaper mode</label>
+        <tooltip>
+          This is a KCM implementation detail. It is used to make the dynamic
+          mode preferance persistent. #day-night, #dark, and #light fragments in
+          the Image URL actually specify what image will be used.
+
+          Possible values:
+          - 0: switch based on whether the Plasma style is dark or light
+          - 1: switch at sunrise and sunset
+          - 2: only use the light image
+          - 3: only use the dark image
+        </tooltip>
+        <default>0</default>
+    </entry>
+    <entry name="DarkLightScheduleState" type="String">
+      <label>Saved dark light schedule state</label>
+      <default></default>
+    </entry>
+    <entry name="ForceImageAnimation" type="bool">
+      <label>Force animated images to play</label>
+      <default>false</default>
+    </entry>
+  </group>
+</kcfg>