From c4d7875a8bc7ee45f5ecb4fa825a3ab8c288d961 Mon Sep 17 00:00:00 2001
From: TheFlyingFool <nick.kyky@gmail.com>
Date: Sun, 9 Jun 2024 16:58:49 -0500
Subject: [PATCH] Few items added to install lists Reordered main to be more
 readable

---
 setup.ps1 | 60 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/setup.ps1 b/setup.ps1
index 95c640e..25101ce 100644
--- a/setup.ps1
+++ b/setup.ps1
@@ -97,36 +97,41 @@ do {
 
 
     switch ( $answer ) {
-        "1" { $apps = @(  # BASE APPS
-                @{name = 'Microsoft.PowerShell' },
-                @{name = 'Microsoft.VisualStudioCode' },
-                @{name = 'Microsoft.WindowsTerminal'},
-                @{name = 'Microsoft.PowerToys' },
-                @{name = 'Git.Git' },
-                @{name =' ApacheFriends.Xampp.8.2'},
-                @{name = 'Google.Chrome' },
-                @{name = 'TorProject.TorBrowser'},
-                @{name = 'Google.GoogleDrive' },
-                @{name = 'Hugo.Hugo.Extended' },
-                @{name = 'Bitwarden.Bitwarden' },
-                @{name = 'Sinew.Enpass'}, # Temp until everything moved to bitwarden
-                @{name = 'Plex.Plex' },
-                @{name = 'Microsoft.MouseWithoutBorders'},
-                @{name = 'Vivaldi.Vivaldi' },
-                @{name = 'VideoLAN.VLC' },
-                @{name = 'PointPlanck.FileBot' },
-                @{name = 'Oracle.VirtualBox' },
-                @{name = 'NordSecurity.NordVPN' },
-                @{name ='OpenMedia.4KVideoDownloaderPlus'},
+        "1" {
+            $apps = @(  # BASE APPS
                 @{name = '7zip.7zip'},
                 @{name = '9wzdncrf0083'}, #Facebook messenger
-                @{name = 'Microsoft.Office' },
-                @{name = 'Malwarebytes.Malwarebytes '},
+                @{name = 'ApacheFriends.Xampp.8.2'},
+                @{name = 'Bitwarden.Bitwarden'},
+                @{name = 'Git.Git'},
+                @{name = 'Google.Chrome'},
                 #@{name = 'Google.AndroidStudio'}. ## Not currently doing any android dev
+                @{name = 'Google.GoogleDrive'},
+                @{name = 'GuinpinSoft.MakeMKV'},
+                @{name = 'Hugo.Hugo.Extended'},
+                @{name = 'Malwarebytes.Malwarebytes '},
+                @{name = 'Microsoft.MouseWithoutBorders'},
+                @{name = 'Microsoft.Office'},
+                @{name = 'Microsoft.PowerShell'},
+                @{name = 'Microsoft.PowerToys'},
+                @{name = 'Microsoft.VisualStudioCode'},
+                @{name = 'Microsoft.WindowsTerminal'},
+                @{name = 'MoritzBunkus.MKVToolNix'},
                 #@{name = 'Node.js'}, ## Was Testing Something
+                @{name = 'NordSecurity.NordVPN'},
+                @{name = 'OpenMedia.4KVideoDownloaderPlus'},
+                @{name = 'Oracle.VirtualBox'},
+                @{name = 'Plex.Plex'},
+                @{name = 'PointPlanck.FileBot'},
+                @{name = 'qBittorrent.qBittorrent'},
+                @{name = 'Sinew.Enpass'}, # Temp until everything moved to bitwarden
+                @{name = 'SQLite.SQLite '},
                 @{name = 'sqlitestudio.pl.SQLiteStudio'},
-                @{name = 'SQLite.SQLite '}
-            )
+                @{name = 'TorProject.TorBrowser'},
+                @{name = 'VideoLAN.VLC'},
+                @{name = 'Vivaldi.Vivaldi'}
+        )
+
 
         InstallTheApps $Apps
         Update-Profile
@@ -147,7 +152,9 @@ do {
                 @{name = 'Valve.Steam' },
                 @{name = 'EpicGames.EpicGamesLauncher' },
                 @{name = 'GOG.Galaxy '},
+                #@{name = 'EQAditu.AdvancedCombatTracker'},
                 @{name = 'Discord.Discord '}
+                
             )
             InstallTheApps $Apps
         }        
@@ -156,7 +163,8 @@ do {
                 @{name = 'SteelSeries.SteelSeriesEngine' }, 
                 @{name = 'Corsair.iCUE.5' },
                 @{name = 'Asus.ArmouryCrate '},
-                @{name = 'Nvidia.GeForceExperience '}
+                @{name = 'Nvidia.GeForceExperience '},
+                @{name = 'Samsung.SamsungMagician'}
             )
            InstallTheApps $Apps
         }