From 1344f287aab5a34f475da9b2f0afa9ae77ebb38d Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Sat, 23 Mar 2024 16:15:08 +0100
Subject: [PATCH] Remove unnecessary software

---
 scripts/Windows/Collections/Generic.ps1  | 14 ++++++--------
 scripts/Windows/Collections/Personal.ps1 | 24 ++++++++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/scripts/Windows/Collections/Generic.ps1 b/scripts/Windows/Collections/Generic.ps1
index 49643ffd..90d681d2 100644
--- a/scripts/Windows/Collections/Generic.ps1
+++ b/scripts/Windows/Collections/Generic.ps1
@@ -38,15 +38,10 @@ function Restore-GenericApps([Context] $context) {
     Install-Firefox $context;
     . "$PSScriptRoot/../Software/MSEdgeRedirect/Install.ps1";
 
-    winget install --accept-source-agreements --accept-package-agreements -e --id Mozilla.Firefox.DeveloperEdition;
-    winget install --accept-source-agreements --accept-package-agreements -e --id Mozilla.Firefox.Nightly;
     winget install --accept-source-agreements --accept-package-agreements -e --id Brave.Brave;
-    winget install --accept-source-agreements --accept-package-agreements -e --id Brave.Brave.Beta;
-    winget install --accept-source-agreements --accept-package-agreements -e --id Brave.Brave.Nightly;
     winget install --accept-source-agreements --accept-package-agreements -e --id kamranahmedse.pennywise;
 
     $context.RemoveTaskbarItem("*Firefox*");
-    $context.RemoveDesktopIcon("*Firefox Developer*");
     $context.RemoveDesktopIcon("*Brave*");
     $context.RemoveTaskbarItem("*Brave*");
     $context.RemoveDesktopIcon("Pennywise*");
@@ -58,7 +53,8 @@ function Restore-GenericApps([Context] $context) {
         bitwarden `
         keepass `
         procexp `
-        procmon;
+        procmon `
+        ;
 
     winget install --accept-source-agreements --accept-package-agreements -e --id KDE.KDEConnect;
 
@@ -80,13 +76,15 @@ function Restore-GenericApps([Context] $context) {
 
     choco install -y `
         gh `
-        github-desktop;
+        github-desktop `
+        ;
 
     $context.RemoveDesktopIcon("GitHub*");
 
     choco install -y `
         python `
-        visualstudio2019-workload-vctools;
+        visualstudio2019-workload-vctools `
+        ;
 
     . "$PSScriptRoot/../Software/NVS/Install.ps1";
     $context.RemoveDesktopIcon("*Microsoft Edge*");
diff --git a/scripts/Windows/Collections/Personal.ps1 b/scripts/Windows/Collections/Personal.ps1
index 1662a4f0..1a6a1566 100644
--- a/scripts/Windows/Collections/Personal.ps1
+++ b/scripts/Windows/Collections/Personal.ps1
@@ -43,13 +43,15 @@ function Restore-PersonalApps([Context] $context) {
 
     # Social Media
     choco install -y `
-        signal;
+        signal `
+        ;
 
     choco install -y `
         threema-desktop `
         discord `
         element-desktop `
-        teamspeak;
+        teamspeak `
+        ;
 
     $context.RemoveDesktopIcon("*Discord*");
     $context.RemoveDesktopIcon("*Element*");
@@ -71,7 +73,8 @@ function Restore-PersonalApps([Context] $context) {
         krita `
         MetaX `
         obs-studio `
-        openvpn;
+        openvpn `
+        ;
 
     winget install --accept-source-agreements --accept-package-agreements -e --id AntSoftware.AntRenamer;
 
@@ -92,7 +95,8 @@ function Restore-PersonalApps([Context] $context) {
 
     # Coding
     choco install -y --ignore-checksums `
-        ida-free;
+        ida-free `
+        ;
 
     $context.RemoveDesktopIcon("IDA *");
 
@@ -100,7 +104,8 @@ function Restore-PersonalApps([Context] $context) {
         HxD `
         docker-desktop `
         imhex `
-        dotpeek;
+        dotpeek `
+        ;
 
     $context.RemoveDesktopIcon("Docker*");
 
@@ -109,11 +114,13 @@ function Restore-PersonalApps([Context] $context) {
 
     choco install --ignore-checksums -y `
         ubisoft-connect `
-        ea-app;
+        ea-app `
+        ;
 
     choco install -y `
         epicgameslauncher `
-        steam;
+        steam `
+        ;
 
     $context.RemoveDesktopIcon("*Ubisoft Connect*");
     $context.RemoveDesktopIcon("*Epic Games*");
@@ -124,7 +131,8 @@ function Restore-PersonalApps([Context] $context) {
 
     # Emulation
     choco install -y `
-        ppsspp;
+        ppsspp `
+        ;
 
     $context.RemoveDesktopIcon("PPSSPP *-Bit*");
 }