diff --git a/Containerfile b/Containerfile index faeea5692df..aec649b879b 100644 --- a/Containerfile +++ b/Containerfile @@ -80,6 +80,7 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-$(rp fc-cache -f /usr/share/fonts/inter && \ find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just && \ rm -f /etc/yum.repos.d/tailscale.repo && \ + rm -f /etc/yum.repos.d/charm.repo && \ rm -f /etc/yum.repos.d/_copr_ublue-os-bling.repo && \ rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ rm -f /usr/share/applications/fish.desktop && \ @@ -145,12 +146,6 @@ RUN wget https://raw.githubusercontent.com/ahmetb/kubectx/master/kubectx -O /usr wget https://raw.githubusercontent.com/ahmetb/kubectx/master/kubens -O /usr/bin/kubens && \ chmod +x /usr/bin/kubectx /usr/bin/kubens -# Install Charm gum -RUN rpm-ostree install $(curl https://api.github.com/repos/charmbracelet/gum/releases/latest | jq -r '.assets[] | select(.name| test(".*.x86_64.rpm$")).browser_download_url') - -# Install Charm glow -RUN rpm-ostree install $(curl https://api.github.com/repos/charmbracelet/glow/releases/latest | jq -r '.assets[] | select(.name| test(".*.x86_64.rpm$")).browser_download_url') - # Set up services RUN systemctl enable podman.socket && \ systemctl disable pmie.service && \ diff --git a/etc/yum.repos.d/charm.repo b/etc/yum.repos.d/charm.repo new file mode 100644 index 00000000000..941ac54bfdc --- /dev/null +++ b/etc/yum.repos.d/charm.repo @@ -0,0 +1,6 @@ +[charm] +name=Charm +baseurl=https://repo.charm.sh/yum/ +enabled=1 +gpgcheck=1 +gpgkey=https://repo.charm.sh/yum/gpg.key diff --git a/just/custom.just b/just/custom.just index 26d3b212ec8..18a090fca4e 100644 --- a/just/custom.just +++ b/just/custom.just @@ -28,6 +28,11 @@ brew: echo "Installing homebrew ..." /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" +# Remove Homebrew +brew-remove: + echo "Removing homebrew ..." + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)" + # Add Homebrew to shell rc files brew-shell: #!/usr/bin/env bash diff --git a/packages.json b/packages.json index cdcd826cd0c..3bfc0c3d608 100644 --- a/packages.json +++ b/packages.json @@ -9,6 +9,8 @@ "ddccontrol", "evtest", "fish", + "glow", + "gum", "input-remapper", "libgda-sqlite", "libgda",