From 46e8c05a11b2b7e3031fc619dc1148136c7d304a Mon Sep 17 00:00:00 2001
From: bobslept <38557801+bobslept@users.noreply.github.com>
Date: Fri, 17 Nov 2023 14:45:46 +0100
Subject: [PATCH 1/3] chore: move to charm.sh repo (#664)

---
 Containerfile              | 7 +------
 etc/yum.repos.d/charm.repo | 6 ++++++
 packages.json              | 2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 etc/yum.repos.d/charm.repo

diff --git a/Containerfile b/Containerfile
index 19bbc39659b..ec2ec0afc88 100644
--- a/Containerfile
+++ b/Containerfile
@@ -81,6 +81,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 && \
@@ -146,12 +147,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/packages.json b/packages.json
index be58d4cb083..e8a90773bfc 100644
--- a/packages.json
+++ b/packages.json
@@ -9,6 +9,8 @@
 				"ddccontrol",
 				"evtest",
 				"fish",
+				"glow",
+				"gum",
 				"gnome-shell-extension-appindicator",
 				"gnome-shell-extension-blur-my-shell",
 				"gnome-shell-extension-dash-to-dock",

From 1e0a42d6a7f3ba0c15dac7b6fb99db5c566ff3ec Mon Sep 17 00:00:00 2001
From: bobslept <38557801+bobslept@users.noreply.github.com>
Date: Fri, 17 Nov 2023 17:24:01 +0100
Subject: [PATCH 2/3] feat(just): enable/disable gnome-vrr (#665)

---
 just/custom.just | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/just/custom.just b/just/custom.just
index c4a34318c9d..0e67d7ad0a1 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -129,6 +129,29 @@ gnome-extensions:
   gext install pano@elhan.io
   gext install weatheroclock@CleoMenezesJr.github.io
 
+# Enable or Disable Gnome-VRR
+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"
+
 # Install JetBrains Toolbox | https://www.jetbrains.com/toolbox-app/
 jetbrains-toolbox:
   #!/usr/bin/env bash

From b05836a61dd23b6428e41cebf027646c152338ce Mon Sep 17 00:00:00 2001
From: rohanssrao <rohanssrao@gmail.com>
Date: Sat, 18 Nov 2023 23:10:13 -0500
Subject: [PATCH 3/3] Add 'brew-remove' just recipe (#669)

---
 just/custom.just | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/just/custom.just b/just/custom.just
index 0e67d7ad0a1..d111d8726cb 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