Skip to content

Commit 25296b5

Browse files
committed
fix: rename kinokite-deck image
1 parent dce1a10 commit 25296b5

File tree

6 files changed

+40
-39
lines changed

6 files changed

+40
-39
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
2-
name: kinokite-deck image
2+
name: dankydeck image
33

44
on:
55
schedule:
66
- cron: '0 3 * * *'
77
push:
88
branches: ["main"]
99
paths:
10-
- Containerfile.kinokite
10+
- Containerfile.dankydeck
1111
- build/02_plasma.sh
1212
- build/99_cleanup.sh
1313
- system/**
1414

1515
env:
1616
DEFAULT_TAG: "latest"
17-
IMAGE_NAME: kinokite-deck
17+
IMAGE_NAME: dankydeck
1818
IMAGE_DESC: "Customized image of bazzite"
1919
IMAGE_REGISTRY: "ghcr.io/${{ github.repository_owner }}"
2020
REGISTRY: ghcr.io
@@ -61,7 +61,7 @@ jobs:
6161
org.opencontainers.image.created=${{ steps.date.outputs.date }}
6262
org.opencontainers.image.description=${{ env.IMAGE_DESC }}
6363
org.opencontainers.image.documentation=https://raw.githubusercontent.com/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}/${{ github.sha }}/README.md
64-
org.opencontainers.image.source=https://github.com/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}/blob/${{ github.sha }}/Containerfile.kinokite-deck
64+
org.opencontainers.image.source=https://github.com/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}/blob/${{ github.sha }}/Containerfile.dankydeck
6565
org.opencontainers.image.title=${{ env.IMAGE_NAME }}
6666
org.opencontainers.image.url=https://github.com/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}/tree/${{ github.sha }}
6767
org.opencontainers.image.vendor=${{ github.repository_owner }}
@@ -78,7 +78,7 @@ jobs:
7878
uses: redhat-actions/buildah-build@7a95fa7ee0f02d552a32753e7414641a04307056 # v2
7979
with:
8080
containerfiles: |
81-
./Containerfile.kinokite-deck
81+
./Containerfile.dankydeck
8282
image: ${{ env.IMAGE_NAME }}
8383
tags: ${{ steps.metadata.outputs.tags }}
8484
labels: ${{ steps.metadata.outputs.labels }}
Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ COPY cosign.pub /cosign.pub
55

66
FROM ghcr.io/ublue-os/bazzite-deck:stable
77

8-
ARG IMAGE_NAME="kinokite-deck"
8+
ARG IMAGE_NAME="dankydeck"
99
ARG IMAGE_VENDOR="clemak27"
1010

1111
RUN mkdir -p /var/lib/alternatives
@@ -14,16 +14,7 @@ RUN --mount=type=bind,from=ctx,src=/,dst=/ctx \
1414
--mount=type=cache,target=/var/cache \
1515
--mount=type=cache,target=/var/log \
1616
--mount=type=tmpfs,target=/tmp \
17-
dnf -y install podman-docker zsh && \
18-
dnf -y remove ptyxis && \
19-
mkdir -p /etc/containers && \
20-
touch /etc/containers/nodocker && \
21-
systemctl enable podman.socket && \
22-
sed -i 's@/bin/bash@/bin/zsh@g' /etc/default/useradd && \
23-
mkdir -p /etc/pki/containers && \
24-
cp /ctx/cosign.pub /etc/pki/containers/clemak27.pub && \
25-
restorecon -RFv /etc/pki/containers && \
26-
restorecon -RFv /etc/containers && \
17+
/ctx/01_bazzite.sh && \
2718
/ctx/02_plasma.sh && \
2819
/ctx/99_cleanup.sh && \
2920
ostree container commit && \

README.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,33 @@ but feel free to use it as inspiration.
99
Dotfiles and setup for user-specific changes are in my
1010
[linux_setup repo](https://github.com/clemak27/linux_setup).
1111

12-
It currently builds 3 Images:
12+
It currently builds 2 Images:
1313

1414
### `dankfedora`
1515

1616
A `bootc` image with [DMS](https://github.com/AvengeMedia/DankMaterialShell)
1717
and [niri](https://github.com/YaLTeR/niri).
1818

19-
### `kinokite`
19+
### `dankydeck`
2020

21-
Based on Fedora Kinoite.
21+
An image based on `bazzite-deck`.
2222

2323
It installs some basic packages and sets up some
2424
Plasma extensions.
25-
A significant one is [kröhnkite](https://github.com/anametologin/krohnkite),
26-
hence the name of the image.
27-
28-
### `kinokite-deck`
29-
30-
This is similar to `kinokite`, but based on `bazzite-deck`.
25+
A significant one is [karousel](https://github.com/peterfajdiga/karousel),
26+
which gives plasma a niri-style scrolling/tiling workflow.
3127

3228
## Usage
3329

3430
In a fresh Fedora Atomic installation (e.g. Silverblue or Kinoite), change the
3531
base image:
3632

3733
```sh
38-
rpm-ostree rebase ostree-unverified-registry:ghcr.io/clemak27/kinokite:latest
34+
rpm-ostree rebase ostree-unverified-registry:ghcr.io/clemak27/dankfedora:latest
3935
```
4036

4137
After a reboot, you can change to a signed image:
4238

4339
```sh
44-
rpm-ostree rebase ostree-image-signed:docker://ghcr.io/clemak27/kinokite:latest
40+
rpm-ostree rebase ostree-image-signed:docker://ghcr.io/clemak27/dankfedora:latest
4541
```

build/01_bazzite.sh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/bash
2+
3+
set -ouex pipefail
4+
5+
dnf -y install podman-docker zsh
6+
dnf -y remove ptyxis
7+
8+
# podman
9+
10+
mkdir -p /etc/containers
11+
touch /etc/containers/nodocker
12+
13+
systemctl enable podman.socket
14+
15+
# change default shell
16+
17+
sed -i 's@/bin/bash@/bin/zsh@g' /etc/default/useradd
18+
19+
# signed image
20+
21+
mkdir -p /etc/pki/containers
22+
cp /ctx/cosign.pub /etc/pki/containers/clemak27.pub
23+
24+
restorecon -RFv /etc/pki/containers
25+
restorecon -RFv /etc/containers

build/02_plasma.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,6 @@ tar xzf kara.tar.gz
4949
mkdir -p "/usr/share/plasma/plasmoids"
5050
mv kara-$kara_version "/usr/share/plasma/plasmoids/org.dhruv8sh.kara"
5151

52-
# krohnkite
53-
54-
# renovate: datasource=forgejo-tags depName=anametologin/Krohnkite versioning=loose registryUrl=https://codeberg.org
55-
krohnkite_version=0.9.9.2
56-
57-
cd /tmp
58-
curl -fL -o /tmp/krohnkite.kwinscript https://github.com/anametologin/krohnkite/releases/download/$krohnkite_version/krohnkite.kwinscript
59-
unzip /tmp/krohnkite.kwinscript -d /tmp/krohnkite
60-
mkdir -p "/usr/share/kwin/scripts/krohnkite"
61-
mv /tmp/krohnkite/* "/usr/share/kwin/scripts/krohnkite"
62-
6352
# renovate: datasource=github-tags depName=peterfajdiga/karousel versioning=loose
6453
karousel_version=0.15
6554

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ docker build -t ${REGISTRY}/dankfedora:${IMAGE_TAG} . -f ./Containerfile.dankfed
2424

2525
[tasks.build-image-deck]
2626
run = """
27-
docker build -t ${REGISTRY}/kinokite-deck:${IMAGE_TAG} . -f ./Containerfile.deck
27+
docker build -t ${REGISTRY}/dankydeck:${IMAGE_TAG} . -f ./Containerfile.dankydeck
2828
"""

0 commit comments

Comments
 (0)