From 1d91f2b13098a467639f7c2ebff7732fa65775f0 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Mon, 3 Aug 2026 11:54:36 -0500
Subject: [PATCH] Update dotenv

---
 dotenv.sh | 73 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/dotenv.sh b/dotenv.sh
index 7eebae8..d8f39ad 100755
--- a/dotenv.sh
+++ b/dotenv.sh
@@ -25,10 +25,12 @@ sudo dnf install -y \
 
 # Add Flathub repo, and set as default (needs permission elevation)
 echo -e "\n\n\nSetting up FlatPak Repositories\n\n\n"
-sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-sudo flatpak remote-modify --set-default flathub
+for r in $(flatpak remotes --columns=name 2>/dev/null); do
+  [ "$r" = "flathub" ] && continue
+  sudo flatpak remote-delete "$r"
+done
 
-# Remove fedora flathub repo
+sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 
 # Remove unwanted packages
 
@@ -38,7 +40,6 @@ flatpak install \
   flathub \
   org.audacityteam.Audacity \
   org.azahar_emu.Azahar \
-  com.bambulab.BambuStudio \
   com.bitwarden.desktop \
   org.blender.Blender \
   com.usebottles.bottles \
@@ -47,7 +48,6 @@ flatpak install \
   io.dbeaver.DBeaverCommunity \
   com.discordapp.Discord \
   org.DolphinEmu.dolphin-emu \
-  org.kartkrew.RingRacers \
   org.filezillaproject.Filezilla \
   org.mozilla.firefox \
   com.github.tchx84.Flatseal \
@@ -73,27 +73,20 @@ flatpak install \
   net.openra.OpenRA \
   app.organicmaps.desktop \
   tv.plex.PlexHTPC \
-  com.pokemmo.PokeMMO \
-  net.pokerth.PokerTH \
   org.prismlauncher.PrismLauncher \
   org.qbittorrent.qBittorrent \
   org.libretro.RetroArch \
   net.rpcs3.RPCS3 \
-  net.shadps4.shadPS4 \
-  com.slack.Slack \
   com.github.k4zmu2a.spacecadetpinball \
   com.valvesoftware.Steam \
-  com.github.taiko2k.tauonmb \
   org.mozilla.Thunderbird \
   org.mapeditor.Tiled \
   com.unity.UnityHub \
   rocks.shy.VacuumTube \
   org.videolan.VLC \
   dev.goats.xivlauncher \
-  alpaca com.jeffser.Alpaca \
+  net.windower.Lumoria \
   org.kde.khangman \
-  net.ankiweb.Anki \
-  org.freecad.FreeCAD \
   org.gnome.Crosswords \
   dev.bsnes.bsnes \
   org.easyrpg.player \
@@ -116,18 +109,52 @@ flatpak install \
   org.freac.freac \
   net.blockbench.Blockbench \
   com.github.libresprite.LibreSprite \
-  com.voxdsp.TuxFishing \
   org.openmw.OpenMW \
   net.sourceforge.quakespasm.Quakespasm \
   com.orama_interactive.Pixelorama \
   net.zdechov.app.x2048 \
+  org.kde.elisa \
+  com.orcaslicer.OrcaSlicer \
+  com.github.PintaProject.Pinta \
+  tv.kodi.Kodi \
+  com.makemkv.MakeMKV \
+  com.poweriso.PowerISO \
+  com.plexamp.Plexamp \
+  org.kde.skanpage \
+  net.mkiol.Jupii \
+  space.x1z53.iris \
   --assumeyes
 
+# Remove fedora packages
+sudo dnf remove -y \
+  firefox \
+  firefox-langpacks \
+  akregator \
+  dragon \
+  libreoffice* \
+  kmines \
+  kmahjongg \
+  kmail \
+  kpat \
+  kolourpaint \
+  skanpage \
+  neochat \
+  krdc \
+  krfb \
+  elisa-player \
+  korganizer \
+  kontact \
+  kaddressbook \
+  kcalc \
+  qrca
+
+sudo dnf autoremove -y
+
 # VS Code
 sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc
 sudo 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'
 dnf check-update
-sudo dnf install code
+sudo dnf install code -y
 
 # Docker
 sudo dnf config-manager addrepo --from-repofile https://download.docker.com/linux/fedora/docker-ce.repo 
@@ -146,20 +173,6 @@ then
   rm ~/Downloads/pia.run
 fi
 
-# Ollama
-curl -fsSL https://ollama.com/install.sh | sh
-
-echo -e "\n\n\nOllama Model Installation\n\n\n"
-echo "Do you want to install the Ollama models now? (y/n)"
-read -r INSTALL_OLLAMA_MODELS
-if [ "$INSTALL_OLLAMA_MODELS" = "y" ] || [ "$INSTALL_OLLAMA_MODELS" = "Y" ]; then
-  ollama pull gemma3n:latest
-  ollama pull llama3.2-vision:latest
-  ollama pull llama3.1:8b
-  ollama pull ministral-3:latest
-  ollama pull llama3.2:3b
-fi
-
 # AppImages
 wget -O "$HOME/Downloads/balenaEtcher.AppImage" "https://github.com/balena-io/etcher/releases/download/v1.7.9/balenaEtcher-1.7.9-ia32.AppImage"
 flatpak run it.mijorus.gearlever --integrate "$HOME/Downloads/balenaEtcher.AppImage" --replace --yes
@@ -221,4 +234,4 @@ read -r DONE_ORGANIC_MAPS
 
 echo "Setup Steam now, press enter when done"
 flatpak run com.valvesoftware.Steam
-read -r DONE_STEAM
\ No newline at end of file
+read -r DONE_STEAM