From 0e31b9cbff9a9fb67a4fe16d15a9fa3545ecbd6a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 18 Nov 2026 15:16:56 +0000 Subject: [PATCH 1/5] chore: promote main to stable --- .github/workflows/build-image.yml | 16 ++++++++-------- .github/workflows/clean.yml | 4 ++-- .github/workflows/execute-release.yml | 2 +- .github/workflows/post-merge-e2e.yml | 2 +- .github/workflows/pr-build.yml | 4 ++-- .github/workflows/pr-validation.yml | 2 +- .github/workflows/promote-main-to-stable.yml | 4 ++-- .github/workflows/release-from-build.yml | 4 ++-- .github/workflows/renovate.yml | 2 +- .github/workflows/validate-renovate.yml | 2 +- Containerfile | 2 +- build/65-niri-noctalia.sh | 6 +++++- custom/config/fuzzel/fuzzel.ini | 15 +++++++++++++++ custom/config/niri/config.kdl | 7 ++++--- .../.local => var/usrlocal}/bin/glow-wrapper | 0 .../.local => var/usrlocal}/bin/note-sorter | 16 +++++++++++++++- .../.local => var/usrlocal}/bin/preview.sh | 0 .../.local => var/usrlocal}/bin/radiostreamer | 18 ++++++++++-------- .../usrlocal}/bin/sshuttle-controller | 18 +++++++++--------- .../share/applications/note-sorter.desktop | 11 +++++++++++ .../share/applications/radiostreamer.desktop | 10 ++++++++++ .../applications/sshuttle-controller.desktop | 11 +++++++++++ 22 files changed, 112 insertions(+), 44 deletions(-) create mode 100644 custom/config/fuzzel/fuzzel.ini rename custom/files/{etc/skel/.local => var/usrlocal}/bin/glow-wrapper (100%) rename custom/files/{etc/skel/.local => var/usrlocal}/bin/note-sorter (63%) rename custom/files/{etc/skel/.local => var/usrlocal}/bin/preview.sh (100%) rename custom/files/{etc/skel/.local => var/usrlocal}/bin/radiostreamer (89%) rename custom/files/{etc/skel/.local => var/usrlocal}/bin/sshuttle-controller (87%) create mode 100755 custom/files/var/usrlocal/share/applications/note-sorter.desktop create mode 100755 custom/files/var/usrlocal/share/applications/radiostreamer.desktop create mode 100755 custom/files/var/usrlocal/share/applications/sshuttle-controller.desktop diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index bea3451..a1c5be0 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -92,14 +92,14 @@ jobs: - name: Preflight id: preflight - uses: projectbluefin/actions/bootc-build/preflight@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/preflight@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: registry: ghcr.io github-token: ${{ secrets.GITHUB_TOKEN }} image-name: ${{ env.IMAGE_NAME }} - name: Setup runner - uses: projectbluefin/actions/bootc-build/setup-runner@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/setup-runner@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: storage-backend: btrfs native-overlay: "true" @@ -108,7 +108,7 @@ jobs: - name: Restore DNF cache id: dnf-cache-restore - uses: projectbluefin/actions/bootc-build/dnf-cache@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/dnf-cache@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: action: restore cache-name: ${{ env.IMAGE_NAME }} @@ -143,7 +143,7 @@ jobs: - name: Generate tags id: generate-tags - uses: projectbluefin/actions/bootc-build/generate-tags@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/generate-tags@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: base-name: ${{ env.IMAGE_NAME }} stream-name: ${{ env.TAG_STREAM }} @@ -196,7 +196,7 @@ jobs: - name: Save DNF cache if: always() && !cancelled() - uses: projectbluefin/actions/bootc-build/dnf-cache@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/dnf-cache@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: action: save cache-name: ${{ env.IMAGE_NAME }} @@ -208,7 +208,7 @@ jobs: - name: Rechunk image if: env.ENABLE_RECHUNKING == 'true' id: rechunk-image - uses: projectbluefin/actions/bootc-build/chunka@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/chunka@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: source-image: localhost/${{ env.IMAGE_NAME }}:${{ env.DEFAULT_TAG }} max-layers: ${{ env.RECHUNK_MAX_LAYERS }} @@ -267,7 +267,7 @@ jobs: - name: Push to GHCR id: push - uses: projectbluefin/actions/bootc-build/push-image@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/push-image@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: image-name: ${{ env.IMAGE_NAME }} tags: ${{ steps.branch-tags.outputs.tags }} @@ -311,7 +311,7 @@ jobs: - name: Sign and publish continue-on-error: true - uses: projectbluefin/actions/bootc-build/sign-and-publish@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/sign-and-publish@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: image: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }} digest: ${{ steps.push.outputs.digest }} diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 7208662..4778d11 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -28,10 +28,10 @@ jobs: echo "name=${name,,}" >> "${GITHUB_OUTPUT}" - name: Cleanup old images - uses: projectbluefin/actions/bootc-build/ghcr-cleanup@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/ghcr-cleanup@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: packages: ${{ steps.package.outputs.name }} - older-than: 5 days + older-than: 7 days keep-n-tagged: 7 keep-n-untagged: 7 github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/execute-release.yml b/.github/workflows/execute-release.yml index 77e3672..346bff9 100644 --- a/.github/workflows/execute-release.yml +++ b/.github/workflows/execute-release.yml @@ -72,7 +72,7 @@ jobs: issues: write packages: write pull-requests: write - uses: projectbluefin/actions/.github/workflows/reusable-execute-release.yml@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/.github/workflows/reusable-execute-release.yml@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: registry: ghcr.io/${{ github.repository_owner }} variants: >- diff --git a/.github/workflows/post-merge-e2e.yml b/.github/workflows/post-merge-e2e.yml index de19e5a..97fe588 100644 --- a/.github/workflows/post-merge-e2e.yml +++ b/.github/workflows/post-merge-e2e.yml @@ -33,7 +33,7 @@ jobs: testsuite: name: Run smoke suite needs: [verify-manifest] - uses: projectbluefin/testsuite/.github/workflows/run-testsuite.yml@ab5e9e15e121fede870a75bd7ab20ec92a66186b # v1 + uses: projectbluefin/testsuite/.github/workflows/run-testsuite.yml@5d942c2b156730ee9a3764a4c5b4270521c3887d # v1 with: image: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:testing@${{ needs.verify-manifest.outputs.digest }} suites: smoke diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index ef38d94..ca1329f 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -90,7 +90,7 @@ jobs: - name: Setup runner if: steps.decide.outputs.build == '1' - uses: projectbluefin/actions/bootc-build/setup-runner@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/setup-runner@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: storage-backend: btrfs native-overlay: "true" @@ -99,7 +99,7 @@ jobs: - name: Restore DNF cache if: steps.decide.outputs.build == '1' - uses: projectbluefin/actions/bootc-build/dnf-cache@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/dnf-cache@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: action: restore cache-name: ${{ env.IMAGE_NAME }} diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml index a0cfec0..8adb65b 100644 --- a/.github/workflows/pr-validation.yml +++ b/.github/workflows/pr-validation.yml @@ -64,7 +64,7 @@ jobs: echo "Resolved shellcheck scope: ${glob}" - name: Validate - uses: projectbluefin/actions/bootc-build/validate-pr@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/validate-pr@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: shellcheck-glob: ${{ steps.shell-scope.outputs.glob }} dockerfile: "Containerfile" diff --git a/.github/workflows/promote-main-to-stable.yml b/.github/workflows/promote-main-to-stable.yml index bb849b0..4fde774 100644 --- a/.github/workflows/promote-main-to-stable.yml +++ b/.github/workflows/promote-main-to-stable.yml @@ -39,7 +39,7 @@ concurrency: jobs: promote: name: Promote main to stable - uses: projectbluefin/actions/.github/workflows/reusable-promote-squash.yml@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/.github/workflows/reusable-promote-squash.yml@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: variants: >- [{"image":"${{ github.event.repository.name }}"}] @@ -252,7 +252,7 @@ jobs: issues: write packages: read pull-requests: write - uses: projectbluefin/actions/.github/workflows/reusable-release-gate.yml@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/.github/workflows/reusable-release-gate.yml@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: repo: ${{ github.repository }} pr_number: ${{ needs.locate-promotion-pr.outputs.pr_number }} diff --git a/.github/workflows/release-from-build.yml b/.github/workflows/release-from-build.yml index 2c12e8c..2007341 100644 --- a/.github/workflows/release-from-build.yml +++ b/.github/workflows/release-from-build.yml @@ -430,7 +430,7 @@ jobs: path: sbom-current - name: Create release - uses: projectbluefin/actions/bootc-build/create-release@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/create-release@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: sbom-path: sbom-current/${{ steps.image_name.outputs.image_name }}.sbom.json tag: ${{ steps.meta.outputs.tag }} @@ -466,7 +466,7 @@ jobs: - name: Generate release notes id: release-notes - uses: projectbluefin/actions/bootc-build/generate-release-notes@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/bootc-build/generate-release-notes@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 with: tag: ${{ inputs.tag }} output-file: CHANGELOG.md diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index ead1275..18e19c8 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -42,6 +42,6 @@ jobs: if: needs.token.outputs.configured == 'true' permissions: contents: read - uses: projectbluefin/actions/.github/workflows/reusable-renovate.yml@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/.github/workflows/reusable-renovate.yml@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 secrets: renovate_token: ${{ secrets.RENOVATE_TOKEN }} diff --git a/.github/workflows/validate-renovate.yml b/.github/workflows/validate-renovate.yml index 9ff4220..98c3872 100644 --- a/.github/workflows/validate-renovate.yml +++ b/.github/workflows/validate-renovate.yml @@ -21,4 +21,4 @@ jobs: validate: permissions: contents: read - uses: projectbluefin/actions/.github/workflows/reusable-validate-renovate.yml@d1f65645c53d413462117fe1f05d00b9d9382f89 # v1 + uses: projectbluefin/actions/.github/workflows/reusable-validate-renovate.yml@75348afb3a34c6006a3d3da51e51c9a3818b2616 # v1 diff --git a/Containerfile b/Containerfile index 41b602e..b960b2d 100644 --- a/Containerfile +++ b/Containerfile @@ -36,7 +36,7 @@ # OCI context images - imported below and pinned directly in their FROM lines. # The base image is pinned in the FROM line below and updated by Renovate. -FROM ghcr.io/projectbluefin/common:latest@sha256:c2799fd6253575b9efb22bf798af335e822d8ad22f798f09c75fcdffcb37c3a8 AS common +FROM ghcr.io/projectbluefin/common:latest@sha256:1495d1e407db9ad83e364494ca8ba4206e7955e5e51d21587aa7b234710fdcac AS common FROM ghcr.io/ublue-os/brew:latest@sha256:9e0492dbc471258657564c94dae18b58dd96ddb998a06f2b15e8209efb48042b AS brew # Context stage - combine local and imported OCI container resources diff --git a/build/65-niri-noctalia.sh b/build/65-niri-noctalia.sh index dfaf870..3cf15f1 100755 --- a/build/65-niri-noctalia.sh +++ b/build/65-niri-noctalia.sh @@ -25,6 +25,9 @@ echo "::group:: Install More Default Packages" # From agriffis/neovim-nightly copr_install_isolated "agriffis/neovim-nightly" "neovim" +# From che/nerd-fonts +copr_install_isolated "che/nerd-fonts" "nerd-fonts" + # From agriffis/neovim-nightly copr_install_isolated "agriffis/neovim-nightly" "python3-neovim" @@ -41,6 +44,7 @@ FONTS=( fira-code-fonts fontawesome-fonts-all google-noto-emoji-fonts + levien-inconsolata-fonts polarsys-b612-fonts ) @@ -57,7 +61,7 @@ ADDITIONAL_SYSTEM_APPS=( ripgrep sshuttle tor - wl-clipboard + wl-clipboard # --- software-defined-radio --- hackrf hackrf-devel diff --git a/custom/config/fuzzel/fuzzel.ini b/custom/config/fuzzel/fuzzel.ini new file mode 100644 index 0000000..c858b97 --- /dev/null +++ b/custom/config/fuzzel/fuzzel.ini @@ -0,0 +1,15 @@ +[main] +width=40 + +[colors] +background=1e1e2edd +text=cdd6f4ff +prompt=bac2deff +placeholder=7f849cff +input=cdd6f4ff +match=94e2d5ff +selection=585b70ff +selection-text=cdd6f4ff +selection-match=94e2d5ff +counter=7f849cff +border=94e2d5ff diff --git a/custom/config/niri/config.kdl b/custom/config/niri/config.kdl index e7a9a1c..84a6b68 100644 --- a/custom/config/niri/config.kdl +++ b/custom/config/niri/config.kdl @@ -365,9 +365,10 @@ binds { Mod+T hotkey-overlay-title="Open a Terminal: Ptyxis" { spawn "ptyxis"; } Ctrl+Alt+T hotkey-overlay-title="Open a Terminal: Ptyxis" { spawn "ptyxis"; } Mod+Return hotkey-overlay-title="Open a Terminal: Ptyxis" { spawn "ptyxis"; } - Mod+B hotkey-overlay-title="Run an Application: Vivaldi" { spawn-sh "flatpak run com.vivaldi.Vivaldi"; } - // Mod+B hotkey-overlay-title="Run an Application: Brave" { spawn-sh "flatpak run com.brave.Browser"; } - Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; } + // Mod+B hotkey-overlay-title="Run an Application: Vivaldi" { spawn-sh "flatpak run com.vivaldi.Vivaldi"; } + Mod+B hotkey-overlay-title="Run an Application: Brave" { spawn-sh "flatpak run com.brave.Browser"; } + Mod+D hotkey-overlay-title="Run an Application: Fuzzel" { spawn "fuzzel"; } + Mod+Space hotkey-overlay-title="Open the App Launcher" { spawn-sh "noctalia msg panel-toggle launcher"; } Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; } Mod+E hotkey-overlay-title="Open a File Manager: Nautilus" { spawn "nautilus"; } diff --git a/custom/files/etc/skel/.local/bin/glow-wrapper b/custom/files/var/usrlocal/bin/glow-wrapper similarity index 100% rename from custom/files/etc/skel/.local/bin/glow-wrapper rename to custom/files/var/usrlocal/bin/glow-wrapper diff --git a/custom/files/etc/skel/.local/bin/note-sorter b/custom/files/var/usrlocal/bin/note-sorter similarity index 63% rename from custom/files/etc/skel/.local/bin/note-sorter rename to custom/files/var/usrlocal/bin/note-sorter index d6d41e4..a6b2e2e 100755 --- a/custom/files/etc/skel/.local/bin/note-sorter +++ b/custom/files/var/usrlocal/bin/note-sorter @@ -10,4 +10,18 @@ # This script makes it easy to sort and search a large volume of notes # and find files according to name or internal text. -/home/linuxbrew/.linuxbrew/bin/lf -command 'set hidden false' ~/Documents/Notes/ + +CLI_COMMAND1=(lf -command "set hidden false" "$HOME/Documents/Notes/") +GUI_COMMAND1=(ptyxis --new-window -e lf -command "set hidden false" "$HOME/Documents/Notes/") + +case "$1" in +--gui) + COMMAND1=("${GUI_COMMAND1[@]}") + ;; +*) + COMMAND1=("${CLI_COMMAND1[@]}") + ;; +esac + +"${COMMAND1[@]}" + diff --git a/custom/files/etc/skel/.local/bin/preview.sh b/custom/files/var/usrlocal/bin/preview.sh similarity index 100% rename from custom/files/etc/skel/.local/bin/preview.sh rename to custom/files/var/usrlocal/bin/preview.sh diff --git a/custom/files/etc/skel/.local/bin/radiostreamer b/custom/files/var/usrlocal/bin/radiostreamer similarity index 89% rename from custom/files/etc/skel/.local/bin/radiostreamer rename to custom/files/var/usrlocal/bin/radiostreamer index 68694d4..a15f336 100755 --- a/custom/files/etc/skel/.local/bin/radiostreamer +++ b/custom/files/var/usrlocal/bin/radiostreamer @@ -7,6 +7,8 @@ # (at your option) any later version. There is NO warranty; not even for # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# Run this script as a regular user + PLAYER="ffplay" # use mpv, ffplay, or cvlc STREAMS_FILE="$HOME/.config/radiostreams" OPTION1="Connect Internet Radio Stream" @@ -14,18 +16,18 @@ OPTION2="Stop Streaming" OPTION3="Edit Station List" OPTIONS="$OPTION1\n$OPTION2\n$OPTION3" FZF_COMMAND1='fzf --layout=reverse --header=Select:' -ROFI_COMMAND1='rofi -dmenu -l 3 -p Select' +FUZZEL_COMMAND1='fuzzel -d -w 50 -l 3 -p Select' FZF_COMMAND2='fzf --layout=reverse --header=Select:' -ROFI_COMMAND2='rofi -dmenu -p Select' -FZF_COMMAND3="vim $STREAMS_FILE" -ROFI_COMMAND3="x-terminal-emulator -e vim $STREAMS_FILE" +FUZZEL_COMMAND2='fuzzel -d -p Select' +FZF_COMMAND3="$EDITOR $STREAMS_FILE" +FUZZEL_COMMAND3="ptyxis --new-window -e $EDITOR $STREAMS_FILE" # interface based on commandline arguments case "$1" in -gui) - COMMAND1=$ROFI_COMMAND1 - COMMAND2=$ROFI_COMMAND2 - COMMAND3=$ROFI_COMMAND3 +--gui) + COMMAND1=$FUZZEL_COMMAND1 + COMMAND2=$FUZZEL_COMMAND2 + COMMAND3=$FUZZEL_COMMAND3 ;; *) COMMAND1=$FZF_COMMAND1 diff --git a/custom/files/etc/skel/.local/bin/sshuttle-controller b/custom/files/var/usrlocal/bin/sshuttle-controller similarity index 87% rename from custom/files/etc/skel/.local/bin/sshuttle-controller rename to custom/files/var/usrlocal/bin/sshuttle-controller index 6918669..dbd2149 100755 --- a/custom/files/etc/skel/.local/bin/sshuttle-controller +++ b/custom/files/var/usrlocal/bin/sshuttle-controller @@ -16,12 +16,12 @@ CONFIGFILE="$HOME/.ssh/config" PIDFILE="/tmp/sshuttle.pid" IPTABLES_BACKUP="/tmp/iptables.backup" -ROFI_COMMAND1='rofi -dmenu -p Select -l 3' +FUZZEL_COMMAND1='fuzzel -d -p Select -l 3' FZF_COMMAND1='fzf --layout=reverse --header=Select:' -ROFI_COMMAND2='rofi -dmenu -p Select' +FUZZEL_COMMAND2='fuzzel -d -p Select' FZF_COMMAND2='fzf --layout=reverse --header=Select:' -FZF_COMMAND3="vim $CONFIGFILE" -ROFI_COMMAND3="x-terminal-emulator -e vim $CONFIGFILE" +FZF_COMMAND3="$EDITOR $CONFIGFILE" +FUZZEL_COMMAND3="ptyxis --new-window -e $EDITOR $CONFIGFILE" edit_data(){ $COMMAND3 @@ -33,7 +33,7 @@ echo -e "\nSSH Tunnel manager (using sshuttle). Note: You MUST set up key based logins on the servers. Usage: $0