Skip to content

Commit

Permalink
try moving google chrome to non script.
Browse files Browse the repository at this point in the history
Start building F39
  • Loading branch information
m2Giles committed Nov 7, 2023
1 parent 99a0b3d commit 32bd3cd
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
recipe:
- recipe.yml
- recipe-nvidia.yml
- recipe-nvidia-39.yml
# !!!

steps:
Expand Down
7 changes: 7 additions & 0 deletions config/files/usr/etc/yum.repos.d/google-chrome.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[google-chrome]
name=google-chrome
baseurl=https://dl.google.com/linux/chrome/rpm/stable/x86_64
enabled=1
gpgcheck=1
repo_gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-google
6 changes: 4 additions & 2 deletions config/module_config/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ install:
- docker-ce
- docker-ce-cli
- docker-compose-plugin
# Google-Chrome
- google-chrome-stable
# # Emacs - Use Script for swap to 29.1
# - emacs
# - libtool
Expand All @@ -82,5 +84,5 @@ remove:
- gnome-software-rpm-ostree
- gnome-tour

# optfix:
# - google
optfix:
- google
2 changes: 1 addition & 1 deletion config/module_config/scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ scripts:
# - alternatives-workarounds.sh
# - emacs.sh
- devpod.sh
- google-chrome.sh
# - google-chrome.sh
- pano.sh
- post-install.sh
22 changes: 22 additions & 0 deletions config/recipe-nvidia-39.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# image will be published to ghcr.io/<user>/<name>
name: m2-ublue-nvidia
# description will be included in the image's metadata
description: A starting point for further customization of uBlue images. Make your own! https://ublue.it/making-your-own/

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

# module configuration, executed in order
# you can include multiple instances of the same module
modules:
- from-file: module_config/files.yml
- from-file: module_config/early-script.yml
- from-file: module_config/packages.yml
- from-file: module_config/bling.yml
- from-file: module_config/fonts.yml
- from-file: module_config/systemd.yml
- from-file: module_config/flatpak.yml
- from-file: module_config/yafti.yml
- from-file: module_config/scripts.yml
10 changes: 7 additions & 3 deletions config/scripts/early-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

set -ouex pipefail

echo "Setting up Directories for opt and alternatives"
mkdir -p /var/opt
mkdir -p /var/lib/alternatives
echo "Setting up Directories alternatives"
mkdir -p /var/lib/alternatives
echo "Getting Google Signing Key"
curl --retry 3 --retry-delay 2 --retry-all-errors -sL \
-o /etc/pki/rpm-gpg/RPM-GPG-KEY-google \
https://dl.google.com/linux/linux_signing_key.pub
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-google
2 changes: 1 addition & 1 deletion config/scripts/google-chrome.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ mv /var/opt/google /usr/lib/opt/google # move this over here
# Register path symlink
# We do this via tmpfiles.d so that it is created by the live system.
cat >/usr/lib/tmpfiles.d/google.conf <<EOF
L /opt/google - - - - /usr/lib/opt/google
L /var/opt/google - - - - /usr/lib/opt/google
EOF

# Reference
Expand Down
6 changes: 6 additions & 0 deletions config/scripts/post-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ rm -f /usr/share/applications/org.gnome.Extensions.desktop
# Remove repo files
rm -f /etc/yum.repos.d/**

# mv over /etc files
cp -r "/var/lib/alternatives" "/usr/share/alternatives"

# Starship in /etc/bashrc
echo 'eval "$(starship init bash)"' >> /etc/bashrc

# Symlink Yafti
ln -s /usr/share/ublue-os/firstboot/yafti.yml /etc/yafti.yml

Expand Down

0 comments on commit 32bd3cd

Please sign in to comment.