Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
16 changes: 8 additions & 8 deletions .github/workflows/build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/execute-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/post-merge-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/promote-main-to-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"}]
Expand Down Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-from-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/validate-renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:f8de1edb8639de215ab027ace400c3ded73b14710358a4e8b3301586858d9247 AS common
FROM ghcr.io/ublue-os/brew:latest@sha256:9e0492dbc471258657564c94dae18b58dd96ddb998a06f2b15e8209efb48042b AS brew

# Context stage - combine local and imported OCI container resources
Expand Down
2 changes: 1 addition & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export IMAGE_NAME := env("IMAGE_NAME", "catbirdlinux")
export DEFAULT_TAG := env("DEFAULT_TAG", "stable")
export PODMAN := env("PODMAN", "podman")
export REPO_ORG := env("GITHUB_REPOSITORY_OWNER", "ab9il")
export bib_image := env("BIB_IMAGE", "ghcr.io/osbuild/bootc-image-builder:latest@sha256:585b14a250e72bd82c50b0163cf864da38f9092b984d35ffa23a8b62576468eb")
export bib_image := env("BIB_IMAGE", "ghcr.io/osbuild/bootc-image-builder:latest@sha256:c46594a4deda34e179fda283412b7ebc08c380859ac181b160bc72440ba89c11")
export qemu_image := env("QEMU_IMAGE", "ghcr.io/qemus/qemu:7.50@sha256:e7f6fda52503a546fd649670ba46e4bc23dc6dcef275bc3fac48877fbbc430df")
export vm_ram := env("VM_RAM", "8192")
export vm_cpus := env("VM_CPUS", "4")
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,12 @@ This image is based on [Project Bluefin](https://projectbluefin.io) and includes
- Uv (Python manager)
- **GUI apps (Flatpak)**:
- Audacity (audio editor)
- Bazaar (Flatpak manager)
- Bleachbit (system cleaner)
- Bottles (run Windows apps)
- Brave (web browser)
- DistroShelf (container manager)
- Filezilla (ftp client)
- GIMP (image editor)
- LibreOffice (office suite)
- Obsidian (Markdown based note-taking)
Expand Down
32 changes: 28 additions & 4 deletions build/65-niri-noctalia.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -41,13 +44,15 @@ FONTS=(
fira-code-fonts
fontawesome-fonts-all
google-noto-emoji-fonts
levien-inconsolata-fonts
polarsys-b612-fonts
)

ADDITIONAL_SYSTEM_APPS=(
aria2
bat
cliphist
distrobox
fuzzel
glow
pandoc
Expand All @@ -57,7 +62,7 @@ ADDITIONAL_SYSTEM_APPS=(
ripgrep
sshuttle
tor
wl-clipboard
wl-clipboard
# --- software-defined-radio ---
hackrf
hackrf-devel
Expand Down Expand Up @@ -392,9 +397,28 @@ EOF
# Fedora only reaches pam_systemd through system-auth, optionally. Use the
# vendor's helper, then drop the timestamped backup it leaves: every build
# starts from the same base layer, so it has nothing to restore.
/usr/share/noctalia-greeter/setup_greetd_pam.sh
rm -f /etc/pam.d/greetd.bak.noctalia.*
grep -q 'pam_systemd.so' /etc/pam.d/greetd
/usr/share/noctalia-greeter/setup_greetd_pam.sh || true

# Ensure /etc/pam.d/greetd exists and has pam_systemd.so.
# The vendor helper may fail in a container build; fall back gracefully.
if [ ! -f /etc/pam.d/greetd ]; then
cat > /etc/pam.d/greetd <<'EOF'
auth required pam_env.so
auth sufficient pam_unix.so try_first_pass likeauth nullok
auth required pam_deny.so
account sufficient pam_permit.so
password required pam_deny.so
session required pam_limits.so
session required pam_systemd.so
session optional pam_permit.so
EOF
fi

# Verify pam_systemd.so is present (required for DRM/input device access)
if ! grep -q 'pam_systemd.so' /etc/pam.d/greetd; then
echo "ERROR: /etc/pam.d/greetd missing pam_systemd.so — greeter cannot access display devices" >&2
exit 1
fi

# /var/lib/noctalia-greeter cannot ship in the image -- 90-cleanup.sh prunes
# /var -- so a unit from custom/files creates it on first boot, before greetd.
Expand Down
15 changes: 15 additions & 0 deletions custom/config/fuzzel/fuzzel.ini
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions custom/config/niri/config.kdl
Original file line number Diff line number Diff line change
Expand Up @@ -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"; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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[@]}"

Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,27 @@
# (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"
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
Expand Down
Loading
Loading