From dacd58f91af6d3ec69e47437565554c91b3da600 Mon Sep 17 00:00:00 2001 From: Jakub Kujawa <50410667+C0dePlayer@users.noreply.github.com> Date: Wed, 11 Oct 2023 22:07:18 +0200 Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=93=83=20docs(README):=20Update=20REA?= =?UTF-8?q?DME.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c4936d678b..9436b287c2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ SilverFlow is based on [ublue-os/startingpoint](https://github.com/ublue-os/star ## Installation -> [!NOTE] +> **NOTE** > I recommend either using one of the main uBlue images or creating your own **Recommended:** Use the latest ISO from [the Releases page](https://github.com/C0dePlayer/silverflow/releases) @@ -22,7 +22,7 @@ SilverFlow is based on [ublue-os/startingpoint](https://github.com/ublue-os/star - This repository builds date tags as well, so if you want to rebase to a particular day's build: ``` - sudo rpm-ostree rebase ostree-image-signed:docker://ghcr.io/c0deplayer/silverflow-nvidia:20230403 + sudo rpm-ostree rebase ostree-unverified-registry:ghcr.io/c0deplayer/silverflow-nvidia:20231005 ``` 2. Reboot to complete the rebase: @@ -32,3 +32,9 @@ SilverFlow is based on [ublue-os/startingpoint](https://github.com/ublue-os/star 3. After first boot, the first time that [ublue-update](https://github.com/ublue-os/ublue-update) runs it will automatically rebase you onto the signed image. + +## Verification + +These images are signed with sisgstore's [cosign](https://docs.sigstore.dev/cosign/overview/). You can verify the signature by downloading the `cosign.pub` key from this repo and running the following command: + + cosign verify --key cosign.pub ghcr.io/c0deplayer/silverflow-nvidia From ff62cd164b077d7c97f06d14c8d155c7296d176f Mon Sep 17 00:00:00 2001 From: Jakub Kujawa Date: Wed, 11 Oct 2023 22:52:33 +0200 Subject: [PATCH 2/9] =?UTF-8?q?=F0=9F=90=8E=20ci(config):=20remove=20more?= =?UTF-8?q?=20desktop=20shortcuts=20from=20the=20OS=20image?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/common_modules/image-cleaner.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/common_modules/image-cleaner.yml b/config/common_modules/image-cleaner.yml index 07561795d2..b3286485c7 100644 --- a/config/common_modules/image-cleaner.yml +++ b/config/common_modules/image-cleaner.yml @@ -2,6 +2,8 @@ type: image-cleaner entries: - nvtop - htop + - nvidia-settings + - yelp repos: - _copr:copr.fedorainfracloud.org:phracek:PyCharm - google-chrome From e7d118494f17cdc1dde01048e13c0ddc67d9b79a Mon Sep 17 00:00:00 2001 From: Jakub Kujawa Date: Thu, 12 Oct 2023 09:37:11 +0200 Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=93=83=20docs(module):=20update=20REA?= =?UTF-8?q?DME.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/image-cleaner/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/image-cleaner/README.md b/modules/image-cleaner/README.md index e930e8869e..b5c47f68cc 100644 --- a/modules/image-cleaner/README.md +++ b/modules/image-cleaner/README.md @@ -11,6 +11,6 @@ entries: - nvtop - htop repos: - - _copr:copr.fedorainfracloud.org:phracek:PyCharm.repo - - google-chrome.repo + - _copr:copr.fedorainfracloud.org:phracek:PyCharm + - google-chrome ``` From 4b3c7d956e5d4cd010d76a100605d3039a4b168a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 22:03:40 +0000 Subject: [PATCH 4/9] build(deps): bump ASzc/change-string-case-action from 5 to 6 Bumps [ASzc/change-string-case-action](https://github.com/aszc/change-string-case-action) from 5 to 6. - [Release notes](https://github.com/aszc/change-string-case-action/releases) - [Commits](https://github.com/aszc/change-string-case-action/compare/v5...v6) --- updated-dependencies: - dependency-name: ASzc/change-string-case-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a860a1dbf1..4bd05704fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,13 +118,13 @@ jobs: # https://github.com/macbre/push-to-ghcr/issues/12 - name: Lowercase Registry id: registry_case - uses: ASzc/change-string-case-action@v5 + uses: ASzc/change-string-case-action@v6 with: string: ${{ env.IMAGE_REGISTRY }} - name: Lowercase Image id: image_case - uses: ASzc/change-string-case-action@v5 + uses: ASzc/change-string-case-action@v6 with: string: ${{ env.IMAGE_NAME }} From 26491cc6b72608d0ee3a425c45a1a5f1a7155c18 Mon Sep 17 00:00:00 2001 From: plata Date: Wed, 1 Nov 2023 13:24:30 +0100 Subject: [PATCH 5/9] chore: update bling list (#181) * chore: update bling list * Review comments --- config/recipe.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/recipe.yml b/config/recipe.yml index 7daeb74ac6..3fd222042a 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -32,13 +32,18 @@ modules: - type: bling # configure what to pull in from ublue-os/bling install: - - justfiles # add "!include /usr/share/ublue-os/just/bling.just" + - justfiles # add "!include /usr/share/ublue-os/just/100-bling.just" # in your custom.just (added by default) or local justfile - nix-installer # shell shortcuts for determinate system's nix installers - ublue-os-wallpapers # - ublue-update # https://github.com/ublue-os/ublue-update + # - 1password # install 1Password (stable) and `op` CLI tool # - dconf-update-service # a service unit that updates the dconf db on boot # - devpod # https://devpod.sh/ as an rpm + # - gnome-vrr # enables gnome-vrr for your image + # - container-tools # installs container-related tools onto /usr/bin: kind, kubectx, docker-compose and kubens + # - laptop # installs TLP and configures your system for laptop usage + # - flatpaksync # allows synchronization of user-installed flatpaks, see separate documentation section - type: yafti # if included, yafti and it's dependencies (pip & libadwaita) From 13d3e23a6351930c6848edfc1078bcaec85224e0 Mon Sep 17 00:00:00 2001 From: Jakub Kujawa Date: Thu, 2 Nov 2023 00:19:20 +0100 Subject: [PATCH 6/9] =?UTF-8?q?=F0=9F=8C=88=20style(scripts):=20Add=20spac?= =?UTF-8?q?es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/scripts/container-tools.sh | 1 + config/scripts/udev-rules.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/config/scripts/container-tools.sh b/config/scripts/container-tools.sh index 01eb9f7bdc..67a04724b6 100644 --- a/config/scripts/container-tools.sh +++ b/config/scripts/container-tools.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -oue pipefail + FILES_ROOT="/tmp/config/files" wget -O $FILES_ROOT/docker-compose 'https://github.com/docker/compose/releases/latest/download/docker-compose-linux-x86_64' diff --git a/config/scripts/udev-rules.sh b/config/scripts/udev-rules.sh index a51d726244..9e8004bc6f 100644 --- a/config/scripts/udev-rules.sh +++ b/config/scripts/udev-rules.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -oue pipefail + FILES_ROOT="/tmp/config/files" wget -O $FILES_ROOT/99-razer.rules 'https://raw.githubusercontent.com/ublue-os/openrazer/master/install_files/udev/99-razer.rules' From bd45a8be02c8f786f3858fb5b4f663fae6aae62a Mon Sep 17 00:00:00 2001 From: Jakub Kujawa Date: Thu, 2 Nov 2023 00:20:00 +0100 Subject: [PATCH 7/9] =?UTF-8?q?=F0=9F=A6=84=20refactor(yafti):=20revise=20?= =?UTF-8?q?some=20text?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/files/usr/share/ublue-os/firstboot/yafti.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/files/usr/share/ublue-os/firstboot/yafti.yml b/config/files/usr/share/ublue-os/firstboot/yafti.yml index 059c82b3c1..0e4d604b6f 100644 --- a/config/files/usr/share/ublue-os/firstboot/yafti.yml +++ b/config/files/usr/share/ublue-os/firstboot/yafti.yml @@ -5,10 +5,10 @@ screens: first-screen: source: yafti.screen.title values: - title: "Welcome to uBlue (Alpha)" + title: "Welcome to SilverFlow" icon: "/path/to/icon" description: | - This guided installer will help you get started with your new system. + Default system apps are installing in the background, but it is safe to use your computer in the meantime. can-we-modify-your-flatpaks: source: yafti.screen.consent values: @@ -140,7 +140,7 @@ screens: - "Install More Applications": run: /usr/bin/gnome-software - "Website": - run: /usr/bin/xdg-open https://ublue.it + run: /usr/bin/xdg-open https://universal-blue.org/ - "Join the Discord Community": run: /usr/bin/xdg-open https://discord.gg/XjG48C7VHx description: | From 28e971517ad81b9fd510aa4eea441fba3e0b3fc9 Mon Sep 17 00:00:00 2001 From: Jakub Kujawa Date: Thu, 2 Nov 2023 00:22:06 +0100 Subject: [PATCH 8/9] =?UTF-8?q?=E2=9C=A8=20feat(F39):=20add=20razer=20hard?= =?UTF-8?q?ware=20repository=20to=20F39?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ✨ feat(F39): install the necessary packages for razer hardware support --- config/common_modules/rpm-ostree.yml | 4 ++++ config/silverflow-nvidia-38.yml | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/config/common_modules/rpm-ostree.yml b/config/common_modules/rpm-ostree.yml index e8c359f9ee..1159297658 100644 --- a/config/common_modules/rpm-ostree.yml +++ b/config/common_modules/rpm-ostree.yml @@ -4,9 +4,13 @@ repos: - https://copr.fedorainfracloud.org/coprs/peterwu/rendezvous/repo/fedora-%OS_VERSION%/peterwu-rendezvous.repo # VSCode repository from bluefin - https://raw.githubusercontent.com/ublue-os/bluefin/main/dx/etc/yum.repos.d/vscode.repo + # Repo for Razer Hardware + - https://download.opensuse.org/repositories/hardware:/razer/Fedora_%OS_VERSION%/hardware:razer.repo install: - adw-gtk3-theme - code + - polychromatic + - openrazer-meta remove: - firefox - firefox-langpacks diff --git a/config/silverflow-nvidia-38.yml b/config/silverflow-nvidia-38.yml index 9053d3b802..cb760957af 100644 --- a/config/silverflow-nvidia-38.yml +++ b/config/silverflow-nvidia-38.yml @@ -10,13 +10,8 @@ modules: - from-file: common_modules/rpm-ostree.yml - type: rpm-ostree - repos: - # Repo for Razer Hardware - - https://download.opensuse.org/repositories/hardware:/razer/Fedora_%OS_VERSION%/hardware:razer.repo install: - podman-docker - - polychromatic - - openrazer-meta - bibata-cursor-themes - from-file: common_modules/bling.yml From 0adc287b5536ac608389967a4c270174ec23b7a1 Mon Sep 17 00:00:00 2001 From: plata Date: Thu, 2 Nov 2023 11:16:01 +0100 Subject: [PATCH 9/9] docs (README): run 'rpm-ostree rebase' without sudo (#183) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b7b6f95ca9..2feeef9085 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ To rebase an existing Silverblue/Kinoite installation to the latest build: - First rebase to the unsigned image, to get the proper signing keys and policies installed: ``` - sudo rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/startingpoint:latest + rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/startingpoint:latest ``` - Reboot to complete the rebase: ``` @@ -54,7 +54,7 @@ To rebase an existing Silverblue/Kinoite installation to the latest build: ``` - Then rebase to the signed image, like so: ``` - sudo rpm-ostree rebase ostree-image-signed:docker://ghcr.io/ublue-os/startingpoint:latest + rpm-ostree rebase ostree-image-signed:docker://ghcr.io/ublue-os/startingpoint:latest ``` - Reboot again to complete the installation ``` @@ -64,7 +64,7 @@ To rebase an existing Silverblue/Kinoite installation to the latest build: This repository builds date tags as well, so if you want to rebase to a particular day's build: ``` -sudo rpm-ostree rebase ostree-image-signed:docker://ghcr.io/ublue-os/startingpoint:20230403 +rpm-ostree rebase ostree-image-signed:docker://ghcr.io/ublue-os/startingpoint:20230403 ``` This repository by default also supports signing.