diff --git a/README.md b/README.md index 0f9b56a..9744e91 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,95 @@ +# Vladan's X13 Gen 1 Sway Desktop config + +This is an [rpm-ostree](https://coreos.github.io/rpm-ostree/) based minimal +[Fedora](https://getfedora.org/) developer desktop with the [sway window manager](https://swaywm.org/) and [podman](https://podman.io/)/[toolbox](https://docs.fedoraproject.org/en-US/fedora-silverblue/toolbox/) for doing development and running less common graphical applications. + +Run `sudo ./compose.sh` from the root folder of this repo to build the rootfs in a local repo. Don't forget to change the path related env vars. + +--- +Original README for [workstation-ostree-config](https://pagure.io/workstation-ostree-config) +--- + +# Manifests for rpm-ostree based Fedora variants + +This is the configuration needed to create +[rpm-ostree](https://coreos.github.io/rpm-ostree/) based variants of Fedora. +Each variant is described in a YAML +[treefile](https://coreos.github.io/rpm-ostree/treefile/) which is then used by +rpm-ostree to compose an ostree commit with the package requested. + +In the Fedora infrastructure, this happens via +[pungi](https://pagure.io/pungi-fedora) with +[Lorax](https://github.com/weldr/lorax) +([templates](https://pagure.io/fedora-lorax-templates)). + +## Fedora Silverblue + +- Website: https://silverblue.fedoraproject.org/ ([sources](https://github.com/fedora-silverblue/silverblue-site)) +- Documentation: https://docs.fedoraproject.org/en-US/fedora-silverblue/ ([sources](https://github.com/fedora-silverblue/silverblue-docs)) +- Issue tracker: https://github.com/fedora-silverblue/issue-tracker/issues + +## Fedora Kinoite + +- Website: https://kinoite.fedoraproject.org/ ([sources](https://pagure.io/fedora-kde/kinoite-site)) +- Documentation: https://docs.fedoraproject.org/en-US/fedora-kinoite/ ([sources](https://pagure.io/fedora-kde/kinoite-docs)) +- Issue tracker: https://pagure.io/fedora-kde/SIG/issues + +## Building + +Instructions to perform a local build of Silverblue: + +``` +# Clone the config +git clone https://pagure.io/workstation-ostree-config && cd workstation-ostree-config + +# Prepare directories +mkdir -p repo cache +ostree --repo=repo init --mode=archive + +# Build (compose) the variant of your choice +sudo rpm-ostree compose tree --repo=repo --cachedir=cache fedora-silverblue.yaml + +# Update summary file +ostree summary --repo=repo --update +``` + +## Testing + +Instructions to test the resulting build: + +- First, serve the ostree repo using an HTTP server. You can use any static file server. For example using : + + ``` + simple-http-server --index --ip 192.168.122.1 --port 8000 + ``` + +- Then, on an already installed Silverblue system: + +``` +# Add an ostree remote +sudo ostree remote add testremote http://192.168.122.1:8000/repo --no-gpg-verify + +# Pin the currently deployed (and probably working) version +sudo ostree admin pin 0 + +# List refs from variant remote +sudo ostree remote refs testremote + +# Switch to your variant +sudo rpm-ostree rebase testremote:fedora/rawhide/x86_64/silverblue + +# Reboot and test! +``` + +## Historical references + +Building and testing instructions: + +- https://dustymabe.com/2017/10/05/setting-up-an-atomic-host-build-server/ +- https://dustymabe.com/2017/08/08/how-do-we-create-ostree-repos-and-artifacts-in-fedora/ +- https://www.projectatomic.io/blog/2017/12/compose-custom-ostree/ +- https://www.projectatomic.io/docs/compose-your-own-tree/ + For some background, see: - diff --git a/better-fonts-36.repo b/better-fonts-37.repo similarity index 90% rename from better-fonts-36.repo rename to better-fonts-37.repo index d355377..90740cc 100644 --- a/better-fonts-36.repo +++ b/better-fonts-37.repo @@ -1,6 +1,6 @@ [copr:copr.fedorainfracloud.org:dawid:better_fonts] name=Copr repo for better_fonts owned by dawid -baseurl=https://download.copr.fedorainfracloud.org/results/dawid/better_fonts/fedora-36-$basearch/ +baseurl=https://download.copr.fedorainfracloud.org/results/dawid/better_fonts/fedora-37-$basearch/ type=rpm-md skip_if_unavailable=True gpgcheck=1 diff --git a/compose.sh b/compose.sh index c68628d..9b93213 100755 --- a/compose.sh +++ b/compose.sh @@ -10,3 +10,5 @@ if [ ! -d $REPO/objects ]; then fi rpm-ostree compose tree --unified-core --cachedir=$CACHE --repo=$REPO x13-gen1-sway-desktop.yaml +ostree summary --repo=$REPO --update + diff --git a/fedora-36-updates.repo b/fedora-37-updates.repo similarity index 55% rename from fedora-36-updates.repo rename to fedora-37-updates.repo index 563c4d5..c5b65df 100644 --- a/fedora-36-updates.repo +++ b/fedora-37-updates.repo @@ -1,6 +1,6 @@ -[fedora-36-updates] -name=Fedora 36 $basearch Updates -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f36&arch=$basearch +[fedora-37-updates] +name=Fedora 37 $basearch Updates +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f37&arch=$basearch enabled=1 gpgcheck=1 metadata_expire=1d diff --git a/fedora-36.repo b/fedora-37.repo similarity index 64% rename from fedora-36.repo rename to fedora-37.repo index 67918a5..7e41cb3 100644 --- a/fedora-36.repo +++ b/fedora-37.repo @@ -1,6 +1,6 @@ -[fedora-36] -name=Fedora 36 $basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-36&arch=$basearch +[fedora-37] +name=Fedora 37 $basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-37&arch=$basearch enabled=1 gpgcheck=1 metadata_expire=1d diff --git a/greetd-36.repo b/greetd-37.repo similarity index 90% rename from greetd-36.repo rename to greetd-37.repo index 2152ba6..9decc39 100644 --- a/greetd-36.repo +++ b/greetd-37.repo @@ -1,6 +1,6 @@ [copr:copr.fedorainfracloud.org:alebastr:sway-extras] name=Copr repo for sway-extras owned by alebastr -baseurl=https://download.copr.fedorainfracloud.org/results/alebastr/sway-extras/fedora-36-$basearch/ +baseurl=https://download.copr.fedorainfracloud.org/results/alebastr/sway-extras/fedora-37-$basearch/ type=rpm-md skip_if_unavailable=True gpgcheck=1 diff --git a/post.sh b/post.sh index 39db86f..461b514 100755 --- a/post.sh +++ b/post.sh @@ -26,3 +26,6 @@ for x in /usr/sbin/glibc_post_upgrade.*; do ln -srf /usr/bin/true ${x} fi done + +# enable services +systemctl enable greetd diff --git a/rpmfusion-free-36.repo b/rpmfusion-free-37.repo similarity index 74% rename from rpmfusion-free-36.repo rename to rpmfusion-free-37.repo index 73c8297..f21c8d7 100644 --- a/rpmfusion-free-36.repo +++ b/rpmfusion-free-37.repo @@ -1,33 +1,32 @@ -[rpmfusion-free-36] -name=RPM Fusion for Fedora 36 - Free +[rpmfusion-free-37] +name=RPM Fusion for Fedora 37 - Free #baseurl=http://download1.rpmfusion.org/free/fedora/releases/36/Everything/$basearch/os/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-36&arch=$basearch +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-37&arch=$basearch enabled=0 metadata_expire=14d type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 -[rpmfusion-free-debuginfo-36] -name=RPM Fusion for Fedora 36 - Free - Debug +[rpmfusion-free-debuginfo-37] +name=RPM Fusion for Fedora 37 - Free - Debug #baseurl=http://download1.rpmfusion.org/free/fedora/releases/36/Everything/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-36&arch=$basearch +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-37&arch=$basearch enabled=0 metadata_expire=7d type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 -[rpmfusion-free-source-36] -name=RPM Fusion for Fedora 36 - Free - Source +[rpmfusion-free-source-37] +name=RPM Fusion for Fedora 37 - Free - Source #baseurl=http://download1.rpmfusion.org/free/fedora/releases/36/Everything/source/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-36&arch=$basearch +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-37&arch=$basearch enabled=0 metadata_expire=7d type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36 - +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 diff --git a/rpmfusion-free-updates-36.repo b/rpmfusion-free-updates-37.repo similarity index 66% rename from rpmfusion-free-updates-36.repo rename to rpmfusion-free-updates-37.repo index 4bb0d7c..6e1831b 100644 --- a/rpmfusion-free-updates-36.repo +++ b/rpmfusion-free-updates-37.repo @@ -1,30 +1,29 @@ -[rpmfusion-free-updates-36] -name=RPM Fusion for Fedora 36 - Free - Updates +[rpmfusion-free-updates-37] +name=RPM Fusion for Fedora 37 - Free - Updates #baseurl=http://download1.rpmfusion.org/free/fedora/updates/36/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-36&arch=$basearch +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-37&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 -[rpmfusion-free-updates-debuginfo-36] -name=RPM Fusion for Fedora 36 - Free - Updates Debug +[rpmfusion-free-updates-debuginfo-37] +name=RPM Fusion for Fedora 37 - Free - Updates Debug #baseurl=http://download1.rpmfusion.org/free/fedora/updates/36/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-36&arch=$basearch +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-37&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 -[rpmfusion-free-updates-source-36] -name=RPM Fusion for Fedora 36 - Free - Updates Source +[rpmfusion-free-updates-source-37] +name=RPM Fusion for Fedora 37 - Free - Updates Source #baseurl=http://download1.rpmfusion.org/free/fedora/updates/36/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-36&arch=$basearch +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-37&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-36 - +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-37 diff --git a/x13-gen1-sway-desktop.yaml b/x13-gen1-sway-desktop.yaml index f8a53d0..c96cf14 100644 --- a/x13-gen1-sway-desktop.yaml +++ b/x13-gen1-sway-desktop.yaml @@ -1,17 +1,17 @@ -ref: x13-gen1-sway-desktop-36 +ref: x13-gen1-sway-desktop-37 rojig: - name: x13-gen1-sway-desktop-36 - summary: "Thinkpad X13 Gen 1 Sway Desktop - Fedora 36" + name: x13-gen1-sway-desktop-37 + summary: "Thinkpad X13 Gen 1 Sway Desktop - Fedora 37" license: MIT -automatic_version_prefix: "36" -mutate-os-release: "36" +automatic_version_prefix: "37" +mutate-os-release: "37" repos: - - fedora-36 - - fedora-36-updates - - rpmfusion-free-36 - - rpmfusion-free-updates-36 + - fedora-37 + - fedora-37-updates + - rpmfusion-free-37 + - rpmfusion-free-updates-37 - copr:copr.fedorainfracloud.org:dawid:better_fonts - copr:copr.fedorainfracloud.org:alebastr:sway-extras @@ -121,7 +121,6 @@ packages: - fontawesome-fonts-web - fontconfig - fontconfig-enhanced-defaults - - fontconfig-font-replacements - google-noto-emoji-color-fonts - google-noto-sans-gurmukhi-fonts - google-noto-sans-sinhala-vf-fonts @@ -144,7 +143,7 @@ packages: - sil-mingzat-fonts - sil-nuosu-fonts - sil-padauk-fonts - - smc-meera-fonts + - rit-meera-new-fonts - terminus-fonts - thai-scalable-waree-fonts - ucs-miscfixed-opentype-fonts