From 6fea022bf00864d1ea7e7ea23865de25633d50a9 Mon Sep 17 00:00:00 2001
From: Triston Armstrong <tarmstrong95@proton.me>
Date: Sun, 10 Nov 2024 12:29:14 -0500
Subject: [PATCH] add condition on post & less & apps

---
 apps.sh       |  5 +++++
 cli.sh        |  1 +
 post_setup.sh | 12 +++++++++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/apps.sh b/apps.sh
index 0377653..8c1fc14 100755
--- a/apps.sh
+++ b/apps.sh
@@ -25,6 +25,11 @@ run_apps_install(){
 		"org.blender.Blender"
 		"org.godotengine.Godot"
 		"de.haeckerfelix.Shortwave"
+		"org.gnome.Solanum"
+		"com.valvesoftware.Steam"
+		"com.mattjakeman.ExtensionManager"
+		"org.gnome.design.Emblem"
+		"de.philippun1.turtle"
 	)
 
 	for i in "${flatpak_apps[@]}"; do
diff --git a/cli.sh b/cli.sh
index b5dec22..587fe9c 100755
--- a/cli.sh
+++ b/cli.sh
@@ -26,6 +26,7 @@ run_cli_install(){
 		"mingw-w64-x86_64-clang" # <-- expect failure
 		"flatpak"
 		"fish" # <-- shell
+		"less"
 	)
 
 	for i in "${cli_tools[@]}"; do
diff --git a/post_setup.sh b/post_setup.sh
index 24f2a40..74e1d19 100755
--- a/post_setup.sh
+++ b/post_setup.sh
@@ -2,6 +2,12 @@
 
 xdg-settings set default-web-browser io.github.zen_browser.zen.desktop
 
-sudo chsh -s /bin/fish
-sudo usermod -s /bin/fish $USER
-fish
+if [[ $(which $SHELL) != "/bin/fish" ]]; then
+  sudo chsh -s /bin/fish
+  sudo usermod -s /bin/fish $USER
+  fish
+  echo "Set fish shell, may need to login again..."  
+else
+  echo "Fish shell already in use... skipping"  
+fi
+