diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bfc399f21a8..34d5986cfce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,8 +32,8 @@ jobs: fail-fast: false matrix: image_flavor: [main, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia] - base_name: [bluefin, bluefin-dx] - major_version: [38, 39] + base_name: [bluefin, bluefin-dx, aurora, aurora-dx] + major_version: [38, 39, 40] include: - major_version: 38 is_latest_version: false @@ -43,7 +43,15 @@ jobs: is_latest_version: true is_stable_version: true is_gts_version: false + - major_version: 40 + is_latest_version: false + is_stable_version: false + is_gts_version: false exclude: + - major_version: 38 + base_name: aurora + - major_version: 38 + base_name: aurora-dx - major_version: 38 image_flavor: asus - major_version: 38 @@ -52,18 +60,45 @@ jobs: image_flavor: surface - major_version: 38 image_flavor: surface-nvidia + - major_version: 40 + image_flavor: framework steps: - name: Checkout uses: actions/checkout@v4 + - name: Matrix Variables + run: | + if [[ "${{ matrix.image_flavor }}" == "main" ]]; then + echo "IMAGE_NAME=${{ matrix.base_name }}" >> $GITHUB_ENV + else + echo "IMAGE_NAME=${{ format('{0}-{1}', matrix.base_name, matrix.image_flavor) }}" >> $GITHUB_ENV + fi + if [[ "${{ matrix.base_name }}" =~ "bluefin" ]]; then + echo "BASE_IMAGE_NAME"="silverblue" >> $GITHUB_ENV + elif [[ "${{ matrix.base_name }}" =~ "aurora" ]]; then + echo "BASE_IMAGE_NAME"="kinoite" >> $GITHUB_ENV + fi + if [[ "${{ matrix.base_name }}" =~ "dx" ]]; then + echo "TARGET_NAME"="dx" >> $GITHUB_ENV + else + echo "TARGET_NAME"="base" >> $GITHUB_ENV + fi + if [[ "${{ matrix.image_flavor }}" =~ "asus" ]]; then + echo "AKMODS_FLAVOR=asus" >> $GITHUB_ENV + elif [[ "${{ matrix.image_flavor }}" =~ "surface" ]]; then + echo "AKMODS_FLAVOR=surface" >> $GITHUB_ENV + else + echo "AKMODS_FLAVOR=main" >> $GITHUB_ENV + fi + - name: Verify base image uses: EyeCantCU/cosign-action/verify@v0.2.2 with: - containers: silverblue-${{ matrix.image_flavor }}:${{ matrix.major_version }} + containers: ${{ env.BASE_IMAGE_NAME}}-${{ matrix.image_flavor }}:${{ matrix.major_version }} - name: Verify Chainguard images - if: matrix.base_name != 'bluefin' + if: matrix.base_name != 'bluefin' && matrix.base_name != 'aurora' uses: EyeCantCU/cosign-action/verify@v0.2.2 with: containers: dive, flux, helm, ko, minio, kubectl @@ -77,21 +112,6 @@ jobs: - name: Check just syntax uses: ublue-os/just-action@v1 - - name: Matrix Variables - run: | - if [[ "${{ matrix.image_flavor }}" == "main" ]]; then - echo "IMAGE_NAME=${{ matrix.base_name }}" >> $GITHUB_ENV - else - echo "IMAGE_NAME=${{ format('{0}-{1}', matrix.base_name, matrix.image_flavor) }}" >> $GITHUB_ENV - fi - if [[ "${{ matrix.image_flavor }}" =~ "asus" ]]; then - echo "AKMODS_FLAVOR=asus" >> $GITHUB_ENV - elif [[ "${{ matrix.image_flavor }}" =~ "surface" ]]; then - echo "AKMODS_FLAVOR=surface" >> $GITHUB_ENV - else - echo "AKMODS_FLAVOR=main" >> $GITHUB_ENV - fi - - name: Generate tags id: generate-tags shell: bash @@ -180,6 +200,7 @@ jobs: tags: | ${{ steps.generate-tags.outputs.alias_tags }} build-args: | + BASE_IMAGE_NAME=${{ env.BASE_IMAGE_NAME }} IMAGE_NAME=${{ env.IMAGE_NAME }} IMAGE_FLAVOR=${{ matrix.image_flavor }} IMAGE_VENDOR=${{ github.repository_owner }} @@ -192,7 +213,7 @@ jobs: # extra-args: | # --target=${{ matrix.target_name || matrix.base_name }} extra-args: | - --target=${{ matrix.base_name }} + --target=${{ env.TARGET_NAME }} # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR. # https://github.com/macbre/push-to-ghcr/issues/12 diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 0671cc8b95d..d08ec117d80 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -109,7 +109,7 @@ jobs: docker rmi ${image} - name: Build ISOs - uses: jasonn3/build-container-installer@v1.1.2 + uses: jasonn3/build-container-installer@v1.1.1 id: build with: arch: x86_64 diff --git a/CHANGELOG.md b/CHANGELOG.md index db52468a7c0..dcfd00d807e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,64 @@ # Changelog +## [2.1.0](https://github.com/ublue-os/bluefin/compare/v2.0.0...v2.1.0) (2024-03-30) + + +### Features + +* add bcache-tools ([#1008](https://github.com/ublue-os/bluefin/issues/1008)) ([fde9e52](https://github.com/ublue-os/bluefin/commit/fde9e5253f04b3125e55a36d084b875d551ee5fc)) +* add bluefin CLI packages from wolfi ([#1001](https://github.com/ublue-os/bluefin/issues/1001)) ([2c17790](https://github.com/ublue-os/bluefin/commit/2c17790443ed7a5f85300a65c33b2db6661f7886)) +* add epson printer drivers ([#1013](https://github.com/ublue-os/bluefin/issues/1013)) ([deccb8c](https://github.com/ublue-os/bluefin/commit/deccb8ca8c000528962149f1ff4ca9c5f318c013)) +* Add Explicit sync patches for XWayland on Nvidia builds ([#993](https://github.com/ublue-os/bluefin/issues/993)) ([025b662](https://github.com/ublue-os/bluefin/commit/025b6627f5f57b98abd38338671ab5d7d57c3e97)) +* Add Fedora 40 builds to Bluefin ([#1041](https://github.com/ublue-os/bluefin/issues/1041)) ([59dd5cb](https://github.com/ublue-os/bluefin/commit/59dd5cbcc8d67fc760ae5e0d04f044c76da67330)) +* add meslo nerd font ([#967](https://github.com/ublue-os/bluefin/issues/967)) ([ce88078](https://github.com/ublue-os/bluefin/commit/ce880781fd5d223403de4e18f99f98f3253bbfe2)) +* add more zsh configs ([#966](https://github.com/ublue-os/bluefin/issues/966)) ([5535205](https://github.com/ublue-os/bluefin/commit/5535205718792bb79b3e3ce0ffe2a28845da909e)) +* add ROCm support to -dx ([#1058](https://github.com/ublue-os/bluefin/issues/1058)) ([dfdc9f7](https://github.com/ublue-os/bluefin/commit/dfdc9f7c33865c94cf343c5c39a74d4e64e9422d)) +* add udica ([#1029](https://github.com/ublue-os/bluefin/issues/1029)) ([97e8199](https://github.com/ublue-os/bluefin/commit/97e81995db8078bd67a0db82d8e4f7fa362b7dd3)) +* add zsh config file ([#963](https://github.com/ublue-os/bluefin/issues/963)) ([1ae2f30](https://github.com/ublue-os/bluefin/commit/1ae2f3094cfaf5a581a89a440a2cb77507a9dcda)) +* **art:** add some wallpapers ([#1032](https://github.com/ublue-os/bluefin/issues/1032)) ([59aa407](https://github.com/ublue-os/bluefin/commit/59aa407db89adff28a1738c510183589cf14cf74)) +* change to spring wallpaper ([#987](https://github.com/ublue-os/bluefin/issues/987)) ([5ab4e1c](https://github.com/ublue-os/bluefin/commit/5ab4e1c176caa172355defa4fa910313b9758b4e)) +* create FUNDING.yml ([#1052](https://github.com/ublue-os/bluefin/issues/1052)) ([9278b06](https://github.com/ublue-os/bluefin/commit/9278b066306508fdd217cabdee22d0d3f2d144c1)) +* initial devcontainer ([#1027](https://github.com/ublue-os/bluefin/issues/1027)) ([bc696c8](https://github.com/ublue-os/bluefin/commit/bc696c8d00ee0aa739e1cb8d950922c80f2292ab)) +* **just:** cleanup and standardization of just recipes ([#1003](https://github.com/ublue-os/bluefin/issues/1003)) ([4b9441a](https://github.com/ublue-os/bluefin/commit/4b9441a962696cabfb807edebe180425b75d3ff5)) +* Update isogenerator to latest version ([#968](https://github.com/ublue-os/bluefin/issues/968)) ([8242907](https://github.com/ublue-os/bluefin/commit/8242907c30e0e6b0f3c6263be192c077c91ea417)) + + +### Bug Fixes + +* add gitattributes for proper linguist detection ([#1023](https://github.com/ublue-os/bluefin/issues/1023)) ([b09f95d](https://github.com/ublue-os/bluefin/commit/b09f95d28a5e8473b2b2240df600eaed35d69bef)) +* Add more missing ISOs ([5dc6543](https://github.com/ublue-os/bluefin/commit/5dc6543de32e52b5c84c3439f95c7c55b663b81c)) +* change ctrl-alt-enter to host term ([#970](https://github.com/ublue-os/bluefin/issues/970)) ([6b669aa](https://github.com/ublue-os/bluefin/commit/6b669aa430cae0450af872253759fbb4ceb07760)) +* change this into a welcome message ([#1063](https://github.com/ublue-os/bluefin/issues/1063)) ([3d4debc](https://github.com/ublue-os/bluefin/commit/3d4debc818ccddadb2d0bebd547eb3460c9f9010)) +* check for directory, not command ([#980](https://github.com/ublue-os/bluefin/issues/980)) ([c64eb03](https://github.com/ublue-os/bluefin/commit/c64eb03626f522e525d0206a588e351c573bc7b5)) +* check for directory, not command ([#991](https://github.com/ublue-os/bluefin/issues/991)) ([56d68e9](https://github.com/ublue-os/bluefin/commit/56d68e92dc13d0dce4547c80c330c80fe075b59a)) +* **ci:** fixing issues with mokutil password ([#969](https://github.com/ublue-os/bluefin/issues/969)) ([0c89938](https://github.com/ublue-os/bluefin/commit/0c899382fd8c62007459c88f297634a912979a2f)) +* correct ulimit nofile issue with brew ([#988](https://github.com/ublue-os/bluefin/issues/988)) ([3911e57](https://github.com/ublue-os/bluefin/commit/3911e57908f204b5930e0ee99f5411b1a554ec1a)) +* Correcting small typo from title-bar-font to titlebar-font. ([#1000](https://github.com/ublue-os/bluefin/issues/1000)) ([ca1d662](https://github.com/ublue-os/bluefin/commit/ca1d662c6558e01355dc04da87e8b01ccc19e9c0)) +* Delete sysctl maximum file limits workaround ([#979](https://github.com/ublue-os/bluefin/issues/979)) ([f237cef](https://github.com/ublue-os/bluefin/commit/f237cefd309202d958705dd9d5ae42f6076a16b4)) +* disable topgrade git extension ([#1044](https://github.com/ublue-os/bluefin/issues/1044)) ([59f6ac9](https://github.com/ublue-os/bluefin/commit/59f6ac9c8273a1b31d4a10765289a45c6404c6be)) +* force clean font cache ([#1016](https://github.com/ublue-os/bluefin/issues/1016)) ([19e6bf3](https://github.com/ublue-os/bluefin/commit/19e6bf3e3ab5f001c76243337d10524133ba7439)) +* Increase Nofile limit to fix installation of some brew application ([#985](https://github.com/ublue-os/bluefin/issues/985)) ([fbed7bd](https://github.com/ublue-os/bluefin/commit/fbed7bd07a8786611881423f400dcf17373ea1b3)) +* increase soft and hard file limits ([#978](https://github.com/ublue-os/bluefin/issues/978)) ([8eb9f3f](https://github.com/ublue-os/bluefin/commit/8eb9f3f6bbed75377b10976933841647be65ba59)) +* **just:** remove yafti ([#1075](https://github.com/ublue-os/bluefin/issues/1075)) ([de262c1](https://github.com/ublue-os/bluefin/commit/de262c15b35ff40cec15ba792d33b9fb245e9eee)) +* Make this check if brew is installed before trying to run it. ([#975](https://github.com/ublue-os/bluefin/issues/975)) ([c0a2cfb](https://github.com/ublue-os/bluefin/commit/c0a2cfb06abee26b1769a67ca5d3978e010c5d0d)) +* Only run brew for interactive fish shells ([#959](https://github.com/ublue-os/bluefin/issues/959)) ([9375d8e](https://github.com/ublue-os/bluefin/commit/9375d8e90b723fb71e7eea71be50be9317a3649d)) +* remove brew install, it's in config now ([#1042](https://github.com/ublue-os/bluefin/issues/1042)) ([9af6d49](https://github.com/ublue-os/bluefin/commit/9af6d4956497d58958a93c34b91c6a5e0eeeebbf)) +* remove gnome touch extensions ([#1045](https://github.com/ublue-os/bluefin/issues/1045)) ([260a64a](https://github.com/ublue-os/bluefin/commit/260a64abb4c6d7cd3c275f03d04cde6fdc516c04)) +* remove old yafti ([#1051](https://github.com/ublue-os/bluefin/issues/1051)) ([e7edb3c](https://github.com/ublue-os/bluefin/commit/e7edb3c8f5356cc5c9e4b71f79286661aaa50da2)) +* remove quotes around level ([#981](https://github.com/ublue-os/bluefin/issues/981)) ([968b17f](https://github.com/ublue-os/bluefin/commit/968b17faceb9ff39a04634c7b723aa0e9283991e)) +* replace profile brew.sh on just brew command ([#984](https://github.com/ublue-os/bluefin/issues/984)) ([874a5d2](https://github.com/ublue-os/bluefin/commit/874a5d299fee6a36bd38a1bb1eb56cfab4d5235f)) +* source docker-compose from one place ([#1066](https://github.com/ublue-os/bluefin/issues/1066)) ([df3fdb7](https://github.com/ublue-os/bluefin/commit/df3fdb70785a944e9e8d2e1b6141c1451c581912)) +* **topgrade:** ignore helm, ignore npm errors ([#997](https://github.com/ublue-os/bluefin/issues/997)) ([324e69a](https://github.com/ublue-os/bluefin/commit/324e69a111c42421cc2010f104bfa5ba3762b1db)) +* **topgrade:** npm should be node ([#1010](https://github.com/ublue-os/bluefin/issues/1010)) ([23ea820](https://github.com/ublue-os/bluefin/commit/23ea820ae02093ffe432a604f9c172e5074dbeb1)) +* turn off audible bell in the terminal ([#992](https://github.com/ublue-os/bluefin/issues/992)) ([6177f02](https://github.com/ublue-os/bluefin/commit/6177f0275ab464b7783e36dfe5b9a305b0e321c6)) +* Use Ptyxis from the ublue-os/staging copr repo ([#1073](https://github.com/ublue-os/bluefin/issues/1073)) ([e25e120](https://github.com/ublue-os/bluefin/commit/e25e1206eddfa2ef79d9e76c0dfff9d48c639bd6)) + + +### Reverts + +* "feat: Add Fedora 40 builds to Bluefin" ([#1053](https://github.com/ublue-os/bluefin/issues/1053)) ([98c33c4](https://github.com/ublue-os/bluefin/commit/98c33c4899a749220b62aa88b26999ce1f615494)) +* "fix: disable topgrade git extension" ([#1046](https://github.com/ublue-os/bluefin/issues/1046)) ([29ef97b](https://github.com/ublue-os/bluefin/commit/29ef97baec8e233fda9c48330cc87a48a070e7c6)) + ## [2.0.0](https://github.com/ublue-os/bluefin/compare/v1.2.0...v2.0.0) (2024-02-28) diff --git a/Containerfile b/Containerfile index 627567aa9f9..340bad80072 100644 --- a/Containerfile +++ b/Containerfile @@ -7,7 +7,7 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" ARG TARGET_BASE="${TARGET_BASE:-bluefin}" ## bluefin image section -FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bluefin +FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS base ARG IMAGE_NAME="${IMAGE_NAME}" ARG IMAGE_VENDOR="${IMAGE_VENDOR}" @@ -15,179 +15,46 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}" ARG AKMODS_FLAVOR="${AKMODS_FLAVOR}" ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" -ARG PACKAGE_LIST="bluefin" -# GNOME VRR & Ptyxis -RUN if [ ${FEDORA_MAJOR_VERSION} -ge "39" ]; then \ - wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ - rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem && \ - rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ - wget https://copr.fedorainfracloud.org/coprs/kylegospo/prompt/repo/fedora-$(rpm -E %fedora)/kylegospo-prompt-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \ - rpm-ostree override replace \ - --experimental \ - --from repo=copr:copr.fedorainfracloud.org:kylegospo:prompt \ - vte291 \ - vte-profile \ - libadwaita && \ - rpm-ostree install \ - ptyxis && \ - rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo \ - ; fi - -# Install Explicit Sync Patches on Nvidia builds -RUN if [[ "${IMAGE_FLAVOR}" =~ "nvidia" ]]; then \ - wget https://copr.fedorainfracloud.org/coprs/gloriouseggroll/nvidia-explicit-sync/repo/fedora-$(rpm -E %fedora)/gloriouseggroll-nvidia-explicit-sync-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo && \ - rpm-ostree override replace \ - --experimental \ - --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \ - xorg-x11-server-Xwayland && \ - rpm-ostree override replace \ - --experimental \ - --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \ - egl-wayland \ - || true && \ - rm /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo \ - ; fi - -COPY usr /usr +# COPY Build Files +COPY build_files/base build_files/shared /tmp/build/ +COPY system_files/shared system_files/${BASE_IMAGE_NAME} / COPY just /tmp/just -COPY etc/yum.repos.d/ /etc/yum.repos.d/ COPY packages.json /tmp/packages.json -COPY build.sh /tmp/build.sh -COPY image-info.sh /tmp/image-info.sh -COPY install-akmods.sh /tmp/install-akmods.sh -COPY fetch-quadlets.sh /tmp/fetch-quadlets.sh -# Copy ublue-update.toml to tmp first, to avoid being overwritten. -COPY usr/etc/ublue-update/ublue-update.toml /tmp/ublue-update.toml - -# Add ublue kmods, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion -COPY --from=ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms -RUN /tmp/install-akmods.sh && \ - wget https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/che-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo - -# Starship Shell Prompt -RUN curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz" && \ - tar -xzf /tmp/starship.tar.gz -C /tmp && \ - install -c -m 0755 /tmp/starship /usr/bin && \ - echo 'eval "$(starship init bash)"' >> /etc/bashrc +# Copy ublue-update.toml to tmp first, to avoid being overwritten. +COPY /system_files/shared/usr/etc/ublue-update/ublue-update.toml /tmp/ublue-update.toml # Copy Bluefin CLI packages COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/atuin /usr/bin/atuin COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/share/bash-prexec /usr/share/bash-prexec -COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/eza /usr/bin/eza -COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/fd /usr/bin/fd -COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/fzf /usr/bin/fzf -COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/rg /usr/bin/rg -COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/zoxide /usr/bin/zoxide +# COPY ublue kmods, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion +COPY --from=ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms -RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ - wget https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -O /usr/libexec/brew-install && \ - chmod +x /usr/libexec/brew-install && \ - /tmp/build.sh && \ - /tmp/image-info.sh && \ - /tmp/fetch-quadlets.sh && \ - pip install --prefix=/usr topgrade && \ - rpm-ostree install ublue-update && \ - mkdir -p /usr/etc/flatpak/remotes.d && \ - wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d && \ - cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml && \ - if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \ - systemctl enable tuned.service \ - ; fi && \ - systemctl enable rpm-ostree-countme.service && \ - systemctl enable tailscaled.service && \ - systemctl enable dconf-update.service && \ - systemctl --global enable ublue-flatpak-manager.service && \ - systemctl enable ublue-update.timer && \ - systemctl enable ublue-system-setup.service && \ - systemctl --global enable ublue-user-setup.service && \ - fc-cache -f /usr/share/fonts/ubuntu && \ - fc-cache -f /usr/share/fonts/inter && \ - find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just && \ - rm -f /etc/yum.repos.d/tailscale.repo && \ - rm -f /etc/yum.repos.d/charm.repo && \ - rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ - echo "Hidden=true" >> /usr/share/applications/fish.desktop && \ - echo "Hidden=true" >> /usr/share/applications/htop.desktop && \ - echo "Hidden=true" >> /usr/share/applications/nvtop.desktop && \ - echo "Hidden=true" >> /usr/share/applications/gnome-system-monitor.desktop && \ - rm -f /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo && \ - sed -i 's/#DefaultLimitNOFILE=/DefaultLimitNOFILE=4096:524288/' /etc/systemd/user.conf && \ - sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \ - sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \ - sed -i '/^PRETTY_NAME/s/Silverblue/Bluefin/' /usr/lib/os-release && \ +# Build, cleanup, commit. +RUN bash -c ". /tmp/build/build-base.sh" && \ rm -rf /tmp/* /var/* && \ - ostree container commit && \ mkdir -p /var/tmp && \ - chmod -R 1777 /var/tmp + chmod -R 1777 /var/tmp && \ + ostree container commit ## bluefin-dx developer edition image section -FROM bluefin AS bluefin-dx +FROM base AS dx ARG IMAGE_NAME="${IMAGE_NAME}" ARG IMAGE_VENDOR="${IMAGE_VENDOR}" ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" -ARG PACKAGE_LIST="bluefin-dx" # dx specific files come from the dx directory in this repo -COPY dx/usr /usr -COPY dx/etc/yum.repos.d/ /etc/yum.repos.d/ -COPY workarounds.sh \ - packages.json \ - build.sh \ - image-info.sh \ - /tmp - -# Apply IP Forwarding before installing Docker to prevent messing with LXC networking -RUN sysctl -p - -RUN wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ - wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ - wget https://copr.fedorainfracloud.org/coprs/karmab/kcli/repo/fedora-"${FEDORA_MAJOR_VERSION}"/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ - wget https://copr.fedorainfracloud.org/coprs/atim/ubuntu-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo - -# Handle packages via packages.json -RUN /tmp/build.sh && \ - /tmp/image-info.sh - -COPY --from=cgr.dev/chainguard/dive:latest /usr/bin/dive /usr/bin/dive -COPY --from=cgr.dev/chainguard/flux:latest /usr/bin/flux /usr/bin/flux -COPY --from=cgr.dev/chainguard/helm:latest /usr/bin/helm /usr/bin/helm -COPY --from=cgr.dev/chainguard/ko:latest /usr/bin/ko /usr/bin/ko -COPY --from=cgr.dev/chainguard/minio-client:latest /usr/bin/mc /usr/bin/mc -COPY --from=cgr.dev/chainguard/kubectl:latest /usr/bin/kubectl /usr/bin/kubectl - -RUN curl -Lo ./kind "https://github.com/kubernetes-sigs/kind/releases/latest/download/kind-$(uname)-amd64" && \ - chmod +x ./kind && \ - mv ./kind /usr/bin/kind - -# Install kns/kctx and add completions for Bash -RUN wget https://raw.githubusercontent.com/ahmetb/kubectx/master/kubectx -O /usr/bin/kubectx && \ - wget https://raw.githubusercontent.com/ahmetb/kubectx/master/kubens -O /usr/bin/kubens && \ - chmod +x /usr/bin/kubectx /usr/bin/kubens - -# Set up services -RUN systemctl enable docker.socket && \ - systemctl enable podman.socket && \ - systemctl enable swtpm-workaround.service && \ - systemctl enable bluefin-dx-groups.service && \ - systemctl enable --global bluefin-dx-user-vscode.service && \ - systemctl disable pmie.service && \ - systemctl disable pmlogger.service - -RUN /tmp/workarounds.sh +COPY build_files/dx build_files/shared /tmp/build/ +COPY system_files/dx / +COPY packages.json /tmp/packages.json -# Clean up repos, everything is on the image so we don't need them -RUN rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ - rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ - rm -f /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ - rm -f /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ - rm -f /etc/yum.repos.d/vscode.repo && \ - rm -f /etc/yum.repos.d/docker-ce.repo && \ - rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo && \ - rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo && \ +# Build, Clean-up, Commit +RUN bash -c ". /tmp/build/build-dx.sh" && \ fc-cache --system-only --really-force --verbose && \ rm -rf /tmp/* /var/* && \ - ostree container commit + mkdir -p /var/tmp && \ + chmod -R 1777 /var/tmp && \ + ostree container commit \ No newline at end of file diff --git a/build_files/base/aurora-changes.sh b/build_files/base/aurora-changes.sh new file mode 100644 index 00000000000..cc4058ad5ad --- /dev/null +++ b/build_files/base/aurora-changes.sh @@ -0,0 +1,11 @@ +#!/usr/bin/bash + +set -oue pipefail + +if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" && "${BASE_IMAGE_NAME}" = "kinoite" ]]; then + sed -i '//,/<\/entry>/ s/[^<]*<\/default>/preferred:\/\/browser,applications:org.gnome.Ptyxis.desktop,applications:org.kde.discover.desktop,preferred:\/\/filemanager<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml + sed -i '//,/<\/entry>/ s/[^<]*<\/default>/preferred:\/\/browser,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,org.gnome.Ptyxis.desktop,org.kde.discover.desktop<\/default>/' /usr/share/plasma/plasmoids/org.kde.plasma.kickoff/contents/config/main.xml + sed -i 's@Exec=ptyxis@Exec=kde-ptyxis@g' /usr/share/applications/org.gnome.Ptyxis.desktop + sed -i 's@Keywords=@Keywords=konsole;@g' /usr/share/applications/org.gnome.Ptyxis.desktop + cp /usr/share/applications/org.gnome.Ptyxis.desktop /usr/share/kglobalaccel/org.gnome.Ptyxis.desktop +fi \ No newline at end of file diff --git a/build_files/base/branding.sh b/build_files/base/branding.sh new file mode 100644 index 00000000000..3db61814f9a --- /dev/null +++ b/build_files/base/branding.sh @@ -0,0 +1,9 @@ +#!/usr/bin/bash + +set -oue pipefail + +if test "$BASE_IMAGE_NAME" = "silverblue"; then + sed -i '/^PRETTY_NAME/s/Silverblue/Bluefin/' /usr/lib/os-release +elif test "$BASE_IMAGE_NAME" = "kinoite"; then + sed -i '/^PRETTY_NAME/s/Kinoite/Aurora/' /usr/lib/os-release +fi \ No newline at end of file diff --git a/build_files/base/build-base.sh b/build_files/base/build-base.sh new file mode 100644 index 00000000000..68fb9e7d0e0 --- /dev/null +++ b/build_files/base/build-base.sh @@ -0,0 +1,18 @@ +#!/usr/bin/bash + +set -oue pipefail + +. /tmp/build/copr-repos.sh +. /tmp/build/nvidia-explicit-sync.sh +. /tmp/build/install-akmods.sh +. /tmp/build/packages.sh +. /tmp/build/fetch-install.sh +rpm-ostree install ublue-update +. /tmp/build/image-info.sh +. /tmp/build/fetch-quadlets.sh +. /tmp/build/font-install.sh +. /tmp/build/install-tmp.sh +. /tmp/build/systemd.sh +. /tmp/build/aurora-changes.sh +. /tmp/build/branding.sh +. /tmp/build/cleanup.sh \ No newline at end of file diff --git a/build_files/base/cleanup.sh b/build_files/base/cleanup.sh new file mode 100644 index 00000000000..caedd6b99da --- /dev/null +++ b/build_files/base/cleanup.sh @@ -0,0 +1,14 @@ +#!/usr/bin/bash + +set -ouex pipefail + +rm -f /etc/yum.repos.d/tailscale.repo +rm -f /etc/yum.repos.d/charm.repo +rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo +echo "Hidden=true" >> /usr/share/applications/fish.desktop +echo "Hidden=true" >> /usr/share/applications/htop.desktop +echo "Hidden=true" >> /usr/share/applications/nvtop.desktop +if [ "$BASE_IMAGE_NAME" = "silverblue" ]; then + echo "Hidden=true" >> /usr/share/applications/gnome-system-monitor.desktop +fi +rm -f /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo \ No newline at end of file diff --git a/build_files/base/copr-repos.sh b/build_files/base/copr-repos.sh new file mode 100644 index 00000000000..da95f3d7e7d --- /dev/null +++ b/build_files/base/copr-repos.sh @@ -0,0 +1,31 @@ +#!/usr/bin/bash + +set -oue pipefail + +# Add Staging repo +wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo +# 39 gets VRR and Ptyxis +if [ ${FEDORA_MAJOR_VERSION} -eq "39" ]; then + wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo + rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem + rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo + rpm-ostree override replace \ + --experimental \ + --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \ + gtk4 \ + vte291 \ + vte-profile \ + libadwaita + rpm-ostree install ptyxis +fi +# 40 gets only Ptyxis +if [ ${FEDORA_MAJOR_VERSION} -eq "40" ]; then + rpm-ostree override replace \ + --experimental \ + --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \ + vte291 \ + vte-profile + rpm-ostree install ptyxis +fi +# Add Nerd Fonts +wget https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/che-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo \ No newline at end of file diff --git a/build_files/base/fetch-install.sh b/build_files/base/fetch-install.sh new file mode 100644 index 00000000000..3a34f55550c --- /dev/null +++ b/build_files/base/fetch-install.sh @@ -0,0 +1,20 @@ +#!/usr/bin/bash + +set -oue pipefail + +# Starship Shell Prompt +curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz" +tar -xzf /tmp/starship.tar.gz -C /tmp +install -c -m 0755 /tmp/starship /usr/bin +echo 'eval "$(starship init bash)"' >> /etc/bashrc + +# Brew Install Script +wget https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -O /usr/libexec/brew-install +chmod +x /usr/libexec/brew-install + +# Flatpak Remotes +mkdir -p /usr/etc/flatpak/remotes.d +wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d + +# Topgrade Install +pip install --prefix=/usr topgrade \ No newline at end of file diff --git a/fetch-quadlets.sh b/build_files/base/fetch-quadlets.sh similarity index 100% rename from fetch-quadlets.sh rename to build_files/base/fetch-quadlets.sh diff --git a/build_files/base/font-install.sh b/build_files/base/font-install.sh new file mode 100644 index 00000000000..8869be3ae2c --- /dev/null +++ b/build_files/base/font-install.sh @@ -0,0 +1,5 @@ +#!/usr/bin/bash + +set -ouex pipefail +fc-cache -f /usr/share/fonts/ubuntu +fc-cache -f /usr/share/fonts/inter \ No newline at end of file diff --git a/install-akmods.sh b/build_files/base/install-akmods.sh similarity index 90% rename from install-akmods.sh rename to build_files/base/install-akmods.sh index cb54da83bea..26eac0433f5 100755 --- a/install-akmods.sh +++ b/build_files/base/install-akmods.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -oue pipefail + sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then @@ -8,7 +10,7 @@ if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then /tmp/akmods-rpms/kmods/*xone*.rpm \ /tmp/akmods-rpms/kmods/*openrazer*.rpm \ /tmp/akmods-rpms/kmods/*wl*.rpm - if grep -qv "surface" <<< "${AKMODS_FLAVOR}"; then + if grep -Eqv "(surface|asus)" <<< "${AKMODS_FLAVOR}"; then rpm-ostree install \ /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm fi diff --git a/build_files/base/install-tmp.sh b/build_files/base/install-tmp.sh new file mode 100644 index 00000000000..cfdd9802f46 --- /dev/null +++ b/build_files/base/install-tmp.sh @@ -0,0 +1,7 @@ +#!/usr/bin/bash + +set -ouex pipefail + +find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just + +cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml \ No newline at end of file diff --git a/build_files/base/nvidia-explicit-sync.sh b/build_files/base/nvidia-explicit-sync.sh new file mode 100644 index 00000000000..6b24a97035b --- /dev/null +++ b/build_files/base/nvidia-explicit-sync.sh @@ -0,0 +1,16 @@ +#!/usr/bin/bash + +# Install Explicit Sync Patches on Nvidia builds +if [[ "${IMAGE_FLAVOR}" =~ "nvidia" && "${IMAGE_FLAVOR}" =~ "39" ]]; then + wget https://copr.fedorainfracloud.org/coprs/gloriouseggroll/nvidia-explicit-sync/repo/fedora-$(rpm -E %fedora)/gloriouseggroll-nvidia-explicit-sync-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo + rpm-ostree override replace \ + --experimental \ + --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \ + xorg-x11-server-Xwayland + rpm-ostree override replace \ + --experimental \ + --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \ + egl-wayland \ + || true + rm /etc/yum.repos.d/_copr_gloriouseggroll-nvidia-explicit-sync.repo +fi \ No newline at end of file diff --git a/build.sh b/build_files/base/packages.sh similarity index 53% rename from build.sh rename to build_files/base/packages.sh index 23ae7191fef..a449f7ef1a0 100755 --- a/build.sh +++ b/build_files/base/packages.sh @@ -1,19 +1,20 @@ -#!/bin/sh +#!/usr/bin/bash set -ouex pipefail -RELEASE="$(rpm -E %fedora)" - # build list of all packages requested for inclusion -INCLUDED_PACKAGES=($(jq -r "[(.all.include | (select(.\"$PACKAGE_LIST\" != null).\"$PACKAGE_LIST\")[]), \ - (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (select(.\"$PACKAGE_LIST\" != null).\"$PACKAGE_LIST\")[])] \ - | sort | unique[]" /tmp/packages.json)) +INCLUDED_PACKAGES=($(jq -r "[(.all.include | (select(.all != null).all)[]), \ + (.all.include | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), \ + (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (select(.all != null).all)[]), \ + (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[])] \ + | sort | unique[]" /tmp/packages.json)) # build list of all packages requested for exclusion -EXCLUDED_PACKAGES=($(jq -r "[(.all.exclude | (select(.\"$PACKAGE_LIST\" != null).\"$PACKAGE_LIST\")[]), \ - (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (select(.\"$PACKAGE_LIST\" != null).\"$PACKAGE_LIST\")[])] \ - | sort | unique[]" /tmp/packages.json)) - +EXCLUDED_PACKAGES=($(jq -r "[(.all.exclude | (select(.all != null).all)[]), \ + (.all.exclude | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), \ + (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (select(.all != null).all)[]), \ + (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[])] \ + | sort | unique[]" /tmp/packages.json)) # ensure exclusion list only contains packages already present on image if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then @@ -30,18 +31,12 @@ elif [[ "${#INCLUDED_PACKAGES[@]}" -gt 0 && "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; rpm-ostree override remove \ ${EXCLUDED_PACKAGES[@]} \ $(printf -- "--install=%s " ${INCLUDED_PACKAGES[@]}) - else echo "No packages to install." - fi # check if any excluded packages are still present # (this can happen if an included package pulls in a dependency) -EXCLUDED_PACKAGES=($(jq -r "[(.all.exclude | (select(.\"$PACKAGE_LIST\" != null).\"$PACKAGE_LIST\")[]), \ - (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (select(.\"$PACKAGE_LIST\" != null).\"$PACKAGE_LIST\")[])] \ - | sort | unique[]" /tmp/packages.json)) - if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then EXCLUDED_PACKAGES=($(rpm -qa --queryformat='%{NAME} ' ${EXCLUDED_PACKAGES[@]})) fi diff --git a/build_files/base/systemd.sh b/build_files/base/systemd.sh new file mode 100644 index 00000000000..04c9857ab4e --- /dev/null +++ b/build_files/base/systemd.sh @@ -0,0 +1,13 @@ +#!/usr/bin/bash + + +if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \ + systemctl enable tuned.service \ +; fi +systemctl enable rpm-ostree-countme.service +systemctl enable tailscaled.service +systemctl enable dconf-update.service +systemctl --global enable ublue-flatpak-manager.service +systemctl enable ublue-update.timer +systemctl enable ublue-system-setup.service +systemctl --global enable ublue-user-setup.service \ No newline at end of file diff --git a/build_files/dx/branding-dx.sh b/build_files/dx/branding-dx.sh new file mode 100644 index 00000000000..9b9dba00699 --- /dev/null +++ b/build_files/dx/branding-dx.sh @@ -0,0 +1,9 @@ +#!/usr/bin/bash + +set -oue pipefail + +if test "$BASE_IMAGE_NAME" = "silverblue"; then + sed -i '/^PRETTY_NAME/s/Bluefin/Bluefin-dx/' /usr/lib/os-release +elif test "$BASE_IMAGE_NAME" = "kinoite"; then + sed -i '/^PRETTY_NAME/s/Aurora/Aurora-dx/' /usr/lib/os-release +fi \ No newline at end of file diff --git a/build_files/dx/build-dx.sh b/build_files/dx/build-dx.sh new file mode 100644 index 00000000000..92950c85484 --- /dev/null +++ b/build_files/dx/build-dx.sh @@ -0,0 +1,14 @@ +#!/usr/bin/bash + +set -oue pipefail + +# Apply IP Forwarding before installing Docker to prevent messing with LXC networking +sysctl -p + +. /tmp/build/copr-repos-dx.sh +. /tmp/build/packages-dx.sh +. /tmp/build/image-info.sh +. /tmp/build/fetch-install-dx.sh +. /tmp/build/workarounds.sh +. /tmp/build/branding-dx.sh +. /tmp/build/cleanup-dx.sh \ No newline at end of file diff --git a/build_files/dx/cleanup-dx.sh b/build_files/dx/cleanup-dx.sh new file mode 100644 index 00000000000..fde7b09a527 --- /dev/null +++ b/build_files/dx/cleanup-dx.sh @@ -0,0 +1,12 @@ +#!/usr/bin/bash + +set -ouex pipefail + +rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo +rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo +rm -f /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo +rm -f /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo +rm -f /etc/yum.repos.d/vscode.repo +rm -f /etc/yum.repos.d/docker-ce.repo +rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo +rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo \ No newline at end of file diff --git a/build_files/dx/copr-repos-dx.sh b/build_files/dx/copr-repos-dx.sh new file mode 100644 index 00000000000..8de259e53bb --- /dev/null +++ b/build_files/dx/copr-repos-dx.sh @@ -0,0 +1,15 @@ +#!/usr/bin/bash + +set -oue pipefail + +#incus, lxc, lxd +wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo + +#ublue-os staging +wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo + +#karmab-kcli +wget https://copr.fedorainfracloud.org/coprs/karmab/kcli/repo/fedora-"${FEDORA_MAJOR_VERSION}"/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo + +# Fonts +wget https://copr.fedorainfracloud.org/coprs/atim/ubuntu-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo \ No newline at end of file diff --git a/build_files/dx/fetch-install-dx.sh b/build_files/dx/fetch-install-dx.sh new file mode 100644 index 00000000000..e53f9154d57 --- /dev/null +++ b/build_files/dx/fetch-install-dx.sh @@ -0,0 +1,7 @@ +#!/usr/bin/bash + +set -oue pipefail + +curl -Lo ./kind "https://github.com/kubernetes-sigs/kind/releases/latest/download/kind-$(uname)-amd64" +chmod +x ./kind +mv ./kind /usr/bin/kind \ No newline at end of file diff --git a/build_files/dx/packages-dx.sh b/build_files/dx/packages-dx.sh new file mode 100755 index 00000000000..353c744ece7 --- /dev/null +++ b/build_files/dx/packages-dx.sh @@ -0,0 +1,52 @@ +#!/usr/bin/bash + +set -ouex pipefail + +# build list of all packages requested for inclusion +INCLUDED_PACKAGES=($(jq -r "[(.all.include | (select(.all != null).all)[]), \ + (.all.include | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), \ + (.all.include | (select(.dx != null).dx)[]), \ + (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (select(.all != null).all)[]), \ + (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), + (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (select(.dx != null).dx)[])] \ + | sort | unique[]" /tmp/packages.json)) + +# build list of all packages requested for exclusion +EXCLUDED_PACKAGES=($(jq -r "[(.all.exclude | (select(.all != null).all)[]), \ + (.all.exclude | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), \ + (.all.exclude | (select(.dx != null).dx)[]), \ + (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (select(.all != null).all)[]), \ + (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), + (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (select(.dx != null).dx)[])] \ + | sort | unique[]" /tmp/packages.json)) + +# ensure exclusion list only contains packages already present on image +if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then + EXCLUDED_PACKAGES=($(rpm -qa --queryformat='%{NAME} ' ${EXCLUDED_PACKAGES[@]})) +fi + +# simple case to install where no packages need excluding +if [[ "${#INCLUDED_PACKAGES[@]}" -gt 0 && "${#EXCLUDED_PACKAGES[@]}" -eq 0 ]]; then + rpm-ostree install \ + ${INCLUDED_PACKAGES[@]} + +# install/excluded packages both at same time +elif [[ "${#INCLUDED_PACKAGES[@]}" -gt 0 && "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then + rpm-ostree override remove \ + ${EXCLUDED_PACKAGES[@]} \ + $(printf -- "--install=%s " ${INCLUDED_PACKAGES[@]}) +else + echo "No packages to install." +fi + +# check if any excluded packages are still present +# (this can happen if an included package pulls in a dependency) +if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then + EXCLUDED_PACKAGES=($(rpm -qa --queryformat='%{NAME} ' ${EXCLUDED_PACKAGES[@]})) +fi + +# remove any excluded packages which are still present on image +if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then + rpm-ostree override remove \ + ${EXCLUDED_PACKAGES[@]} +fi diff --git a/build_files/dx/systemd-dx.sh b/build_files/dx/systemd-dx.sh new file mode 100644 index 00000000000..abddf532052 --- /dev/null +++ b/build_files/dx/systemd-dx.sh @@ -0,0 +1,11 @@ +#!/usr/bin/bash + +set -oue pipefail + +systemctl enable docker.socket +systemctl enable podman.socket +systemctl enable swtpm-workaround.service +systemctl enable bluefin-dx-groups.service +systemctl enable --global bluefin-dx-user-vscode.service +systemctl disable pmie.service +systemctl disable pmlogger.service \ No newline at end of file diff --git a/workarounds.sh b/build_files/dx/workarounds.sh similarity index 100% rename from workarounds.sh rename to build_files/dx/workarounds.sh diff --git a/image-info.sh b/build_files/shared/image-info.sh similarity index 100% rename from image-info.sh rename to build_files/shared/image-info.sh diff --git a/dx/usr/etc/dconf/db/local.d/01-ublue-dx b/dx/usr/etc/dconf/db/local.d/01-ublue-dx deleted file mode 100644 index 4d992afcc89..00000000000 --- a/dx/usr/etc/dconf/db/local.d/01-ublue-dx +++ /dev/null @@ -1,2 +0,0 @@ -[org/gnome/shell] -favorite-apps = ['org.mozilla.firefox.desktop', 'org.mozilla.Thunderbird.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Rhythmbox3.desktop', 'org.libreoffice.LibreOffice.writer.desktop', 'org.gnome.Software.desktop', 'code.desktop', 'org.gnome.Ptyxis.desktop', 'ubuntu.desktop', 'yelp.desktop'] diff --git a/just/bluefin-system.just b/just/bluefin-system.just index 4f4d4c7bffc..83d58a5eb59 100644 --- a/just/bluefin-system.just +++ b/just/bluefin-system.just @@ -13,7 +13,7 @@ # Run a one minute system benchmark benchmark: echo 'Running a 1 minute benchmark ...' - stress-ng --matrix 0 -t 1m --times + cd /tmp && stress-ng --matrix 0 -t 1m --times # Configure Bluefin-CLI Terminal Experience bluefin-cli: diff --git a/just/bluefin-tools.just b/just/bluefin-tools.just index ee6ed3a782f..a2fc33854b0 100644 --- a/just/bluefin-tools.just +++ b/just/bluefin-tools.just @@ -25,10 +25,6 @@ tensorflow: podman pull docker.io/tensorflow/tensorflow:latest podman run -it -p 8888:8888 docker.io/tensorflow/tensorflow:latest-jupyter # Start Jupyter server -# Run the yafti setup tool -yafti: - yafti /etc/yafti.yml --force - # Setup a local Ollama instance in a container. # Detect hardware, offer a choice if needed. ollama: diff --git a/packages.json b/packages.json index b754b694a77..50511e298dc 100644 --- a/packages.json +++ b/packages.json @@ -1,10 +1,9 @@ { "all": { "include": { - "bluefin": [ + "all": [ "bash-color-prompt", "bcache-tools", - "cockpit-bridge", "evtest", "epson-inkjet-printer-escpr", "epson-inkjet-printer-escpr2", @@ -13,22 +12,13 @@ "gcc", "glow", "gum", - "gnome-shell-extension-appindicator", - "gnome-shell-extension-blur-my-shell", - "gnome-shell-extension-dash-to-dock", - "gnome-shell-extension-gsconnect", - "gnome-shell-extension-logo-menu", "hplip", "ifuse", "input-remapper", - "libgda-sqlite", - "libgda", "libimobiledevice", - "libratbag-ratbagd", "libxcrypt-compat", "make", "mesa-libGLU", - "nautilus-gsconnect", "nerd-fonts", "playerctl", "pulseaudio-utils", @@ -47,11 +37,27 @@ "usbmuxd", "wireguard-tools", "xprop", - "yaru-theme", "wl-clipboard", "zsh" ], - "bluefin-dx": [ + "silverblue": [ + "gnome-shell-extension-appindicator", + "gnome-shell-extension-blur-my-shell", + "gnome-shell-extension-caffeine", + "gnome-shell-extension-dash-to-dock", + "gnome-shell-extension-gsconnect", + "gnome-shell-extension-logo-menu", + "libgda-sqlite", + "libgda", + "libratbag-ratbagd", + "nautilus-gsconnect", + "yaru-theme" + ], + "kinoite": [ + "fastfetch", + "libadwaita-qt5" + ], + "dx": [ "adobe-source-code-pro-fonts", "cascadia-code-fonts", "cockpit-machines", @@ -66,7 +72,6 @@ "containerd.io", "dbus-x11", "devpod", - "distrobuilder", "docker-ce", "docker-ce-cli", "docker-buildx-plugin", @@ -89,7 +94,6 @@ "p7zip-plugins", "p7zip", "podman-compose", - "podman-plugins", "podman-tui", "podmansh", "powerline-fonts", @@ -112,56 +116,97 @@ ] }, "exclude": { - "bluefin": [ + "all": [ "firefox-langpacks", "firefox", + "ublue-os-update-services" + ], + "silverblue": [ "gnome-extensions-app", "gnome-software-rpm-ostree", - "gnome-tour", - "ublue-os-update-services" + "gnome-tour" + ], + "kinoite": [ + "plasma-welcome" ], - "bluefin-dx": [] + "dx": [] } }, "38": { "include": { - "bluefin": [ + "silverblue": [ "gnome-shell-extension-tailscale-status" ], - "bluefin-dx": [], - "bluefin-framework": [] + "dx": [ + "distrobuilder", + "podman-plugins" + ] }, "exclude": { - "bluefin": [ + "silverblue": [ "podman-docker" ], - "bluefin-dx": [] + "dx": [] } }, "39": { "include": { - "bluefin": [ + "all": [ + "input-leap", + "tuned", + "tuned-ppd", + "tuned-utils", + "tuned-profiles-atomic" + ], + "silverblue": [ "gnome-shell-extension-tailscale-gnome-qs", + "nautilus-open-any-terminal" + ], + "dx": [ + "distrobuilder", + "podman-plugins" + ] + }, + "exclude": { + "all": [ + "podman-docker", + "power-profiles-daemon", + "tlp", + "tlp-rdw" + ], + "silverblue": [ + "gnome-terminal-nautilus" + ], + "dx": [] + } + }, + "40": { + "include": { + "all": [ "input-leap", - "nautilus-open-any-terminal", "tuned", "tuned-ppd", "tuned-utils", "tuned-profiles-atomic" ], - "bluefin-dx": [], - "bluefin-framework": [] + "silverblue": [ + "gnome-shell-extension-tailscale-gnome-qs", + "nautilus-open-any-terminal" + ], + "dx": [] }, "exclude": { - "bluefin": [ + "all": [ "podman-docker", - "gnome-terminal-nautilus", "power-profiles-daemon", "tlp", "tlp-rdw" ], - "bluefin-dx": [], - "bluefin-framework": [] + "silverblue": [ + "gnome-terminal-nautilus" + ], + "dx": [] } } + } diff --git a/dx/etc/yum.repos.d/docker-ce.repo b/system_files/dx/etc/yum.repos.d/docker-ce.repo similarity index 100% rename from dx/etc/yum.repos.d/docker-ce.repo rename to system_files/dx/etc/yum.repos.d/docker-ce.repo diff --git a/dx/etc/yum.repos.d/vscode.repo b/system_files/dx/etc/yum.repos.d/vscode.repo similarity index 100% rename from dx/etc/yum.repos.d/vscode.repo rename to system_files/dx/etc/yum.repos.d/vscode.repo diff --git a/dx/usr/bin/bluefin-dx-groups b/system_files/dx/usr/bin/bluefin-dx-groups similarity index 100% rename from dx/usr/bin/bluefin-dx-groups rename to system_files/dx/usr/bin/bluefin-dx-groups diff --git a/dx/usr/bin/bluefin-dx-user-vscode b/system_files/dx/usr/bin/bluefin-dx-user-vscode similarity index 100% rename from dx/usr/bin/bluefin-dx-user-vscode rename to system_files/dx/usr/bin/bluefin-dx-user-vscode diff --git a/dx/usr/bin/bluefin-incus b/system_files/dx/usr/bin/bluefin-incus similarity index 100% rename from dx/usr/bin/bluefin-incus rename to system_files/dx/usr/bin/bluefin-incus diff --git a/dx/usr/bin/bluefinbox-enter b/system_files/dx/usr/bin/bluefinbox-enter similarity index 100% rename from dx/usr/bin/bluefinbox-enter rename to system_files/dx/usr/bin/bluefinbox-enter diff --git a/dx/usr/etc/profile.d/vscode-bluefin-profile.sh b/system_files/dx/usr/etc/profile.d/vscode-bluefin-profile.sh similarity index 100% rename from dx/usr/etc/profile.d/vscode-bluefin-profile.sh rename to system_files/dx/usr/etc/profile.d/vscode-bluefin-profile.sh diff --git a/dx/usr/etc/skel/.config/Code/User/settings.json b/system_files/dx/usr/etc/skel/.config/Code/User/settings.json similarity index 100% rename from dx/usr/etc/skel/.config/Code/User/settings.json rename to system_files/dx/usr/etc/skel/.config/Code/User/settings.json diff --git a/dx/usr/etc/zsh/zlogin b/system_files/dx/usr/etc/zsh/zlogin similarity index 100% rename from dx/usr/etc/zsh/zlogin rename to system_files/dx/usr/etc/zsh/zlogin diff --git a/dx/usr/etc/zsh/zlogout b/system_files/dx/usr/etc/zsh/zlogout similarity index 100% rename from dx/usr/etc/zsh/zlogout rename to system_files/dx/usr/etc/zsh/zlogout diff --git a/dx/usr/etc/zsh/zprofile b/system_files/dx/usr/etc/zsh/zprofile similarity index 100% rename from dx/usr/etc/zsh/zprofile rename to system_files/dx/usr/etc/zsh/zprofile diff --git a/dx/usr/etc/zsh/zshenv b/system_files/dx/usr/etc/zsh/zshenv similarity index 100% rename from dx/usr/etc/zsh/zshenv rename to system_files/dx/usr/etc/zsh/zshenv diff --git a/dx/usr/etc/zsh/zshrc b/system_files/dx/usr/etc/zsh/zshrc similarity index 100% rename from dx/usr/etc/zsh/zshrc rename to system_files/dx/usr/etc/zsh/zshrc diff --git a/dx/usr/lib/sysctl.d/docker-ce.conf b/system_files/dx/usr/lib/sysctl.d/docker-ce.conf similarity index 100% rename from dx/usr/lib/sysctl.d/docker-ce.conf rename to system_files/dx/usr/lib/sysctl.d/docker-ce.conf diff --git a/dx/usr/lib/systemd/system/bluefin-dx-groups.service b/system_files/dx/usr/lib/systemd/system/bluefin-dx-groups.service similarity index 100% rename from dx/usr/lib/systemd/system/bluefin-dx-groups.service rename to system_files/dx/usr/lib/systemd/system/bluefin-dx-groups.service diff --git a/dx/usr/lib/systemd/system/swtpm-workaround.service b/system_files/dx/usr/lib/systemd/system/swtpm-workaround.service similarity index 100% rename from dx/usr/lib/systemd/system/swtpm-workaround.service rename to system_files/dx/usr/lib/systemd/system/swtpm-workaround.service diff --git a/dx/usr/lib/systemd/user/bluefin-dx-user-vscode.service b/system_files/dx/usr/lib/systemd/user/bluefin-dx-user-vscode.service similarity index 100% rename from dx/usr/lib/systemd/user/bluefin-dx-user-vscode.service rename to system_files/dx/usr/lib/systemd/user/bluefin-dx-user-vscode.service diff --git a/dx/usr/lib/tmpfiles.d/swtpm-workaround.conf b/system_files/dx/usr/lib/tmpfiles.d/swtpm-workaround.conf similarity index 100% rename from dx/usr/lib/tmpfiles.d/swtpm-workaround.conf rename to system_files/dx/usr/lib/tmpfiles.d/swtpm-workaround.conf diff --git a/dx/usr/share/fish/vendor_conf.d/brew.fish b/system_files/dx/usr/share/fish/vendor_conf.d/brew.fish similarity index 100% rename from dx/usr/share/fish/vendor_conf.d/brew.fish rename to system_files/dx/usr/share/fish/vendor_conf.d/brew.fish diff --git a/dx/usr/share/fonts/intelmono/IntelOneMono-Bold.ttf b/system_files/dx/usr/share/fonts/intelmono/IntelOneMono-Bold.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/IntelOneMono-Bold.ttf rename to system_files/dx/usr/share/fonts/intelmono/IntelOneMono-Bold.ttf diff --git a/dx/usr/share/fonts/intelmono/IntelOneMono-BoldItalic.ttf b/system_files/dx/usr/share/fonts/intelmono/IntelOneMono-BoldItalic.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/IntelOneMono-BoldItalic.ttf rename to system_files/dx/usr/share/fonts/intelmono/IntelOneMono-BoldItalic.ttf diff --git a/dx/usr/share/fonts/intelmono/IntelOneMono-Italic.ttf b/system_files/dx/usr/share/fonts/intelmono/IntelOneMono-Italic.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/IntelOneMono-Italic.ttf rename to system_files/dx/usr/share/fonts/intelmono/IntelOneMono-Italic.ttf diff --git a/dx/usr/share/fonts/intelmono/IntelOneMono-Light.ttf b/system_files/dx/usr/share/fonts/intelmono/IntelOneMono-Light.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/IntelOneMono-Light.ttf rename to system_files/dx/usr/share/fonts/intelmono/IntelOneMono-Light.ttf diff --git a/dx/usr/share/fonts/intelmono/IntelOneMono-LightItalic.ttf b/system_files/dx/usr/share/fonts/intelmono/IntelOneMono-LightItalic.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/IntelOneMono-LightItalic.ttf rename to system_files/dx/usr/share/fonts/intelmono/IntelOneMono-LightItalic.ttf diff --git a/dx/usr/share/fonts/intelmono/IntelOneMono-Medium.ttf b/system_files/dx/usr/share/fonts/intelmono/IntelOneMono-Medium.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/IntelOneMono-Medium.ttf rename to system_files/dx/usr/share/fonts/intelmono/IntelOneMono-Medium.ttf diff --git a/dx/usr/share/fonts/intelmono/IntelOneMono-MediumItalic.ttf b/system_files/dx/usr/share/fonts/intelmono/IntelOneMono-MediumItalic.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/IntelOneMono-MediumItalic.ttf rename to system_files/dx/usr/share/fonts/intelmono/IntelOneMono-MediumItalic.ttf diff --git a/dx/usr/share/fonts/intelmono/IntelOneMono-Regular.ttf b/system_files/dx/usr/share/fonts/intelmono/IntelOneMono-Regular.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/IntelOneMono-Regular.ttf rename to system_files/dx/usr/share/fonts/intelmono/IntelOneMono-Regular.ttf diff --git a/dx/usr/share/fonts/intelmono/OFL.txt b/system_files/dx/usr/share/fonts/intelmono/OFL.txt similarity index 100% rename from dx/usr/share/fonts/intelmono/OFL.txt rename to system_files/dx/usr/share/fonts/intelmono/OFL.txt diff --git a/dx/usr/share/fonts/intelmono/intelone-mono-font-family-bold.ttf b/system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-bold.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/intelone-mono-font-family-bold.ttf rename to system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-bold.ttf diff --git a/dx/usr/share/fonts/intelmono/intelone-mono-font-family-bolditalic.ttf b/system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-bolditalic.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/intelone-mono-font-family-bolditalic.ttf rename to system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-bolditalic.ttf diff --git a/dx/usr/share/fonts/intelmono/intelone-mono-font-family-italic.ttf b/system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-italic.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/intelone-mono-font-family-italic.ttf rename to system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-italic.ttf diff --git a/dx/usr/share/fonts/intelmono/intelone-mono-font-family-light.ttf b/system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-light.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/intelone-mono-font-family-light.ttf rename to system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-light.ttf diff --git a/dx/usr/share/fonts/intelmono/intelone-mono-font-family-lightitalic.ttf b/system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-lightitalic.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/intelone-mono-font-family-lightitalic.ttf rename to system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-lightitalic.ttf diff --git a/dx/usr/share/fonts/intelmono/intelone-mono-font-family-medium.ttf b/system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-medium.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/intelone-mono-font-family-medium.ttf rename to system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-medium.ttf diff --git a/dx/usr/share/fonts/intelmono/intelone-mono-font-family-mediumitalic.ttf b/system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-mediumitalic.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/intelone-mono-font-family-mediumitalic.ttf rename to system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-mediumitalic.ttf diff --git a/dx/usr/share/fonts/intelmono/intelone-mono-font-family-regular.ttf b/system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-regular.ttf similarity index 100% rename from dx/usr/share/fonts/intelmono/intelone-mono-font-family-regular.ttf rename to system_files/dx/usr/share/fonts/intelmono/intelone-mono-font-family-regular.ttf diff --git a/dx/usr/share/ublue-os/distrobox/pytorch-nvidia.ini b/system_files/dx/usr/share/ublue-os/distrobox/pytorch-nvidia.ini similarity index 100% rename from dx/usr/share/ublue-os/distrobox/pytorch-nvidia.ini rename to system_files/dx/usr/share/ublue-os/distrobox/pytorch-nvidia.ini diff --git a/system_files/kinoite/usr/bin/kde-ptyxis b/system_files/kinoite/usr/bin/kde-ptyxis new file mode 100755 index 00000000000..76408ed2cb4 --- /dev/null +++ b/system_files/kinoite/usr/bin/kde-ptyxis @@ -0,0 +1,11 @@ +#!/usr/bin/bash +# Shim to handle KDE only supporting -e +# https://bugs.kde.org/show_bug.cgi?id=459616 +args=("${@//-e/--}") + +# Dolphin integration requires --new-window to function properly +if [[ ! "${args[@]}" =~ "--" && ! "${args[@]}" =~ "-h" && ! "${args[@]}" =~ "-x" ]]; then + /usr/bin/ptyxis --new-window "${args[@]}" +else + /usr/bin/ptyxis "${args[@]}" +fi diff --git a/usr/bin/xdg-terminal-exec b/system_files/kinoite/usr/bin/xdg-terminal-exec similarity index 100% rename from usr/bin/xdg-terminal-exec rename to system_files/kinoite/usr/bin/xdg-terminal-exec diff --git a/usr/etc/dconf/db/gdm.d/01-ublue b/system_files/kinoite/usr/etc/dconf/db/gdm.d/01-ublue similarity index 100% rename from usr/etc/dconf/db/gdm.d/01-ublue rename to system_files/kinoite/usr/etc/dconf/db/gdm.d/01-ublue diff --git a/system_files/kinoite/usr/etc/dconf/db/local.d/01-ptyxis b/system_files/kinoite/usr/etc/dconf/db/local.d/01-ptyxis new file mode 100644 index 00000000000..6c0e3a3149b --- /dev/null +++ b/system_files/kinoite/usr/etc/dconf/db/local.d/01-ptyxis @@ -0,0 +1,9 @@ +[org/gnome/Ptyxis] +restore-session=false +restore-window-size=false +profile-uuids=['2871e8027773ae74d6c87a5f659bbc74'] +default-profile-uuid='2871e8027773ae74d6c87a5f659bbc74' + +[org/gnome/Ptyxis/Profiles/2871e8027773ae74d6c87a5f659bbc74] +palette='Breeze' +opacity=0.9 diff --git a/usr/etc/dconf/db/local.d/locks/01-ublue-lock b/system_files/kinoite/usr/etc/dconf/db/local.d/locks/01-ublue-lock similarity index 100% rename from usr/etc/dconf/db/local.d/locks/01-ublue-lock rename to system_files/kinoite/usr/etc/dconf/db/local.d/locks/01-ublue-lock diff --git a/usr/etc/dconf/profile/gdm b/system_files/kinoite/usr/etc/dconf/profile/gdm similarity index 100% rename from usr/etc/dconf/profile/gdm rename to system_files/kinoite/usr/etc/dconf/profile/gdm diff --git a/usr/etc/dconf/profile/user b/system_files/kinoite/usr/etc/dconf/profile/user similarity index 100% rename from usr/etc/dconf/profile/user rename to system_files/kinoite/usr/etc/dconf/profile/user diff --git a/usr/etc/environment b/system_files/kinoite/usr/etc/environment similarity index 100% rename from usr/etc/environment rename to system_files/kinoite/usr/etc/environment diff --git a/system_files/kinoite/usr/etc/flatpak/system/install b/system_files/kinoite/usr/etc/flatpak/system/install new file mode 100644 index 00000000000..210d5fba497 --- /dev/null +++ b/system_files/kinoite/usr/etc/flatpak/system/install @@ -0,0 +1,15 @@ +org.freedesktop.Platform.ffmpeg-full//22.08 +org.mozilla.Thunderbird +org.kde.kcalc +org.kde.gwenview +org.kde.kontact +org.kde.okular +org.kde.kweather +org.kde.kclock +org.kde.haruna +org.kde.filelight +com.github.tchx84.Flatseal +io.github.dvlv.boxbuddyrs +io.github.flattool.Warehouse +org.fedoraproject.MediaWriter +io.missioncenter.MissionCenter diff --git a/usr/etc/flatpak/user/install b/system_files/kinoite/usr/etc/flatpak/system/remove similarity index 100% rename from usr/etc/flatpak/user/install rename to system_files/kinoite/usr/etc/flatpak/system/remove diff --git a/system_files/kinoite/usr/etc/flatpak/user/install b/system_files/kinoite/usr/etc/flatpak/user/install new file mode 100644 index 00000000000..e69de29bb2d diff --git a/system_files/kinoite/usr/etc/flatpak/user/remove b/system_files/kinoite/usr/etc/flatpak/user/remove new file mode 100644 index 00000000000..e69de29bb2d diff --git a/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh b/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh new file mode 100644 index 00000000000..6ac9a998e80 --- /dev/null +++ b/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh @@ -0,0 +1,3 @@ +#!/usr/bin/sh + +alias fastfetch="/usr/bin/fastfetch --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91 --logo-color-4 97" diff --git a/system_files/kinoite/usr/etc/skel/.config/gtk-4.0/gtk.css b/system_files/kinoite/usr/etc/skel/.config/gtk-4.0/gtk.css new file mode 100644 index 00000000000..f364ba5c279 --- /dev/null +++ b/system_files/kinoite/usr/etc/skel/.config/gtk-4.0/gtk.css @@ -0,0 +1,2 @@ +@import 'colors.css'; +@import 'kde_window_geometry.css'; diff --git a/system_files/kinoite/usr/etc/skel/.config/gtk-4.0/kde_window_geometry.css b/system_files/kinoite/usr/etc/skel/.config/gtk-4.0/kde_window_geometry.css new file mode 100644 index 00000000000..12708948426 --- /dev/null +++ b/system_files/kinoite/usr/etc/skel/.config/gtk-4.0/kde_window_geometry.css @@ -0,0 +1,35 @@ +/* + Extremely trimmed down version of https://github.com/MrCompoopter/Libadwaita-Breeze-Dark + Modifies only the window shape, and otherwise makes no other changes. + This should ensure compatibility with most if not all themes and applications. +*/ + +window { + border-radius: 4px 4px 0 0; + border-width: 0px; + margin: 0px; +} + +window.maximized { + border-radius: 0; +} + +.maximized window, +.fullscreen window, +.tiled window { + border-radius: 0; +} + +.popup window { + border-radius: 4px; +} + +.csd window { + border-radius: 4px; +} + +.solid-csd window { + border-radius: 0; + margin: 0; + border-width: 5px; +} diff --git a/system_files/kinoite/usr/etc/xdg/kdeglobals b/system_files/kinoite/usr/etc/xdg/kdeglobals new file mode 100644 index 00000000000..dec0f8bacd1 --- /dev/null +++ b/system_files/kinoite/usr/etc/xdg/kdeglobals @@ -0,0 +1,3 @@ +[General] +TerminalApplication=kde-ptyxis +TerminalService=org.gnome.Ptyxis.desktop diff --git a/usr/etc/yafti.yml b/system_files/kinoite/usr/etc/yafti.yml similarity index 97% rename from usr/etc/yafti.yml rename to system_files/kinoite/usr/etc/yafti.yml index 6b530dadcc5..14e25c0a7b6 100644 --- a/usr/etc/yafti.yml +++ b/system_files/kinoite/usr/etc/yafti.yml @@ -1,11 +1,11 @@ -title: Welcome to Bluefin +title: Welcome to Aurora properties: mode: "run-once" screens: first-screen: source: yafti.screen.title values: - title: "Welcome to Bluefin (Beta)" + title: "Welcome to Aurora, the Bluefin-KDE (Alpha)" icon: "/path/to/icon" description: | Applications are also installing in the background, the system will notify you when it is finished. diff --git a/system_files/kinoite/usr/share/applications/org.gnome.Ptyxis.desktop b/system_files/kinoite/usr/share/applications/org.gnome.Ptyxis.desktop new file mode 100644 index 00000000000..6c3b429431e --- /dev/null +++ b/system_files/kinoite/usr/share/applications/org.gnome.Ptyxis.desktop @@ -0,0 +1,60 @@ +[Desktop Entry] +Name[it]=Ptyxis +Name[nl]=Ptyxis +Name[pt_BR]=Ptyxis +Name[tr]=Ptyxis +Name[sv]=Ptyxis +Name=Ptyxis +Comment[it]=Un terminale per GNOME rivolto ai container +Comment[nl]=Een op containers gefocuste terminal voor GNOME +Comment[pt_BR]=Um terminal orientado a contêineres para GNOME +Comment[tr]=GNOME için konteyner odaklı uçbirim +Comment[sv]=En behållar-orienterad terminal för GNOME +Comment=A container-oriented terminal for GNOME +Exec=kde-ptyxis +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=org.gnome.Ptyxis +DBusActivatable=true +StartupNotify=true +Terminal=false +Type=Application +Categories=GNOME;GTK;System;TerminalEmulator; +GenericName[it]=Terminale +GenericName[nl]=Terminal +GenericName[pt_BR]=Terminal +GenericName[tr]=Uçbirim +GenericName[sv]=Terminal +GenericName=Terminal +# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +Keywords[tr]=terminal;prompt;ptyxis;shell;command;commandline;cmd;cli;uçbirim;istem;kabuk;komut;komut satırı; +Keywords=konsole;terminal;prompt;ptyxis;shell;command;commandline;cmd;cli; +Actions=new-window;new-tab;preferences; +X-ExecArg=-- +X-KDE-AuthorizeAction=shell_access + +[Desktop Action new-window] +Name[it]=Nuova finestra +Name[nl]=Nieuw venster +Name[pt_BR]=Nova janela +Name[tr]=Yeni Pencere +Name[sv]=Nytt fönster +Name=New Window +Exec=kde-ptyxis --new-window + +[Desktop Action new-tab] +Name[it]=Nuova scheda +Name[nl]=Nieuw tabblad +Name[pt_BR]=Nova aba +Name[tr]=Yeni Sekme +Name[sv]=Ny flik +Name=New Tab +Exec=kde-ptyxis --tab + +[Desktop Action preferences] +Name[it]=Preferenze +Name[nl]=Voorkeuren +Name[pt_BR]=Preferências +Name[tr]=Tercihler +Name[sv]=Inställningar +Name=Preferences +Exec=kde-ptyxis --preferences \ No newline at end of file diff --git a/system_files/kinoite/usr/share/fish/vendor_conf.d/aurora-fastfetch.fish b/system_files/kinoite/usr/share/fish/vendor_conf.d/aurora-fastfetch.fish new file mode 100644 index 00000000000..aa892f13e82 --- /dev/null +++ b/system_files/kinoite/usr/share/fish/vendor_conf.d/aurora-fastfetch.fish @@ -0,0 +1 @@ +alias fastfetch="/usr/bin/fastfetch --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91 --logo-color-4 97" diff --git a/system_files/kinoite/usr/share/ublue-os/aurora-logo.txt b/system_files/kinoite/usr/share/ublue-os/aurora-logo.txt new file mode 100644 index 00000000000..69aa4f2eed1 --- /dev/null +++ b/system_files/kinoite/usr/share/ublue-os/aurora-logo.txt @@ -0,0 +1,29 @@ +$1 + +++++++++ + +++++$4+$1++++++$4+$1++ + ++++++$4+$1+++ +++++++++++ + +++++++++++ $2+$1 +++++$4+$1+++++ + ++++++$4+$1++++ $4+++$1 +++++++++++ + ++++++++++$4 + +++++ ++ $2+++++$4+$2++++ +$1 +++$4+$1++++$4 + + + +++++++ + + $2+++++$4+$2++ +$1 ++++++$4 $2+$4 +++ +++++++++ +++ $2++++++++ +$1 +++$4+$1++$4 + +++++ +++++ + +$2 ++++++$4 $2+$4 +++++ +++++ +++++ +$2 ++$4+$2+++$4 + +++++ ++++++ ++++++++++ +$2 ++++++$4 +++++ +++++ + +++++++++++++++++++ +$2 ++++++$4 + +++++ + +++++++++++++++ +$2 +++$4++$2+$4 ++++++ +++++++++++++ +$2 ++++++$4 + ++++++ +++++++++++++ $2+++ $4++ +$2 ++++++$4 ++++++++++++++++ $2++$4+$2+ $4++ $1+ +$3 ++++++$4 ++++++++++++++ $3+ $2++++ +$3 ++++++$4 +++++++++++ + $4+ $3++++++ +$3 ++$4+$3+++$4 ++++++++++ +++ $3+++++++++++++ +$3 +++++ $4+++++++++ + $3+++++++++++++ +$3 +++ $4++++++++ $2++$4 + $3++++++++++++++ ++++ +$3 ++ $4++++++++ $3+ ++++++++++++++ +++++++ +$3 $4++++++ $2+ $3+++++++++++++ +++++++$2++ +$3 $4++++ $3+++++++++++++ ++++++$2+++ +$3 +++++++++++ ++++++$2+++ +$3 +++++ ++++++$2+++ +$3 ++++++$2++ +$3 +++++ \ No newline at end of file diff --git a/system_files/kinoite/usr/share/ublue-os/motd/bluefin.md b/system_files/kinoite/usr/share/ublue-os/motd/bluefin.md new file mode 100644 index 00000000000..4e8c39a524f --- /dev/null +++ b/system_files/kinoite/usr/share/ublue-os/motd/bluefin.md @@ -0,0 +1,10 @@ +# Welcome to Aurora! +🔭 `%IMAGE_NAME%:%IMAGE_TAG%` +Let's trace the stars. + +|  Command | Description | +| ------- | ----------- | +| `ujust` | List all available commands | +| `ujust toggle-user-motd` | Toggle this banner on/off | +| `ujust brew` | Install Homebrew (Strongly Recommended) | +| `ujust bluefin-cli` | Configure the terminal (Alpha) | diff --git a/etc/yum.repos.d/charm.repo b/system_files/shared/etc/yum.repos.d/charm.repo similarity index 100% rename from etc/yum.repos.d/charm.repo rename to system_files/shared/etc/yum.repos.d/charm.repo diff --git a/etc/yum.repos.d/tailscale.repo b/system_files/shared/etc/yum.repos.d/tailscale.repo similarity index 100% rename from etc/yum.repos.d/tailscale.repo rename to system_files/shared/etc/yum.repos.d/tailscale.repo diff --git a/usr/bin/podman-host b/system_files/shared/usr/bin/podman-host similarity index 100% rename from usr/bin/podman-host rename to system_files/shared/usr/bin/podman-host diff --git a/usr/bin/vscode-distrobox b/system_files/shared/usr/bin/vscode-distrobox similarity index 100% rename from usr/bin/vscode-distrobox rename to system_files/shared/usr/bin/vscode-distrobox diff --git a/usr/etc/distrobox/distrobox.conf b/system_files/shared/usr/etc/distrobox/distrobox.conf similarity index 100% rename from usr/etc/distrobox/distrobox.conf rename to system_files/shared/usr/etc/distrobox/distrobox.conf diff --git a/usr/etc/distrobox/distrobox.example b/system_files/shared/usr/etc/distrobox/distrobox.example similarity index 100% rename from usr/etc/distrobox/distrobox.example rename to system_files/shared/usr/etc/distrobox/distrobox.example diff --git a/system_files/shared/usr/etc/dracut.conf.d/nvidia.conf b/system_files/shared/usr/etc/dracut.conf.d/nvidia.conf new file mode 100644 index 00000000000..62880a58da8 --- /dev/null +++ b/system_files/shared/usr/etc/dracut.conf.d/nvidia.conf @@ -0,0 +1 @@ +force_drivers+=" nvidia nvidia_modeset nvidia_uvm nvidia_drm " \ No newline at end of file diff --git a/usr/etc/fish/functions/fish_greeting.fish b/system_files/shared/usr/etc/fish/functions/fish_greeting.fish similarity index 100% rename from usr/etc/fish/functions/fish_greeting.fish rename to system_files/shared/usr/etc/fish/functions/fish_greeting.fish diff --git a/usr/etc/profile.d/bluefin-firstboot.sh b/system_files/shared/usr/etc/profile.d/bluefin-firstboot.sh similarity index 100% rename from usr/etc/profile.d/bluefin-firstboot.sh rename to system_files/shared/usr/etc/profile.d/bluefin-firstboot.sh diff --git a/usr/etc/profile.d/brew.sh b/system_files/shared/usr/etc/profile.d/brew.sh similarity index 100% rename from usr/etc/profile.d/brew.sh rename to system_files/shared/usr/etc/profile.d/brew.sh diff --git a/usr/etc/profile.d/nix-app-icons.sh b/system_files/shared/usr/etc/profile.d/nix-app-icons.sh similarity index 100% rename from usr/etc/profile.d/nix-app-icons.sh rename to system_files/shared/usr/etc/profile.d/nix-app-icons.sh diff --git a/usr/etc/profile.d/open.sh b/system_files/shared/usr/etc/profile.d/open.sh similarity index 100% rename from usr/etc/profile.d/open.sh rename to system_files/shared/usr/etc/profile.d/open.sh diff --git a/usr/etc/security/limits.d/30-brew-limits.conf b/system_files/shared/usr/etc/security/limits.d/30-brew-limits.conf similarity index 100% rename from usr/etc/security/limits.d/30-brew-limits.conf rename to system_files/shared/usr/etc/security/limits.d/30-brew-limits.conf diff --git a/usr/etc/skel/.config/autostart/bluefin-firstboot.desktop b/system_files/shared/usr/etc/skel/.config/autostart/bluefin-firstboot.desktop similarity index 100% rename from usr/etc/skel/.config/autostart/bluefin-firstboot.desktop rename to system_files/shared/usr/etc/skel/.config/autostart/bluefin-firstboot.desktop diff --git a/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette b/system_files/shared/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette similarity index 100% rename from usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette rename to system_files/shared/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette diff --git a/usr/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile b/system_files/shared/usr/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile similarity index 100% rename from usr/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile rename to system_files/shared/usr/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile diff --git a/system_files/shared/usr/etc/systemd/user.conf b/system_files/shared/usr/etc/systemd/user.conf new file mode 100644 index 00000000000..b9fcbc8b733 --- /dev/null +++ b/system_files/shared/usr/etc/systemd/user.conf @@ -0,0 +1,41 @@ +[Manager] +#LogLevel=info +#LogTarget=auto +#LogColor=yes +#LogLocation=no +#LogTime=no +#SystemCallArchitectures= +#TimerSlackNSec= +#StatusUnitFormat=combined +#DefaultTimerAccuracySec=1min +#DefaultStandardOutput=inherit +#DefaultStandardError=inherit +#DefaultTimeoutStartSec=45s +DefaultTimeoutStopSec=15s +#DefaultTimeoutAbortSec= +#DefaultDeviceTimeoutSec=45s +#DefaultRestartSec=100ms +#DefaultStartLimitIntervalSec=10s +#DefaultStartLimitBurst=5 +#DefaultEnvironment= +#DefaultLimitCPU= +#DefaultLimitFSIZE= +#DefaultLimitDATA= +#DefaultLimitSTACK= +#DefaultLimitCORE= +#DefaultLimitRSS= +DefaultLimitNOFILE=4096:524288 +#DefaultLimitAS= +#DefaultLimitNPROC= +#DefaultLimitMEMLOCK= +#DefaultLimitLOCKS= +#DefaultLimitSIGPENDING= +#DefaultLimitMSGQUEUE= +#DefaultLimitNICE= +#DefaultLimitRTPRIO= +#DefaultLimitRTTIME= +#DefaultMemoryPressureThresholdSec=200ms +#DefaultMemoryPressureWatch=auto +#DefaultSmackProcessLabel= +#ReloadLimitIntervalSec= +#ReloadLimitBurst diff --git a/usr/etc/ublue-update/ublue-update.toml b/system_files/shared/usr/etc/ublue-update/ublue-update.toml similarity index 100% rename from usr/etc/ublue-update/ublue-update.toml rename to system_files/shared/usr/etc/ublue-update/ublue-update.toml diff --git a/usr/lib/modprobe.d/nvidia.conf b/system_files/shared/usr/lib/modprobe.d/nvidia.conf similarity index 100% rename from usr/lib/modprobe.d/nvidia.conf rename to system_files/shared/usr/lib/modprobe.d/nvidia.conf diff --git a/usr/lib/sysctl.d/80-inotify.conf b/system_files/shared/usr/lib/sysctl.d/80-inotify.conf similarity index 100% rename from usr/lib/sysctl.d/80-inotify.conf rename to system_files/shared/usr/lib/sysctl.d/80-inotify.conf diff --git a/usr/lib/systemd/system/dconf-update.service b/system_files/shared/usr/lib/systemd/system/dconf-update.service similarity index 100% rename from usr/lib/systemd/system/dconf-update.service rename to system_files/shared/usr/lib/systemd/system/dconf-update.service diff --git a/usr/lib/systemd/system/ublue-system-setup.service b/system_files/shared/usr/lib/systemd/system/ublue-system-setup.service similarity index 100% rename from usr/lib/systemd/system/ublue-system-setup.service rename to system_files/shared/usr/lib/systemd/system/ublue-system-setup.service diff --git a/usr/lib/systemd/user/ublue-flatpak-manager.service b/system_files/shared/usr/lib/systemd/user/ublue-flatpak-manager.service similarity index 100% rename from usr/lib/systemd/user/ublue-flatpak-manager.service rename to system_files/shared/usr/lib/systemd/user/ublue-flatpak-manager.service diff --git a/usr/lib/systemd/user/ublue-user-setup.service b/system_files/shared/usr/lib/systemd/user/ublue-user-setup.service similarity index 100% rename from usr/lib/systemd/user/ublue-user-setup.service rename to system_files/shared/usr/lib/systemd/user/ublue-user-setup.service diff --git a/usr/lib/tmpfiles.d/pmcd.conf b/system_files/shared/usr/lib/tmpfiles.d/pmcd.conf similarity index 100% rename from usr/lib/tmpfiles.d/pmcd.conf rename to system_files/shared/usr/lib/tmpfiles.d/pmcd.conf diff --git a/usr/libexec/configure-terminal.sh b/system_files/shared/usr/libexec/configure-terminal.sh similarity index 100% rename from usr/libexec/configure-terminal.sh rename to system_files/shared/usr/libexec/configure-terminal.sh diff --git a/usr/libexec/enable-bluefin-cli.sh b/system_files/shared/usr/libexec/enable-bluefin-cli.sh similarity index 100% rename from usr/libexec/enable-bluefin-cli.sh rename to system_files/shared/usr/libexec/enable-bluefin-cli.sh diff --git a/usr/libexec/ptyxis-add-profile.sh b/system_files/shared/usr/libexec/ptyxis-add-profile.sh similarity index 100% rename from usr/libexec/ptyxis-add-profile.sh rename to system_files/shared/usr/libexec/ptyxis-add-profile.sh diff --git a/usr/libexec/ptyxis-create-profile.sh b/system_files/shared/usr/libexec/ptyxis-create-profile.sh similarity index 100% rename from usr/libexec/ptyxis-create-profile.sh rename to system_files/shared/usr/libexec/ptyxis-create-profile.sh diff --git a/usr/libexec/ptyxis-remove-profile.sh b/system_files/shared/usr/libexec/ptyxis-remove-profile.sh similarity index 100% rename from usr/libexec/ptyxis-remove-profile.sh rename to system_files/shared/usr/libexec/ptyxis-remove-profile.sh diff --git a/usr/libexec/ublue-flatpak-manager b/system_files/shared/usr/libexec/ublue-flatpak-manager similarity index 100% rename from usr/libexec/ublue-flatpak-manager rename to system_files/shared/usr/libexec/ublue-flatpak-manager diff --git a/usr/libexec/ublue-motd b/system_files/shared/usr/libexec/ublue-motd similarity index 100% rename from usr/libexec/ublue-motd rename to system_files/shared/usr/libexec/ublue-motd diff --git a/usr/libexec/ublue-privileged-user-setup b/system_files/shared/usr/libexec/ublue-privileged-user-setup similarity index 100% rename from usr/libexec/ublue-privileged-user-setup rename to system_files/shared/usr/libexec/ublue-privileged-user-setup diff --git a/usr/libexec/ublue-system-setup b/system_files/shared/usr/libexec/ublue-system-setup similarity index 100% rename from usr/libexec/ublue-system-setup rename to system_files/shared/usr/libexec/ublue-system-setup diff --git a/usr/libexec/ublue-user-setup b/system_files/shared/usr/libexec/ublue-user-setup similarity index 100% rename from usr/libexec/ublue-user-setup rename to system_files/shared/usr/libexec/ublue-user-setup diff --git a/system_files/shared/usr/share/applications/system-update.desktop b/system_files/shared/usr/share/applications/system-update.desktop new file mode 100644 index 00000000000..6b79cf3816f --- /dev/null +++ b/system_files/shared/usr/share/applications/system-update.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=System Update +Comment=Update Bluefin, Flatpaks, Distrobox containers, and more +Icon=/usr/share/ublue-os/bluefin/update.svg +Categories=ConsoleOnly;System; +Terminal=true +Exec=/usr/bin/ujust update diff --git a/usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp b/system_files/shared/usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp similarity index 100% rename from usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp rename to system_files/shared/usr/share/backgrounds/bluefin/WallPaper_AutumnDay_Post.webp diff --git a/usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp b/system_files/shared/usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp similarity index 100% rename from usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp rename to system_files/shared/usr/share/backgrounds/bluefin/WallPaper_AutumnNight_Post.webp diff --git a/usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp b/system_files/shared/usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp similarity index 100% rename from usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp rename to system_files/shared/usr/share/backgrounds/bluefin/WallPaper_SpringDay_Post.webp diff --git a/usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp b/system_files/shared/usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp similarity index 100% rename from usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp rename to system_files/shared/usr/share/backgrounds/bluefin/WallPaper_SpringNight_Post.webp diff --git a/usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp b/system_files/shared/usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp similarity index 100% rename from usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp rename to system_files/shared/usr/share/backgrounds/bluefin/WallPaper_SummerDay_Post.webp diff --git a/usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp b/system_files/shared/usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp similarity index 100% rename from usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp rename to system_files/shared/usr/share/backgrounds/bluefin/WallPaper_SummerNight_Post.webp diff --git a/usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp b/system_files/shared/usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp similarity index 100% rename from usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp rename to system_files/shared/usr/share/backgrounds/bluefin/WallPaper_WinterDay_Post.webp diff --git a/usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp b/system_files/shared/usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp similarity index 100% rename from usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp rename to system_files/shared/usr/share/backgrounds/bluefin/WallPaper_WinterNight_Post.webp diff --git a/usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml b/system_files/shared/usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml similarity index 100% rename from usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml rename to system_files/shared/usr/share/backgrounds/bluefin/bluefin-autumn-dynamic.xml diff --git a/usr/share/backgrounds/bluefin/bluefin-spring-dynamic.xml b/system_files/shared/usr/share/backgrounds/bluefin/bluefin-spring-dynamic.xml similarity index 100% rename from usr/share/backgrounds/bluefin/bluefin-spring-dynamic.xml rename to system_files/shared/usr/share/backgrounds/bluefin/bluefin-spring-dynamic.xml diff --git a/usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml b/system_files/shared/usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml similarity index 100% rename from usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml rename to system_files/shared/usr/share/backgrounds/bluefin/bluefin-summer-dynamic.xml diff --git a/usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml b/system_files/shared/usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml similarity index 100% rename from usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml rename to system_files/shared/usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml diff --git a/usr/share/backgrounds/chicken.webp b/system_files/shared/usr/share/backgrounds/chicken.webp similarity index 100% rename from usr/share/backgrounds/chicken.webp rename to system_files/shared/usr/share/backgrounds/chicken.webp diff --git a/usr/share/backgrounds/xe_clouds.jpeg b/system_files/shared/usr/share/backgrounds/xe_clouds.jpeg similarity index 100% rename from usr/share/backgrounds/xe_clouds.jpeg rename to system_files/shared/usr/share/backgrounds/xe_clouds.jpeg diff --git a/usr/share/backgrounds/xe_foothills.jpeg b/system_files/shared/usr/share/backgrounds/xe_foothills.jpeg similarity index 100% rename from usr/share/backgrounds/xe_foothills.jpeg rename to system_files/shared/usr/share/backgrounds/xe_foothills.jpeg diff --git a/usr/share/backgrounds/xe_space_needle.jpeg b/system_files/shared/usr/share/backgrounds/xe_space_needle.jpeg similarity index 100% rename from usr/share/backgrounds/xe_space_needle.jpeg rename to system_files/shared/usr/share/backgrounds/xe_space_needle.jpeg diff --git a/usr/share/backgrounds/xe_sunset.jpeg b/system_files/shared/usr/share/backgrounds/xe_sunset.jpeg similarity index 100% rename from usr/share/backgrounds/xe_sunset.jpeg rename to system_files/shared/usr/share/backgrounds/xe_sunset.jpeg diff --git a/usr/share/fonts/MesloLGS NF/LICENSE.txt b/system_files/shared/usr/share/fonts/MesloLGS NF/LICENSE.txt similarity index 100% rename from usr/share/fonts/MesloLGS NF/LICENSE.txt rename to system_files/shared/usr/share/fonts/MesloLGS NF/LICENSE.txt diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Bold.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Bold.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Bold.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Bold.ttf diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-BoldItalic.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-BoldItalic.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-BoldItalic.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-BoldItalic.ttf diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Italic.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Italic.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Italic.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Italic.ttf diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Regular.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Regular.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Regular.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFont-Regular.ttf diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Bold.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Bold.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Bold.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Bold.ttf diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-BoldItalic.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-BoldItalic.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-BoldItalic.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-BoldItalic.ttf diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Italic.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Italic.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Italic.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Italic.ttf diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Regular.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Regular.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Regular.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontMono-Regular.ttf diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Bold.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Bold.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Bold.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Bold.ttf diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-BoldItalic.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-BoldItalic.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-BoldItalic.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-BoldItalic.ttf diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Italic.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Italic.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Italic.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Italic.ttf diff --git a/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Regular.ttf b/system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Regular.ttf similarity index 100% rename from usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Regular.ttf rename to system_files/shared/usr/share/fonts/MesloLGS NF/MesloLGLNerdFontPropo-Regular.ttf diff --git a/usr/share/fonts/commit-mono/CommitMono-400-Italic.otf b/system_files/shared/usr/share/fonts/commit-mono/CommitMono-400-Italic.otf similarity index 100% rename from usr/share/fonts/commit-mono/CommitMono-400-Italic.otf rename to system_files/shared/usr/share/fonts/commit-mono/CommitMono-400-Italic.otf diff --git a/usr/share/fonts/commit-mono/CommitMono-400-Regular.otf b/system_files/shared/usr/share/fonts/commit-mono/CommitMono-400-Regular.otf similarity index 100% rename from usr/share/fonts/commit-mono/CommitMono-400-Regular.otf rename to system_files/shared/usr/share/fonts/commit-mono/CommitMono-400-Regular.otf diff --git a/usr/share/fonts/commit-mono/CommitMono-700-Italic.otf b/system_files/shared/usr/share/fonts/commit-mono/CommitMono-700-Italic.otf similarity index 100% rename from usr/share/fonts/commit-mono/CommitMono-700-Italic.otf rename to system_files/shared/usr/share/fonts/commit-mono/CommitMono-700-Italic.otf diff --git a/usr/share/fonts/commit-mono/CommitMono-700-Regular.otf b/system_files/shared/usr/share/fonts/commit-mono/CommitMono-700-Regular.otf similarity index 100% rename from usr/share/fonts/commit-mono/CommitMono-700-Regular.otf rename to system_files/shared/usr/share/fonts/commit-mono/CommitMono-700-Regular.otf diff --git a/usr/share/fonts/commit-mono/custom-settings.json b/system_files/shared/usr/share/fonts/commit-mono/custom-settings.json similarity index 100% rename from usr/share/fonts/commit-mono/custom-settings.json rename to system_files/shared/usr/share/fonts/commit-mono/custom-settings.json diff --git a/usr/share/fonts/commit-mono/installation.txt b/system_files/shared/usr/share/fonts/commit-mono/installation.txt similarity index 100% rename from usr/share/fonts/commit-mono/installation.txt rename to system_files/shared/usr/share/fonts/commit-mono/installation.txt diff --git a/usr/share/fonts/commit-mono/license.txt b/system_files/shared/usr/share/fonts/commit-mono/license.txt similarity index 100% rename from usr/share/fonts/commit-mono/license.txt rename to system_files/shared/usr/share/fonts/commit-mono/license.txt diff --git a/usr/share/fonts/inter/Inter-Variable-Italic.ttf b/system_files/shared/usr/share/fonts/inter/Inter-Variable-Italic.ttf similarity index 100% rename from usr/share/fonts/inter/Inter-Variable-Italic.ttf rename to system_files/shared/usr/share/fonts/inter/Inter-Variable-Italic.ttf diff --git a/usr/share/fonts/inter/Inter-Variable.ttf b/system_files/shared/usr/share/fonts/inter/Inter-Variable.ttf similarity index 100% rename from usr/share/fonts/inter/Inter-Variable.ttf rename to system_files/shared/usr/share/fonts/inter/Inter-Variable.ttf diff --git a/usr/share/fonts/inter/Inter.ttc b/system_files/shared/usr/share/fonts/inter/Inter.ttc similarity index 100% rename from usr/share/fonts/inter/Inter.ttc rename to system_files/shared/usr/share/fonts/inter/Inter.ttc diff --git a/usr/share/fonts/inter/LICENSE.txt b/system_files/shared/usr/share/fonts/inter/LICENSE.txt similarity index 100% rename from usr/share/fonts/inter/LICENSE.txt rename to system_files/shared/usr/share/fonts/inter/LICENSE.txt diff --git a/usr/share/fonts/ubuntu/LICENCE-FAQ.txt b/system_files/shared/usr/share/fonts/ubuntu/LICENCE-FAQ.txt similarity index 100% rename from usr/share/fonts/ubuntu/LICENCE-FAQ.txt rename to system_files/shared/usr/share/fonts/ubuntu/LICENCE-FAQ.txt diff --git a/usr/share/fonts/ubuntu/LICENCE.txt b/system_files/shared/usr/share/fonts/ubuntu/LICENCE.txt similarity index 100% rename from usr/share/fonts/ubuntu/LICENCE.txt rename to system_files/shared/usr/share/fonts/ubuntu/LICENCE.txt diff --git a/usr/share/fonts/ubuntu/README.txt b/system_files/shared/usr/share/fonts/ubuntu/README.txt similarity index 100% rename from usr/share/fonts/ubuntu/README.txt rename to system_files/shared/usr/share/fonts/ubuntu/README.txt diff --git a/usr/share/fonts/ubuntu/TRADEMARKS.txt b/system_files/shared/usr/share/fonts/ubuntu/TRADEMARKS.txt similarity index 100% rename from usr/share/fonts/ubuntu/TRADEMARKS.txt rename to system_files/shared/usr/share/fonts/ubuntu/TRADEMARKS.txt diff --git a/usr/share/fonts/ubuntu/Ubuntu-B.ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu-B.ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu-B.ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu-B.ttf diff --git a/usr/share/fonts/ubuntu/Ubuntu-BI.ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu-BI.ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu-BI.ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu-BI.ttf diff --git a/usr/share/fonts/ubuntu/Ubuntu-C.ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu-C.ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu-C.ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu-C.ttf diff --git a/usr/share/fonts/ubuntu/Ubuntu-Italic[wdth,wght].ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu-Italic[wdth,wght].ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu-Italic[wdth,wght].ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu-Italic[wdth,wght].ttf diff --git a/usr/share/fonts/ubuntu/Ubuntu-L.ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu-L.ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu-L.ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu-L.ttf diff --git a/usr/share/fonts/ubuntu/Ubuntu-LI.ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu-LI.ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu-LI.ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu-LI.ttf diff --git a/usr/share/fonts/ubuntu/Ubuntu-M.ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu-M.ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu-M.ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu-M.ttf diff --git a/usr/share/fonts/ubuntu/Ubuntu-MI.ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu-MI.ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu-MI.ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu-MI.ttf diff --git a/usr/share/fonts/ubuntu/Ubuntu-R.ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu-R.ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu-R.ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu-R.ttf diff --git a/usr/share/fonts/ubuntu/Ubuntu-RI.ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu-RI.ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu-RI.ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu-RI.ttf diff --git a/usr/share/fonts/ubuntu/Ubuntu-Th.ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu-Th.ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu-Th.ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu-Th.ttf diff --git a/usr/share/fonts/ubuntu/UbuntuMono-B.ttf b/system_files/shared/usr/share/fonts/ubuntu/UbuntuMono-B.ttf similarity index 100% rename from usr/share/fonts/ubuntu/UbuntuMono-B.ttf rename to system_files/shared/usr/share/fonts/ubuntu/UbuntuMono-B.ttf diff --git a/usr/share/fonts/ubuntu/UbuntuMono-BI.ttf b/system_files/shared/usr/share/fonts/ubuntu/UbuntuMono-BI.ttf similarity index 100% rename from usr/share/fonts/ubuntu/UbuntuMono-BI.ttf rename to system_files/shared/usr/share/fonts/ubuntu/UbuntuMono-BI.ttf diff --git a/usr/share/fonts/ubuntu/UbuntuMono-Italic[wght].ttf b/system_files/shared/usr/share/fonts/ubuntu/UbuntuMono-Italic[wght].ttf similarity index 100% rename from usr/share/fonts/ubuntu/UbuntuMono-Italic[wght].ttf rename to system_files/shared/usr/share/fonts/ubuntu/UbuntuMono-Italic[wght].ttf diff --git a/usr/share/fonts/ubuntu/UbuntuMono-R.ttf b/system_files/shared/usr/share/fonts/ubuntu/UbuntuMono-R.ttf similarity index 100% rename from usr/share/fonts/ubuntu/UbuntuMono-R.ttf rename to system_files/shared/usr/share/fonts/ubuntu/UbuntuMono-R.ttf diff --git a/usr/share/fonts/ubuntu/UbuntuMono-RI.ttf b/system_files/shared/usr/share/fonts/ubuntu/UbuntuMono-RI.ttf similarity index 100% rename from usr/share/fonts/ubuntu/UbuntuMono-RI.ttf rename to system_files/shared/usr/share/fonts/ubuntu/UbuntuMono-RI.ttf diff --git a/usr/share/fonts/ubuntu/UbuntuMono[wght].ttf b/system_files/shared/usr/share/fonts/ubuntu/UbuntuMono[wght].ttf similarity index 100% rename from usr/share/fonts/ubuntu/UbuntuMono[wght].ttf rename to system_files/shared/usr/share/fonts/ubuntu/UbuntuMono[wght].ttf diff --git a/usr/share/fonts/ubuntu/Ubuntu[wdth,wght].ttf b/system_files/shared/usr/share/fonts/ubuntu/Ubuntu[wdth,wght].ttf similarity index 100% rename from usr/share/fonts/ubuntu/Ubuntu[wdth,wght].ttf rename to system_files/shared/usr/share/fonts/ubuntu/Ubuntu[wdth,wght].ttf diff --git a/usr/share/fonts/ubuntu/copyright.txt b/system_files/shared/usr/share/fonts/ubuntu/copyright.txt similarity index 100% rename from usr/share/fonts/ubuntu/copyright.txt rename to system_files/shared/usr/share/fonts/ubuntu/copyright.txt diff --git a/usr/share/pixmaps/faces/bicycle.jpg b/system_files/shared/usr/share/pixmaps/faces/bicycle.jpg similarity index 100% rename from usr/share/pixmaps/faces/bicycle.jpg rename to system_files/shared/usr/share/pixmaps/faces/bicycle.jpg diff --git a/usr/share/pixmaps/faces/book.jpg b/system_files/shared/usr/share/pixmaps/faces/book.jpg similarity index 100% rename from usr/share/pixmaps/faces/book.jpg rename to system_files/shared/usr/share/pixmaps/faces/book.jpg diff --git a/usr/share/pixmaps/faces/calculator.jpg b/system_files/shared/usr/share/pixmaps/faces/calculator.jpg similarity index 100% rename from usr/share/pixmaps/faces/calculator.jpg rename to system_files/shared/usr/share/pixmaps/faces/calculator.jpg diff --git a/usr/share/pixmaps/faces/cat.jpg b/system_files/shared/usr/share/pixmaps/faces/cat.jpg similarity index 100% rename from usr/share/pixmaps/faces/cat.jpg rename to system_files/shared/usr/share/pixmaps/faces/cat.jpg diff --git a/usr/share/pixmaps/faces/coffee2.jpg b/system_files/shared/usr/share/pixmaps/faces/coffee2.jpg similarity index 100% rename from usr/share/pixmaps/faces/coffee2.jpg rename to system_files/shared/usr/share/pixmaps/faces/coffee2.jpg diff --git a/usr/share/pixmaps/faces/flower2.jpg b/system_files/shared/usr/share/pixmaps/faces/flower2.jpg similarity index 100% rename from usr/share/pixmaps/faces/flower2.jpg rename to system_files/shared/usr/share/pixmaps/faces/flower2.jpg diff --git a/usr/share/pixmaps/faces/gamepad.jpg b/system_files/shared/usr/share/pixmaps/faces/gamepad.jpg similarity index 100% rename from usr/share/pixmaps/faces/gamepad.jpg rename to system_files/shared/usr/share/pixmaps/faces/gamepad.jpg diff --git a/usr/share/pixmaps/faces/guitar2.jpg b/system_files/shared/usr/share/pixmaps/faces/guitar2.jpg similarity index 100% rename from usr/share/pixmaps/faces/guitar2.jpg rename to system_files/shared/usr/share/pixmaps/faces/guitar2.jpg diff --git a/usr/share/pixmaps/faces/headphones.jpg b/system_files/shared/usr/share/pixmaps/faces/headphones.jpg similarity index 100% rename from usr/share/pixmaps/faces/headphones.jpg rename to system_files/shared/usr/share/pixmaps/faces/headphones.jpg diff --git a/usr/share/pixmaps/faces/hummingbird.jpg b/system_files/shared/usr/share/pixmaps/faces/hummingbird.jpg similarity index 100% rename from usr/share/pixmaps/faces/hummingbird.jpg rename to system_files/shared/usr/share/pixmaps/faces/hummingbird.jpg diff --git a/usr/share/pixmaps/faces/mountain.jpg b/system_files/shared/usr/share/pixmaps/faces/mountain.jpg similarity index 100% rename from usr/share/pixmaps/faces/mountain.jpg rename to system_files/shared/usr/share/pixmaps/faces/mountain.jpg diff --git a/usr/share/pixmaps/faces/plane.jpg b/system_files/shared/usr/share/pixmaps/faces/plane.jpg similarity index 100% rename from usr/share/pixmaps/faces/plane.jpg rename to system_files/shared/usr/share/pixmaps/faces/plane.jpg diff --git a/usr/share/pixmaps/faces/surfer.jpg b/system_files/shared/usr/share/pixmaps/faces/surfer.jpg similarity index 100% rename from usr/share/pixmaps/faces/surfer.jpg rename to system_files/shared/usr/share/pixmaps/faces/surfer.jpg diff --git a/usr/share/pixmaps/faces/tomatoes.jpg b/system_files/shared/usr/share/pixmaps/faces/tomatoes.jpg similarity index 100% rename from usr/share/pixmaps/faces/tomatoes.jpg rename to system_files/shared/usr/share/pixmaps/faces/tomatoes.jpg diff --git a/usr/share/pixmaps/faces/tree.jpg b/system_files/shared/usr/share/pixmaps/faces/tree.jpg similarity index 100% rename from usr/share/pixmaps/faces/tree.jpg rename to system_files/shared/usr/share/pixmaps/faces/tree.jpg diff --git a/usr/share/polkit-1/actions/org.ublue.privileged.user.setup.policy b/system_files/shared/usr/share/polkit-1/actions/org.ublue.privileged.user.setup.policy similarity index 100% rename from usr/share/polkit-1/actions/org.ublue.privileged.user.setup.policy rename to system_files/shared/usr/share/polkit-1/actions/org.ublue.privileged.user.setup.policy diff --git a/usr/share/polkit-1/rules.d/20-privileged-ruser.rules b/system_files/shared/usr/share/polkit-1/rules.d/20-privileged-ruser.rules similarity index 100% rename from usr/share/polkit-1/rules.d/20-privileged-ruser.rules rename to system_files/shared/usr/share/polkit-1/rules.d/20-privileged-ruser.rules diff --git a/usr/share/ublue-os/bluefin-cli/known-containers b/system_files/shared/usr/share/ublue-os/bluefin-cli/known-containers similarity index 100% rename from usr/share/ublue-os/bluefin-cli/known-containers rename to system_files/shared/usr/share/ublue-os/bluefin-cli/known-containers diff --git a/usr/share/ublue-os/bluefin-cli/ptyxis-integration b/system_files/shared/usr/share/ublue-os/bluefin-cli/ptyxis-integration similarity index 100% rename from usr/share/ublue-os/bluefin-cli/ptyxis-integration rename to system_files/shared/usr/share/ublue-os/bluefin-cli/ptyxis-integration diff --git a/system_files/shared/usr/share/ublue-os/bluefin/update.svg b/system_files/shared/usr/share/ublue-os/bluefin/update.svg new file mode 100644 index 00000000000..c470f2064f4 --- /dev/null +++ b/system_files/shared/usr/share/ublue-os/bluefin/update.svg @@ -0,0 +1,9 @@ + + + diff --git a/usr/share/ublue-os/just/10-update.just b/system_files/shared/usr/share/ublue-os/just/10-update.just similarity index 100% rename from usr/share/ublue-os/just/10-update.just rename to system_files/shared/usr/share/ublue-os/just/10-update.just diff --git a/usr/share/ublue-os/motd/tips/10-tips.md b/system_files/shared/usr/share/ublue-os/motd/tips/10-tips.md similarity index 100% rename from usr/share/ublue-os/motd/tips/10-tips.md rename to system_files/shared/usr/share/ublue-os/motd/tips/10-tips.md diff --git a/usr/share/ublue-os/quadlets/podmansh.container b/system_files/shared/usr/share/ublue-os/quadlets/podmansh.container similarity index 100% rename from usr/share/ublue-os/quadlets/podmansh.container rename to system_files/shared/usr/share/ublue-os/quadlets/podmansh.container diff --git a/usr/share/ublue-os/topgrade.toml b/system_files/shared/usr/share/ublue-os/topgrade.toml similarity index 100% rename from usr/share/ublue-os/topgrade.toml rename to system_files/shared/usr/share/ublue-os/topgrade.toml diff --git a/system_files/silverblue/usr/bin/xdg-terminal-exec b/system_files/silverblue/usr/bin/xdg-terminal-exec new file mode 100755 index 00000000000..3eb0cc9e08e --- /dev/null +++ b/system_files/silverblue/usr/bin/xdg-terminal-exec @@ -0,0 +1,17 @@ +#!/usr/bin/bash + +if command -v /usr/bin/ptyxis > /dev/null; then + if [[ -z "$@" ]]; then + /usr/bin/ptyxis --new-window + else + /usr/bin/ptyxis -- "$@" + fi +elif grep '^org\.gnome\.Ptyxis$' <<< $(/usr/bin/flatpak list --app --columns=application); then + if [[ -z "$@" ]]; then + /usr/bin/flatpak run org.gnome.Ptyxis --new-window + else + /usr/bin/flatpak run org.gnome.Ptyxis -- "$@" + fi +else + /usr/bin/gnome-terminal -- "$@" +fi diff --git a/system_files/silverblue/usr/etc/dconf/db/gdm.d/01-ublue b/system_files/silverblue/usr/etc/dconf/db/gdm.d/01-ublue new file mode 100644 index 00000000000..72eb2cd5bd2 --- /dev/null +++ b/system_files/silverblue/usr/etc/dconf/db/gdm.d/01-ublue @@ -0,0 +1,2 @@ +[org/gnome/desktop/peripherals/touchpad] +tap-to-click=true diff --git a/usr/etc/dconf/db/local.d/01-ublue b/system_files/silverblue/usr/etc/dconf/db/local.d/01-ublue similarity index 100% rename from usr/etc/dconf/db/local.d/01-ublue rename to system_files/silverblue/usr/etc/dconf/db/local.d/01-ublue diff --git a/usr/etc/dconf/db/local.d/02-bluefin-folders b/system_files/silverblue/usr/etc/dconf/db/local.d/02-bluefin-folders similarity index 100% rename from usr/etc/dconf/db/local.d/02-bluefin-folders rename to system_files/silverblue/usr/etc/dconf/db/local.d/02-bluefin-folders diff --git a/system_files/silverblue/usr/etc/dconf/db/local.d/locks/01-ublue-lock b/system_files/silverblue/usr/etc/dconf/db/local.d/locks/01-ublue-lock new file mode 100644 index 00000000000..83986653db5 --- /dev/null +++ b/system_files/silverblue/usr/etc/dconf/db/local.d/locks/01-ublue-lock @@ -0,0 +1,4 @@ +[org/gnome/software] +allow-updates=false +download-updates=false +download-updates-notify=false diff --git a/system_files/silverblue/usr/etc/dconf/profile/gdm b/system_files/silverblue/usr/etc/dconf/profile/gdm new file mode 100644 index 00000000000..817afc52734 --- /dev/null +++ b/system_files/silverblue/usr/etc/dconf/profile/gdm @@ -0,0 +1,3 @@ +user-db:user +system-db:gdm +file-db:/usr/share/gdm/greeter-dconf-defaults diff --git a/system_files/silverblue/usr/etc/dconf/profile/user b/system_files/silverblue/usr/etc/dconf/profile/user new file mode 100644 index 00000000000..ca120eecb0c --- /dev/null +++ b/system_files/silverblue/usr/etc/dconf/profile/user @@ -0,0 +1,2 @@ +user-db:user +system-db:local \ No newline at end of file diff --git a/system_files/silverblue/usr/etc/environment b/system_files/silverblue/usr/etc/environment new file mode 100644 index 00000000000..d0fb8abfcb6 --- /dev/null +++ b/system_files/silverblue/usr/etc/environment @@ -0,0 +1 @@ +MUTTER_DEBUG_FORCE_KMS_MODE=simple diff --git a/usr/etc/flatpak/system/install b/system_files/silverblue/usr/etc/flatpak/system/install similarity index 100% rename from usr/etc/flatpak/system/install rename to system_files/silverblue/usr/etc/flatpak/system/install diff --git a/usr/etc/flatpak/system/remove b/system_files/silverblue/usr/etc/flatpak/system/remove similarity index 100% rename from usr/etc/flatpak/system/remove rename to system_files/silverblue/usr/etc/flatpak/system/remove diff --git a/system_files/silverblue/usr/etc/flatpak/user/install b/system_files/silverblue/usr/etc/flatpak/user/install new file mode 100644 index 00000000000..e69de29bb2d diff --git a/system_files/silverblue/usr/etc/flatpak/user/remove b/system_files/silverblue/usr/etc/flatpak/user/remove new file mode 100644 index 00000000000..e69de29bb2d diff --git a/system_files/silverblue/usr/etc/yafti.yml b/system_files/silverblue/usr/etc/yafti.yml new file mode 100644 index 00000000000..2aaeffc6cb5 --- /dev/null +++ b/system_files/silverblue/usr/etc/yafti.yml @@ -0,0 +1,95 @@ +title: Welcome to Bluefin +properties: + mode: "run-once" +screens: + first-screen: + source: yafti.screen.title + values: + title: "Welcome to Bluefin (Beta)" + icon: "/path/to/icon" + description: | + Applications are also installing in the background, the system will notify you when it is finished. + applications: + source: yafti.screen.package + values: + title: Application Installation + show_terminal: true + package_manager: yafti.plugin.flatpak + groups: + Communication: + default: false + description: Tools to communicate and collaborate + packages: + - Discord: com.discordapp.Discord + - Slack: com.slack.Slack + Cloud Native Development Tools: + description: Start your cloud-native journey here! + default: false + packages: + - Podman Desktop: io.podman_desktop.PodmanDesktop + - Headlamp: io.kinvolk.Headlamp + - Cockpit Client: org.cockpit_project.CockpitClient + Gaming: + description: "Rock and Stone!" + default: false + packages: + - Bottles: com.usebottles.bottles + - Heroic Games Launcher: com.heroicgameslauncher.hgl + - Lutris: net.lutris.Lutris + - MangoHUD: org.freedesktop.Platform.VulkanLayer.MangoHud//22.08 + - Steam: com.valvesoftware.Steam + - Proton Plus for Steam: com.vysp3r.ProtonPlus + Office: + description: Work apps, Bow to Capitalism + default: false + packages: + - OnlyOffice: org.onlyoffice.desktopeditors + - LibreOffice: org.libreoffice.LibreOffice + - LogSeq: com.logseq.Logseq + - Obsidian: md.obsidian.Obsidian + - Standard Notes: org.standardnotes.standardnotes + - Todoist: com.todoist.Todoist + Other Web Browsers: + description: Additional browsers to complement Firefox + default: false + packages: + - Brave: com.brave.Browser + - Google Chrome: com.google.Chrome + - Microsoft Edge: com.microsoft.Edge + - Opera: com.opera.Opera + - Vivaldi: com.vivaldi.Vivaldi + Streaming: + description: Stream to the Internet + default: false + packages: + - OBS Studio: com.obsproject.Studio + - VkCapture for OBS: com.obsproject.Studio.OBSVkCapture + - Gstreamer for OBS: com.obsproject.Studio.Plugin.Gstreamer + - Gstreamer VAAPI for OBS: com.obsproject.Studio.Plugin.GStreamerVaapi + - Boatswain for Streamdeck: com.feaneron.Boatswain + Utilities: + description: Useful Utilities + default: true + packages: + - Font Downloader: org.gustavoperedo.FontDownloader + - PinApp Menu Editor: io.github.fabrialberio.pinapp + - Backup: org.gnome.DejaDup + - LocalSend (Easily send files across your network): org.localsend.localsend_app + - Peek (Simple Screen Recorder): com.uploadedlobster.peek + - Syncthing: com.github.zocker_160.SyncThingy + final-screen: + source: yafti.screen.title + values: + title: "All done!" + icon: "/path/to/icon" + links: + - "Install More Applications": + run: /usr/bin/gnome-software + - "Documentation": + run: /usr/bin/xdg-open https://universal-blue.discourse.group/t/introduction-to-bluefin/41 + - "Discussions and Announcements": + run: /usr/bin/xdg-open https://universal-blue.discourse.group/c/bluefin/6 + - "Join the Discord Community": + run: /usr/bin/xdg-open https://discord.gg/XjG48C7VHx + description: | + Thanks for trying Bluefin, we hope you enjoy it! diff --git a/usr/share/gnome-background-properties/bluefin-autumn-dynamic.xml b/system_files/silverblue/usr/share/gnome-background-properties/bluefin-autumn-dynamic.xml similarity index 100% rename from usr/share/gnome-background-properties/bluefin-autumn-dynamic.xml rename to system_files/silverblue/usr/share/gnome-background-properties/bluefin-autumn-dynamic.xml diff --git a/usr/share/gnome-background-properties/bluefin-spring-dynamic.xml b/system_files/silverblue/usr/share/gnome-background-properties/bluefin-spring-dynamic.xml similarity index 100% rename from usr/share/gnome-background-properties/bluefin-spring-dynamic.xml rename to system_files/silverblue/usr/share/gnome-background-properties/bluefin-spring-dynamic.xml diff --git a/usr/share/gnome-background-properties/bluefin-summer-dynamic.xml b/system_files/silverblue/usr/share/gnome-background-properties/bluefin-summer-dynamic.xml similarity index 100% rename from usr/share/gnome-background-properties/bluefin-summer-dynamic.xml rename to system_files/silverblue/usr/share/gnome-background-properties/bluefin-summer-dynamic.xml diff --git a/usr/share/gnome-background-properties/bluefin-winter-dynamic.xml b/system_files/silverblue/usr/share/gnome-background-properties/bluefin-winter-dynamic.xml similarity index 100% rename from usr/share/gnome-background-properties/bluefin-winter-dynamic.xml rename to system_files/silverblue/usr/share/gnome-background-properties/bluefin-winter-dynamic.xml diff --git a/usr/share/gnome-background-properties/chicken.xml b/system_files/silverblue/usr/share/gnome-background-properties/chicken.xml similarity index 100% rename from usr/share/gnome-background-properties/chicken.xml rename to system_files/silverblue/usr/share/gnome-background-properties/chicken.xml diff --git a/usr/share/gnome-background-properties/xe_clouds.xml b/system_files/silverblue/usr/share/gnome-background-properties/xe_clouds.xml similarity index 100% rename from usr/share/gnome-background-properties/xe_clouds.xml rename to system_files/silverblue/usr/share/gnome-background-properties/xe_clouds.xml diff --git a/usr/share/gnome-background-properties/xe_foothills.xml b/system_files/silverblue/usr/share/gnome-background-properties/xe_foothills.xml similarity index 100% rename from usr/share/gnome-background-properties/xe_foothills.xml rename to system_files/silverblue/usr/share/gnome-background-properties/xe_foothills.xml diff --git a/usr/share/gnome-background-properties/xe_space_needle.xml b/system_files/silverblue/usr/share/gnome-background-properties/xe_space_needle.xml similarity index 100% rename from usr/share/gnome-background-properties/xe_space_needle.xml rename to system_files/silverblue/usr/share/gnome-background-properties/xe_space_needle.xml diff --git a/usr/share/gnome-background-properties/xe_sunset.xml b/system_files/silverblue/usr/share/gnome-background-properties/xe_sunset.xml similarity index 100% rename from usr/share/gnome-background-properties/xe_sunset.xml rename to system_files/silverblue/usr/share/gnome-background-properties/xe_sunset.xml diff --git a/usr/share/ublue-os/motd/bluefin.md b/system_files/silverblue/usr/share/ublue-os/motd/bluefin.md similarity index 100% rename from usr/share/ublue-os/motd/bluefin.md rename to system_files/silverblue/usr/share/ublue-os/motd/bluefin.md diff --git a/usr/etc/flatpak/user/remove b/usr/etc/flatpak/user/remove deleted file mode 100644 index 5c0043fe8c5..00000000000 --- a/usr/etc/flatpak/user/remove +++ /dev/null @@ -1,24 +0,0 @@ -org.mozilla.firefox -org.freedesktop.Platform.ffmpeg-full//22.08 -org.gnome.Calculator -org.gnome.Calendar -org.gnome.Characters -org.gnome.Connections -org.gnome.Contacts -org.gnome.Evince -org.gnome.Loupe -org.gnome.Logs -org.gnome.Maps -org.gnome.NautilusPreviewer -org.gnome.TextEditor -org.gnome.Weather -org.gnome.baobab -org.gnome.clocks -org.gnome.font-viewer -com.mattjakeman.ExtensionManager -com.github.tchx84.Flatseal -io.github.flattool.Warehouse -com.github.marhkb.Pods -org.fedoraproject.MediaWriter -io.missioncenter.MissionCenter -io.github.celluloid_player.Celluloid