Merge branch 'live' into blue-build

config/common_modules/scripts.yml

@@ -1,6 +1,7 @@
 type: script
 scripts:
+  - fix-signing.sh
   - file-permissions.sh
+  - printer-drivers.sh
   - power-scheduler.sh
   - systemwide-themes.sh
-  - signing.sh

config/files/usr/share/ublue-os/firstboot/yafti.yml

@@ -68,9 +68,8 @@ screens:
           description: Other uncategorized applications.
           default: false
           packages:
-            - ZapZap: com.rtosta.zapzap
             - Caprine: com.sindresorhus.Caprine
-            - Materialgram: io.github.kukuruzka165.materialgram
+            - Telegram: org.telegram.desktop
             - Upscaler: io.gitlab.theevilskeleton.Upscaler
 
   can-we-harden-your-kargs:
@@ -91,6 +90,15 @@ screens:
       actions:
         - run: pkexec ujust configure-grub hide
 
+  can-we-append-kargs-nvidia:
+    source: yafti.screen.consent
+    values:
+      title: NVIDIA Kernel Parameters
+      description: |
+        This step will append needed kernel parameters for NVIDIA drivers. If you have an NVIDIA GPU, you should run this. 
+      actions:
+        - run: pkexec ujust configure-nvidia kargs
+
   final-screen:
     source: yafti.screen.title
     values:

config/scripts/fix-signing.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -euo pipefail
+
+cp "/usr/etc/containers/$IMAGE_NAME.pub" "/usr/etc/pki/containers/$IMAGE_NAME.pub"

config/scripts/printer-drivers.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -euo pipefail
+
+RPM_ROOT="/tmp/rpms"
+
+wget -O "${RPM_ROOT}/brother-hl-1112E-CUPS.rpm" https://support.brother.com/g/b/files/dlf/dlf007073/hl1110cupswrapper-3.0.1-1.i386.rpm
+wget -O "${RPM_ROOT}/brother-hl-1112E-LPR.rpm" https://support.brother.com/g/b/files/dlf/dlf007071/hl1110lpr-3.0.1-1.i386.rpm
+
+cd "${RPM_ROOT}" || exit
+
+rpm-ostree install brother-hl-1112E-CUPS.rpm brother-hl-1112E-LPR.rpm

config/silverflow-nvidia-39.yml

@@ -14,4 +14,7 @@ modules:
   - from-file: common_modules/bling.yml
   - from-file: common_modules/systemd.yml
   - from-file: common_modules/image-cleaner.yml
+
+  - type: signing
+
   - from-file: common_modules/scripts.yml

config/silverflow-nvidia-gts.yml

@@ -12,4 +12,7 @@ modules:
   - from-file: common_modules/bling.yml
   - from-file: common_modules/systemd.yml
   - from-file: common_modules/image-cleaner.yml
+
+  - type: signing
+
   - from-file: common_modules/scripts.yml