Skip to content

Commit

Permalink
feat: integrate bling repo (#105)
Browse files Browse the repository at this point in the history
includes everything from the bling repository to this repository (COPY)
and removes features now ingested from bling

---------

Co-authored-by: ER
  • Loading branch information
tulilirockz authored Jun 30, 2023
1 parent 3037449 commit da1b3f9
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 240 deletions.
12 changes: 11 additions & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ COPY usr /usr
# Copy the recipe that we're building.
COPY ${RECIPE} /usr/share/ublue-os/recipe.yml

# Copy nix install script and Universal Blue wallpapers RPM from Bling image
COPY --from=ghcr.io/ublue-os/bling:latest /rpms/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm /tmp/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm

# Integrate bling justfiles onto image
COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/share/ublue-os/just /usr/share/ublue-os/just

# Add nix installer if you want to use it
COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/bin/ublue-nix* /usr/bin

# "yq" used in build.sh and the "setup-flatpaks" just-action to read recipe.yml.
# Copied from the official container image since it's not available as an RPM.
COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq
Expand All @@ -35,7 +44,8 @@ COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq
COPY scripts /tmp/scripts

# Run the build script, then clean up temp files and finalize container build.
RUN chmod +x /tmp/scripts/build.sh && \
RUN rpm-ostree install /tmp/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm && \
chmod +x /tmp/scripts/build.sh && \
/tmp/scripts/build.sh && \
rm -rf /tmp/* /var/* && \
ostree container commit
Empty file added usr/bin/.gitkeep
Empty file.
130 changes: 0 additions & 130 deletions usr/bin/ublue-nix-install

This file was deleted.

86 changes: 0 additions & 86 deletions usr/bin/ublue-nix-uninstall

This file was deleted.

27 changes: 4 additions & 23 deletions usr/share/ublue-os/just/custom.just
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
!include /usr/share/ublue-os/just/bling.just

# install all flatpaks defined in recipe.yml
setup-flatpaks:
#!/usr/bin/env bash
echo 'Installing flatpaks from the ublue recipe ...'
Expand All @@ -7,26 +10,4 @@ setup-flatpaks:
flatpak install --user --noninteractive flathub $pkg; \
done
setup-gaming:
echo 'Setting up gaming experience ... lock and load.'
flatpak install -y --user \\
com.discordapp.Discord \\
com.feaneron.Boatswain \\
org.freedesktop.Platform.VulkanLayer.MangoHud//22.08 \\
org.freedesktop.Platform.VulkanLayer.OBSVkCapture//22.08 \\
org.freedesktop.Platform.VulkanLayer.vkBasalt//22.08 \\
com.heroicgameslauncher.hgl \\
com.obsproject.Studio \\
com.obsproject.Studio.Plugin.OBSVkCapture \\
com.obsproject.Studio.Plugin.Gstreamer \\
com.usebottles.bottles \\
com.valvesoftware.Steam \\
com.valvesoftware.Steam.Utility.gamescope \\
net.davidotek.pupgui2
flatpak override com.usebottles.bottles --user --filesystem=xdg-data/applications
flatpak override --user --env=MANGOHUD=1 com.valvesoftware.Steam
flatpak override --user --env=MANGOHUD=1 com.heroicgameslauncher.hgl

nix-me-up:
echo 'Setting phasers to kill. Installing nix.'
/usr/bin/ublue-nix-install
# Include some of your custom scripts here!

0 comments on commit da1b3f9

Please sign in to comment.