Merge pull request #12 from tulilirockz/main

feat!: clean repo and add kera-session with proper build

.github/workflows/build.yml

@@ -117,7 +117,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           oci: false
           extra-args: |
-            --target=${{ matrix.base_name }}
+            --target=builder
 
       # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.
       # https://github.com/macbre/push-to-ghcr/issues/12

Containerfile

@@ -1,30 +1,26 @@
-ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-silverblue}"
+ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-base}"
 ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
 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 kera
+FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS builder
 
+COPY usr /usr
 ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 
-COPY etc /etc
-COPY usr /usr
-
 ADD packages.json /tmp/packages.json
 ADD build.sh /tmp/build.sh
 
-RUN /tmp/build.sh && \
-    pip install --prefix=/usr yafti && \
-    systemctl unmask dconf-update.service && \
-    systemctl enable dconf-update.service && \
-    systemctl enable rpm-ostree-countme.service && \
-    fc-cache -f /usr/share/fonts/inter && \
+RUN wget -qO /tmp/kera-desktop.tar.gz "https://gitlab.com/kerahq/releases/-/raw/main/Kera%20Desktop/Kera-Desktop-Linux-x64.tar.gz" && \
+    mkdir -p /usr/share/kera-desktop-bin && \
+    tar -xf /tmp/kera-desktop.tar.gz -C /usr/share/kera-desktop-bin && \
+    /tmp/build.sh && \
     rm -rf /tmp/* /var/* && \
+    systemctl enable sddm && \
     ostree container commit && \
     mkdir -p /var/tmp && \
     chmod -R 1777 /var/tmp
 
-RUN rm -rf /tmp/* /var/*
 RUN ostree container commit

README.md

@@ -1,3 +1,17 @@
 # kera
 
-An alpha image of [Kera Desktop](https://desktop.kerahq.com/)
+An alpha image of [Kera Desktop](https://desktop.kerahq.com/)
+
+[![build](https://github.com/ublue-os/kera/actions/workflows/build.yml/badge.svg)](https://github.com/ublue-os/kera/actions/workflows/build.yml)
+
+![Kera Desktop Showcase Image](kera-showcase.png)
+
+To try this image, you can use an existing Fedora Silverblue install.
+
+## Rebase from Fedora Silverblue
+
+    rpm-ostree rebase ostree-image-signed:docker://ghcr.io/ublue-os/kera-main:latest
+
+or if you have an NVIDIA GPU:
+
+    rpm-ostree rebase ostree-image-signed:docker://ghcr.io/ublue-os/kera-nvidia:latest

boot_menu.yml

@@ -0,0 +1,48 @@
+ublue_variants:
+  - label: ublue-os/main
+    ks: /kickstart/ublue-os.ks
+    flavors:
+      - label: silverblue-main
+        info: GNOME
+      - label: kinoite-main
+        info: KDE
+      - label: vauxite-main
+        info: Xfce
+      - label: sericea-main
+        info: Sway
+      - label: cinnamon-main
+        info: Cinnamon
+      - label: lxqt-main
+      - label: mate-main
+      - label: deepin-main
+      - label: base-main
+        info: no DE
+  - label: ublue-os/nvidia
+    ks: /kickstart/ublue-os-nvidia.ks
+    subvariants:
+      - label: latest driver
+      - label: 470xx driver
+        suffix: -470
+    flavors:
+      - label: silverblue-nvidia
+        info: GNOME
+      - label: kinoite-nvidia
+        info: KDE
+      - label: vauxite-nvidia
+        info: Xfce
+      - label: sericea-nvidia
+        info: Sway
+      - label: cinnamon-nvidia
+        info: Cinnamon
+      - label: lxqt-nvidia
+      - label: mate-nvidia
+      - label: deepin-nvidia
+        info: DDE
+      - label: base-nvidia
+        info: no DE
+  - label: ublue-os/bluefin
+    ks: /kickstart/ublue-os.ks
+    flavors:
+      - label: bluefin
+      - label: bluefin-nvidia
+        ks: /kickstart/ublue-os-nvidia.ks

packages.json

@@ -2,20 +2,37 @@
     "all": {
         "include": {
             "all": [
-                "gnome-console",
-                "gnome-shell-extension-dash-to-dock",
-                "python3-pip"
+                "cage",
+                "sddm",
+                "wireplumber",
+                "pipewire-gstreamer",
+                "pipewire-pulseaudio",
+                "pipewire-alsa",
+                "pipewire-jack-audio-connection-kit",
+                "pipewire-plugin-libcamera",
+                "pavucontrol",
+                "gnome-software",
+                "nm-connection-editor",
+                "NetworkManager-adsl",
+                "NetworkManager-bluetooth",
+                "NetworkManager-ppp",
+                "NetworkManager-wifi",
+                "NetworkManager-wwan",
+                "blueman",
+                "polkit-gnome",
+                "qt5-qtwayland"
             ]
         },
         "exclude": {
-            "all": [
-                "gnome-terminal",
-                "gnome-terminal-nautilus",
-                "htop",
-                "firefox",
-                "firefox-langpacks",
-                "nvtop"
-            ]
+            "all": []
+        }
+    },
+    "37": {
+        "include": {
+            "all": []
+        },
+        "exclude": {
+            "all": []
         }
     },
     "38": {