Skip to content
This repository has been archived by the owner on Oct 18, 2024. It is now read-only.

Commit

Permalink
refactor: remove optfix/workarounds
Browse files Browse the repository at this point in the history
  • Loading branch information
scottames committed Mar 14, 2024
1 parent e41cbf9 commit 25791c1
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 130 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-wor

env:
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}

RPMOSTREE_EXPERIMENTAL_FORCE_OPT_USRLOCAL_OVERLAY: 1
# Only deploys the branch named "live". Ignores all other branches, to allow
# having "development" branches without interfering with GHCR image uploads.
jobs:
Expand Down
8 changes: 6 additions & 2 deletions config/common-packages.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
---
type: rpm-ostree
repos:
- https://raw.githubusercontent.com/scottames/ublue/live/config/repos/1password.repo
- https://raw.githubusercontent.com/scottames/ublue/live/config/repos/tailscale.repo
- https://raw.githubusercontent.com/scottames/ublue/live/config/repos/warpdotdev.repo
- https://repo.vivaldi.com/stable/vivaldi-fedora.repo
- https://repository.mullvad.net/rpm/stable/mullvad.repo
install:
Expand All @@ -14,7 +16,7 @@ install:
- google-noto-fonts-common
- google-roboto-fonts
- langpacks-en
- lm_sensors # required by freon gnome-ext
- lm_sensors # required by freon gnome-ext
- mozilla-fira-fonts-common
- mscore-fonts-all
- mullvad-vpn
Expand All @@ -23,7 +25,7 @@ install:
- pamu2fcfg
- pipx
- pulseaudio-utils
- python3-pip # needed by Yafti
- python3-pip # needed by Yafti
- tailscale
# - vivaldi-stable
- wl-clipboard
Expand All @@ -44,6 +46,7 @@ install:
- qemu-system-x86-core
- qemu-user-binfmt
- virt-manager
- warp-terminal
# GNOME's GTK4 theme, Libadwaita. Already included in Silverblue, but not
# other spins. You can remove if you aren't using yafti, but many native
# apps and binaries require it, so it's a good idea to always include it
Expand All @@ -60,6 +63,7 @@ install:
optfix:
- 1Password
- vivaldi
# - warp-terminal
remove:
# Remove the native firefox (from Fedora) in favor of the Flatpak.
# - firefox-langpacks
Expand Down
2 changes: 0 additions & 2 deletions config/common-scripts-post-packages.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
type: script
scripts:
- 1Password.sh
# this sets up the proper policy & signing files for signed images to work
- signing.sh
- update-ca-trust.sh
- vivaldi.sh
7 changes: 7 additions & 0 deletions config/repos/warpdotdev.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[warpdotdev]
name=warpdotdev
baseurl=https://releases.warp.dev/linux/rpm/stable
enabled=1
gpgcheck=1
gpgkey=https://releases.warp.dev/linux/keys/warp.asc
repo_gpgcheck=1
107 changes: 0 additions & 107 deletions config/scripts/1Password.sh

This file was deleted.

18 changes: 0 additions & 18 deletions config/scripts/vivaldi.sh

This file was deleted.

0 comments on commit 25791c1

Please sign in to comment.