diff --git a/build.sh b/build.sh index d6d7c60..e132460 100755 --- a/build.sh +++ b/build.sh @@ -92,6 +92,7 @@ dnf -y --enablerepo copr:copr.fedorainfracloud.org:ublue-os:staging install \ uupd \ ublue-motd \ ublue-fastfetch \ + ublue-brew \ bluefin-* # Focefully install ujust without powerstat while we don't have it on EPEL diff --git a/system_files/etc/profile.d/askpass.sh b/system_files/etc/profile.d/askpass.sh deleted file mode 100644 index 27c4a9c..0000000 --- a/system_files/etc/profile.d/askpass.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/bash - -SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass' -export SUDO_ASKPASS diff --git a/system_files/etc/profile.d/brew-bash-completion.sh b/system_files/etc/profile.d/brew-bash-completion.sh deleted file mode 100644 index 424ac4a..0000000 --- a/system_files/etc/profile.d/brew-bash-completion.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# shellcheck shell=sh disable=SC1091,SC2039,SC2166 -# Check for interactive bash and that we haven't already been sourced. -if [ "x${BASH_VERSION-}" != x -a "x${PS1-}" != x -a "x${BREW_BASH_COMPLETION-}" = x ]; then - - # Check for recent enough version of bash. - if [ "${BASH_VERSINFO[0]}" -gt 4 ] || - [ "${BASH_VERSINFO[0]}" -eq 4 -a "${BASH_VERSINFO[1]}" -ge 2 ]; then - if [ -w /home/linuxbrew/.linuxbrew ]; then - if ! test -L /home/linuxbrew/.linuxbrew/etc/bash_completion.d/brew; then - /home/linuxbrew/.linuxbrew/bin/brew completions link > /dev/null - fi - fi - if test -d /home/linuxbrew/.linuxbrew/etc/bash_completion.d; then - for rc in /home/linuxbrew/.linuxbrew/etc/bash_completion.d/*; do - if test -r "$rc"; then - . "$rc" - fi - done - unset rc - fi - fi - BREW_BASH_COMPLETION=1 - export BREW_BASH_COMPLETION -fi diff --git a/system_files/etc/profile.d/brew.sh b/system_files/etc/profile.d/brew.sh deleted file mode 100755 index ea2ca28..0000000 --- a/system_files/etc/profile.d/brew.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -[[ -d /home/linuxbrew/.linuxbrew && $- == *i* ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" diff --git a/system_files/etc/profile.d/open.sh b/system_files/etc/profile.d/open.sh deleted file mode 100755 index b53bbd3..0000000 --- a/system_files/etc/profile.d/open.sh +++ /dev/null @@ -1 +0,0 @@ -alias open="xdg-open &>/dev/null" diff --git a/system_files/usr/lib/systemd/system-preset/01-homebrew.preset b/system_files/usr/lib/systemd/system-preset/01-homebrew.preset deleted file mode 100644 index 0d29503..0000000 --- a/system_files/usr/lib/systemd/system-preset/01-homebrew.preset +++ /dev/null @@ -1,3 +0,0 @@ -enable brew-setup.service -enable brew-update.timer -enable brew-upgrade.timer diff --git a/system_files/usr/lib/systemd/system/brew-setup.service b/system_files/usr/lib/systemd/system/brew-setup.service deleted file mode 100644 index 98fa5d6..0000000 --- a/system_files/usr/lib/systemd/system/brew-setup.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Setup Brew -Wants=network-online.target -After=network-online.target -ConditionPathExists=!/etc/.linuxbrew -ConditionPathExists=!/var/home/linuxbrew/.linuxbrew - -[Service] -Type=oneshot -ExecStart=/usr/bin/mkdir -p /tmp/homebrew -ExecStart=/usr/bin/tar --zstd -xvf /usr/share/homebrew.tar.zst -C /tmp/homebrew -ExecStart=/usr/bin/cp -R -n /tmp/homebrew/home/linuxbrew/.linuxbrew /var/home/linuxbrew -ExecStart=/usr/bin/chown -R 1000:1000 /var/home/linuxbrew -ExecStart=/usr/bin/rm -rf /tmp/homebrew -ExecStart=/usr/bin/touch /etc/.linuxbrew - -[Install] -WantedBy=default.target multi-user.target diff --git a/system_files/usr/lib/tmpfiles.d/homebrew.conf b/system_files/usr/lib/tmpfiles.d/homebrew.conf deleted file mode 100644 index 92cd2fd..0000000 --- a/system_files/usr/lib/tmpfiles.d/homebrew.conf +++ /dev/null @@ -1,3 +0,0 @@ -d /var/lib/homebrew 0755 1000 1000 - - -d /var/cache/homebrew 0755 1000 1000 - - -d /var/home/linuxbrew 0755 1000 1000 - - diff --git a/system_files/usr/share/applications/Discourse.desktop b/system_files/usr/share/applications/Discourse.desktop deleted file mode 100644 index a5b21bf..0000000 --- a/system_files/usr/share/applications/Discourse.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -NoDisplay=false -Terminal=false -Exec=xdg-open https://universal-blue.discourse.group/c/bluefin/ -Icon=ublue-discourse -Name=Community -Comment=Universal Blue Forums -Categories=Utility; diff --git a/system_files/usr/share/applications/documentation.desktop b/system_files/usr/share/applications/documentation.desktop deleted file mode 100644 index 917e5d7..0000000 --- a/system_files/usr/share/applications/documentation.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -NoDisplay=false -Terminal=false -Exec=xdg-open https://docs.projectbluefin.io/ -Icon=ublue-docs -Name=Documentation -Comment=Bluefin documentation -Categories=Utility; diff --git a/system_files/usr/share/applications/system-update.desktop b/system_files/usr/share/applications/system-update.desktop deleted file mode 100644 index 735d8fa..0000000 --- a/system_files/usr/share/applications/system-update.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=System Update -Comment=Update Bluefin, Flatpaks, Distrobox containers, and more -Icon=ublue-update -Categories=ConsoleOnly;System; -Terminal=true -Exec=/usr/bin/pkexec uupd --log-level debug diff --git a/system_files/usr/share/fish/vendor_conf.d/brew.fish b/system_files/usr/share/fish/vendor_conf.d/brew.fish deleted file mode 100644 index bb6d10d..0000000 --- a/system_files/usr/share/fish/vendor_conf.d/brew.fish +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/fish -#shellcheck disable=all -if status --is-interactive - if [ -d /home/linuxbrew/.linuxbrew ] - eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" - if test -d (brew --prefix)/share/fish/completions - set -p fish_complete_path (brew --prefix)/share/fish/completions - end - if test -d (brew --prefix)/share/fish/vendor_completions.d - set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d - end - end -end diff --git a/system_files/usr/share/ublue-os/topgrade-bootc.toml b/system_files/usr/share/ublue-os/topgrade-bootc.toml deleted file mode 100644 index 2f7cfcb..0000000 --- a/system_files/usr/share/ublue-os/topgrade-bootc.toml +++ /dev/null @@ -1,10 +0,0 @@ -[misc] -no_self_update = true -only = ["custom_commands", "flatpak", "distrobox", "firmware"] -disable = ["self_update", "toolbx", "containers", "helm", "system"] -ignore_failures = ["distrobox", "flatpak", "brew_cask", "brew_formula", "nix", "node", "pip3", "home_manager", "firmware"] -assume_yes = true -no_retry = false - -[commands] -"System Upgrade" = "sudo bootc upgrade" diff --git a/system_files/usr/share/ublue-os/topgrade.toml b/system_files/usr/share/ublue-os/topgrade.toml deleted file mode 100644 index 1498c0c..0000000 --- a/system_files/usr/share/ublue-os/topgrade.toml +++ /dev/null @@ -1,10 +0,0 @@ -[misc] -no_self_update = true -only = ["system", "flatpak", "distrobox", "firmware"] -disable = ["self_update", "toolbx", "containers", "helm"] -ignore_failures = ["distrobox", "flatpak", "brew_cask", "brew_formula", "nix", "node", "pip3", "home_manager", "firmware"] -assume_yes = true -no_retry = false - -[linux] -rpm_ostree = true