Skip to content

Commit

Permalink
Added GNOME version of image
Browse files Browse the repository at this point in the history
  • Loading branch information
Sparkrai committed Jun 13, 2024
1 parent 27f5039 commit 3ff5b6d
Show file tree
Hide file tree
Showing 6 changed files with 149 additions and 34 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
fail-fast: false # stop GH from cancelling all matrix builds if one fails
matrix:
recipe:
# !! Add your recipes here
- recipe.yml
- bazzite-dx.yml
- bazzite-gnome-dx.yml
steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
Expand Down
44 changes: 22 additions & 22 deletions files/just/bluefin-system.just
Original file line number Diff line number Diff line change
Expand Up @@ -100,30 +100,30 @@ configure-shell ACTION="":
printf "${USER}'s shell is now %s.\n" "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
fi

# alias gnome-vrr := toggle-gnome-vrr
alias gnome-vrr := toggle-gnome-vrr

# Enable or Disable Gnome-VRR
# toggle-gnome-vrr:
# #!/usr/bin/env bash
# if gsettings get org.gnome.mutter experimental-features | grep -q "variable-refresh-rate"
# then
# CURRENT_STATE="Enabled"
# else
# CURRENT_STATE="Disabled"
# fi
# echo "Gnome-VRR is currently ${CURRENT_STATE}"
# echo "Enable or Disable Gnome-VRR"
# OPTION=$(gum choose Enable Disable)
# if [ "$OPTION" = "Enable" ]
# then
# echo "Enabling Gnome-VRR"
# gsettings set org.gnome.mutter experimental-features "['variable-refresh-rate','scale-monitor-framebuffer']"
# elif [ "$OPTION" = "Disable" ]
# then
# echo "Disabling Gnome-VRR"
# gsettings set org.gnome.mutter experimental-features "['scale-monitor-framebuffer']"
# fi
# echo "To apply the changes make sure you logout and restart your session"
toggle-gnome-vrr:
#!/usr/bin/env bash
if gsettings get org.gnome.mutter experimental-features | grep -q "variable-refresh-rate"
then
CURRENT_STATE="Enabled"
else
CURRENT_STATE="Disabled"
fi
echo "Gnome-VRR is currently ${CURRENT_STATE}"
echo "Enable or Disable Gnome-VRR"
OPTION=$(gum choose Enable Disable)
if [ "$OPTION" = "Enable" ]
then
echo "Enabling Gnome-VRR"
gsettings set org.gnome.mutter experimental-features "['variable-refresh-rate','scale-monitor-framebuffer']"
elif [ "$OPTION" = "Disable" ]
then
echo "Disabling Gnome-VRR"
gsettings set org.gnome.mutter experimental-features "['scale-monitor-framebuffer']"
fi
echo "To apply the changes make sure you logout and restart your session"

# Ptyxis terminal transparency
ptyxis-transparency opacity="0.95":
Expand Down
1 change: 1 addition & 0 deletions files/scripts/fetch-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ tar -xzf /tmp/starship.tar.gz -C /tmp
install -c -m 0755 /tmp/starship /usr/bin
# shellcheck disable=SC2016
echo 'eval "$(starship init bash)"' >> /etc/bashrc
echo 'eval "$(starship init bash)"' >> /etc/zshrc

# Topgrade Install
pip install --prefix=/usr topgrade
Expand Down
13 changes: 12 additions & 1 deletion recipes/recipe.yml → recipes/bazzite-dx.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# image will be published to ghcr.io/<user>/<name>
name: bazzite-dx
# description will be included in the image's metadata
description: This is my custom Bazzite image that tries to add all the development capabilities from the Bluefin DX image.
description: This is my custom Bazzite image that tries to add all the development capabilities from the Aurora DX image.

# the base image to build on top of (FROM) and the version tag to use
base-image: ghcr.io/ublue-os/bazzite
Expand Down Expand Up @@ -39,6 +39,17 @@ modules:
# Install packages from Bluefin and Bluefin DX
- from-file: packages.yml

# Install KDE Packages
- type: rpm-ostree
install:
- skanpage
- libadwaita-qt5
- libadwaita-qt6
- kde-runtime-docs
- kdenetwork-filesharing
# - kdeplasma-addons Already included in Bazzite
- plasma-wallpapers-dynamic

# Install Starhip and activate RPM Fusion repos
- type: script
snippets:
Expand Down
112 changes: 112 additions & 0 deletions recipes/bazzite-gnome-dx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
# image will be published to ghcr.io/<user>/<name>
name: bazzite-gnome-dx
# description will be included in the image's metadata
description: This is my custom Bazzite GNOME image that tries to add all the development capabilities from the Bluefin DX image.

# the base image to build on top of (FROM) and the version tag to use
base-image: ghcr.io/ublue-os/bazzite-gnome
image-version: latest # latest is also supported if you want new updates ASAP

# module configuration, executed in order
# you can include multiple instances of the same module
modules:
- type: containerfile
snippets:
- ARG IMAGE_VENDOR="${IMAGE_REGISTRY}"
- ARG FEDORA_MAJOR_VERSION="${OS_VERSION}"
- ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
- ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-bazzite}"
- 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

- type: files
files:
- ../bluefin/system_files/shared: /
- ../bluefin/system_files/silverblue/usr/bin: /usr/bin
- ../bluefin/system_files/silverblue/usr/etc/flatpak: /usr/etc/flatpak
- ../bluefin/system_files/silverblue/usr/etc/profile.d: /usr/etc/profile.d
- ../bluefin/system_files/silverblue/usr/share: /usr/share
- ../bluefin/system_files/dx: /
- shared: /

# Activate RPM Fusion repos
- type: script
scripts:
- copr-repos.sh

# Install packages from Bluefin and Bluefin DX
- from-file: packages.yml

# Install GNOME packages
- type: rpm-ostree
install:
- simple-scan
- 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
- gnome-shell-extension-search-light
- libgda-sqlite
- libgda
- libratbag-ratbagd
- nautilus-gsconnect
- openssh-askpass
- yaru-theme
- gnome-shell-extension-tailscale-gnome-qs
- nautilus-open-any-terminal
remove:
- gnome-extensions-app
- gnome-software-rpm-ostree
- gnome-tour
- gnome-terminal-nautilus

# Install Starhip and activate RPM Fusion repos
- type: script
snippets:
- "find ${CONFIG_DIRECTORY}/bluefin/build_files -type f -exec chmod +x {} \\;" # Make bluefin scripts executable
scripts:
- ../bluefin/build_files/shared/image-info.sh
- fetch-install.sh
- ../bluefin/build_files/base/fetch-quadlets.sh

# alternatives cannot create symlinks on its own during a container build
- type: script
snippets:
- "ln -sf /usr/bin/ld.bfd /etc/alternatives/ld && ln -sf /etc/alternatives/ld /usr/bin/ld"

# Install fonts
- type: fonts
fonts:
nerd-fonts:
- FiraCode # don't add spaces or "Nerd Font" suffix.
- Hack
- SourceCodePro
- Terminus
- JetBrainsMono
- NerdFontsSymbolsOnly
google-fonts:
- Roboto
- Open Sans

# Enable systemd services
- type: systemd
system:
enabled:
- rpm-ostree-countme.service
# - dconf-update.service Already in Bazzite
- docker.socket
- podman.socket
- swtpm-workaround.service
user:
enabled:
- podman-auto-update.timer

# Cleanup repos, etc...
- type: script
scripts:
- cleanup.sh

- type: signing # this sets up the proper policy & signing files for signed images to work fully

9 changes: 0 additions & 9 deletions recipes/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,6 @@ modules:
- wl-clipboard
- zsh

# KDE packages
- skanpage
- libadwaita-qt5
- libadwaita-qt6
- kde-runtime-docs
- kdenetwork-filesharing
# - kdeplasma-addons Already included in Bazzite
- plasma-wallpapers-dynamic

# DX Bluefin packages
- adobe-source-code-pro-fonts
- android-tools
Expand Down

0 comments on commit 3ff5b6d

Please sign in to comment.