Skip to content
This repository has been archived by the owner on Mar 24, 2024. It is now read-only.

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

Merged
merged 2 commits into from
Sep 24, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -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
16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
48 changes: 48 additions & 0 deletions boot_menu.yml
Original file line number Diff line number Diff line change
@@ -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
41 changes: 0 additions & 41 deletions etc/dconf/db/local.d/01-ublue

This file was deleted.

2 changes: 0 additions & 2 deletions etc/dconf/profile/user

This file was deleted.

6 changes: 0 additions & 6 deletions etc/profile.d/beyond-firstboot.sh

This file was deleted.

1 change: 0 additions & 1 deletion etc/profile.d/nix-app-icons.sh

This file was deleted.

8 changes: 0 additions & 8 deletions etc/skel.d/.config/autostart/beyond-firstboot.desktop

This file was deleted.

10 changes: 0 additions & 10 deletions etc/systemd/system/dconf-update.service

This file was deleted.

144 changes: 0 additions & 144 deletions etc/yafti.yml

This file was deleted.

8 changes: 0 additions & 8 deletions etc/yum.repos.d/tailscale.repo

This file was deleted.

Binary file added kera-showcase.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 28 additions & 11 deletions packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
5 changes: 5 additions & 0 deletions usr/bin/kera-session
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
cage Xwayland :1 &
sleep 1
export DISPLAY=:1
DISPLAY=:1 /usr/share/kera-desktop-bin/Kera-Desktop
Loading
Loading