From 942ee59bdf2f72e10ac823d704821e7b92e64c39 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Fri, 23 Aug 2024 20:55:52 -0400
Subject: [PATCH] Install r2modman via url

---
 recipes/common/gaming.yml      | 7 +++++--
 recipes/common/helix.yml       | 5 +++++
 recipes/common/jp-packages.yml | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/recipes/common/gaming.yml b/recipes/common/gaming.yml
index f143eca..69bb387 100644
--- a/recipes/common/gaming.yml
+++ b/recipes/common/gaming.yml
@@ -3,8 +3,11 @@ modules:
     files:
       - source: steam-firewall
         destination: /
-  - type: r2modman
-    version: 3.1.49
+  - type: rpm-ostree
+    install:
+      - https://github.com/ebkr/r2modmanPlus/releases/download/v3.1.49/r2modman-3.1.49.x86_64.rpm
+  # - type: r2modman
+  #   version: 3.1.49
   # - type: script
   #   scripts:
   #     - install-gamescope-plus.sh
diff --git a/recipes/common/helix.yml b/recipes/common/helix.yml
index bb80247..84be093 100644
--- a/recipes/common/helix.yml
+++ b/recipes/common/helix.yml
@@ -2,6 +2,11 @@ stages:
   - name: helix
     from: rust
     modules:
+      - type: containerfile
+        snippets:
+          - ENV CLICOLOR_FORCE=1
+          - ENV FORCE_COLOR=1
+          - ENV RUST_LOG_STYLE=always
       - type: script
         no-cache: true
         scripts:
diff --git a/recipes/common/jp-packages.yml b/recipes/common/jp-packages.yml
index 0e719bb..9e146a4 100644
--- a/recipes/common/jp-packages.yml
+++ b/recipes/common/jp-packages.yml
@@ -7,6 +7,7 @@ modules:
   - type: rpm-ostree
     optfix:
       - brave-browser
+      - r2modman
     repos:
       - https://pkgs.tailscale.com/stable/fedora/tailscale.repo
       - https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo