From 48ebac7cb48b14e5d40986d38666922aed7738eb Mon Sep 17 00:00:00 2001
From: trevnels <25140503+trevnels@users.noreply.github.com>
Date: Tue, 16 Jan 2024 23:20:42 -0500
Subject: [PATCH] feat: add code, typst, gh

---
 Containerfile  | 12 ++++++++----
 extra-packages |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Containerfile b/Containerfile
index 73eceab..5981763 100644
--- a/Containerfile
+++ b/Containerfile
@@ -4,20 +4,24 @@ LABEL com.github.containers.toolbox="true" \
       usage="This image is meant to be used with the toolbox or distrobox command" \
       summary="My personal distrobox development environment"
 
-RUN dnf -y install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
-RUN dnf -y install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc
+RUN sh -c 'echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/vscode.repo'
 
 COPY extra-packages /
 RUN dnf -y update --skip-broken && \
     grep -v '^#' /extra-packages | xargs dnf -y install
 RUN rm /extra-packages
 
+# keep npm up to date
+RUN npm install -g npm
+
 # install Bun (npm should be present as part of extra-packages above)
 RUN npm install -g bun
 
-# install VSCode
-
 # install Typst
+RUN wget -qO- https://github.com/typst/typst/releases/download/latest/typst-x86_64-unknown-linux-musl.tar.xz | tar -xJ -C /tmp/ && \
+    /tmp/typst-x86_64-unknown-linux-musl/typst /usr/local/bin/ && \
+    rm -rf /tmp/typst-x86_64-unknown-linux-musl
 
 
 RUN   ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
diff --git a/extra-packages b/extra-packages
index d77f377..a1eb248 100644
--- a/extra-packages
+++ b/extra-packages
@@ -1,7 +1,9 @@
+code
 dbus-x11
 eza
 ffmpeg
 fzf
+gh
 helix
 just
 make