diff --git a/Containerfile b/Containerfile index 2fd3f92..cb06da1 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-base}" +ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-silverblue}" 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}" @@ -17,8 +17,8 @@ RUN wget -qO /tmp/kera-desktop.tar.gz "https://gitlab.com/kerahq/releases/-/raw/ mkdir -p /usr/share/kera-desktop-bin && \ tar -xf /tmp/kera-desktop.tar.gz -C /usr/share/kera-desktop-bin && \ /tmp/build.sh && \ + echo -e '[daemon]\nDefaultSession=kera.desktop' >> /etc/gdm/custom.conf && \ rm -rf /tmp/* /var/* && \ - systemctl enable sddm && \ ostree container commit && \ mkdir -p /var/tmp && \ chmod -R 1777 /var/tmp diff --git a/packages.json b/packages.json index e826b4a..0e3f53e 100644 --- a/packages.json +++ b/packages.json @@ -2,25 +2,7 @@ "all": { "include": { "all": [ - "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" + "cage" ] }, "exclude": { diff --git a/usr/share/wayland-sessions/kera-desktop.desktop b/usr/share/wayland-sessions/kera-desktop.desktop deleted file mode 100644 index 33b4ae7..0000000 --- a/usr/share/wayland-sessions/kera-desktop.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Name=Kera Desktop on Weston -Comment=Kera Desktop Session On Weston -Exec=/usr/bin/kera-session -Type=Application diff --git a/usr/share/wayland-sessions/kera.desktop b/usr/share/wayland-sessions/kera.desktop new file mode 100644 index 0000000..bbbb177 --- /dev/null +++ b/usr/share/wayland-sessions/kera.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=Kera Desktop +Comment=Kera Desktop Session +Exec=/usr/bin/kera-session +Type=Application