Fix: switch to surface (#1)

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build Framework
+name: Build Surface
 on:
   schedule:
     - cron: '00 10 * * *'  # 10:00am everyday
@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         image_flavor: [main]
-        base_name: [framework]
+        base_name: [surface]
         base_image_name: [silverblue, kinoite, vauxite, sericea, base, lxqt, mate]
         major_version: [38]
         include:
@@ -103,7 +103,7 @@ jobs:
           labels: |
             org.opencontainers.image.title=${{ env.IMAGE_NAME }}
             org.opencontainers.image.version=${{ steps.labels.outputs.VERSION }}
-            org.opencontainers.image.description=Framework is an OCI image derived from Universal Blue that serves as an operating system for Framework laptops.
+            org.opencontainers.image.description=Surface is an OCI image derived from Universal Blue that serves as an operating system for Surface laptops.
 
       # Build the image using Buildah action
       - name: Build image

Containerfile

@@ -4,7 +4,7 @@ ARG SOURCE_IMAGE="${SOURCE_IMAGE:-${BASE_IMAGE_NAME}-${IMAGE_FLAVOR}}"
 ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
 
-FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS framework
+FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS surface
 ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-silverblue}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
 
@@ -13,8 +13,8 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
 COPY system_files/ /tmp/
 # Copy shared files between all images.
 COPY system_files/shared /
-COPY framework-install.sh /tmp/framework-install.sh
-COPY framework-packages.json /tmp/framework-packages.json
+COPY surface-install.sh /tmp/surface-install.sh
+COPY surface-packages.json /tmp/surface-packages.json
 
 # Setup specific files and commands for Silverblue
 RUN if grep -q "silverblue" <<< "${BASE_IMAGE_NAME}"; then \
@@ -23,7 +23,7 @@ RUN if grep -q "silverblue" <<< "${BASE_IMAGE_NAME}"; then \
 ; fi
 
 # Setup things which are the same for every image
-RUN /tmp/framework-install.sh && \
+RUN /tmp/surface-install.sh && \
     systemctl enable tlp && \
     systemctl enable fprintd && \
     rm -rf /tmp/* /var/* && \    

README.md

@@ -1,5 +1,3 @@
-# framework
+# Surface
 
-Work in progress images for Framework Laptops.
-
-[Current Documentation](https://universal-blue.org/images/bluefin/framework) - these images are generic so this documentation page will move. 
+Work in progress images for Surface Laptops.

framework-install.sh → surface-install.sh

@@ -6,10 +6,10 @@ RELEASE="$(rpm -E %fedora)"
 
 INCLUDED_PACKAGES=($(jq -r "[(.all.include | (.all, select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), \
                              (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (.all, select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[])] \
-                             | sort | unique[]" /tmp/framework-packages.json))
+                             | sort | unique[]" /tmp/surface-packages.json))
 EXCLUDED_PACKAGES=($(jq -r "[(.all.exclude | (.all, select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), \
                              (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (.all, select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[])] \
-                             | sort | unique[]" /tmp/framework-packages.json))
+                             | sort | unique[]" /tmp/surface-packages.json))
 
 
 if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then

system_files/silverblue/usr/etc/dconf/db/local.d/01-ublue-surface

@@ -0,0 +1,8 @@
+[org/gnome/desktop/interface]
+text-scaling-factor=1.25
+
+[org/gnome/desktop/peripherals/touchpad]
+tap-to-click=true
+
+[org/gnome/mutter]
+experimental-features=['scale-monitor-framebuffer']