From 0c877a798cfb312dcf8102708f22714cec904083 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Tue, 22 Oct 2024 01:18:31 +0200
Subject: [PATCH] Remove the `common` category

---
 lib/modules/software.nix                    |  6 -----
 profiles/machines/manuel/Generic/config.nix |  1 -
 scripts/Arch/Scripts/deploy.fish            | 16 +++++--------
 scripts/Windows/Scripts/Deployment.ps1      | 26 ++++++---------------
 4 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/lib/modules/software.nix b/lib/modules/software.nix
index 6553daf7..7923de7a 100644
--- a/lib/modules/software.nix
+++ b/lib/modules/software.nix
@@ -27,12 +27,6 @@
                     default = false;
                   };
 
-                  common = mkOption {
-                    type = types.bool;
-                    description = "A value indicating whether common software should be installed.";
-                    default = false;
-                  };
-
                   server = mkOption {
                     type = types.bool;
                     description = "A value indicating whether server applications should be installed.";
diff --git a/profiles/machines/manuel/Generic/config.nix b/profiles/machines/manuel/Generic/config.nix
index f48ed88a..fdc25c94 100644
--- a/profiles/machines/manuel/Generic/config.nix
+++ b/profiles/machines/manuel/Generic/config.nix
@@ -47,7 +47,6 @@ in {
 
       software = {
         essential = true;
-        common = true;
         desktopExperience = true;
         productivity = true;
         socialMedia = true;
diff --git a/scripts/Arch/Scripts/deploy.fish b/scripts/Arch/Scripts/deploy.fish
index c4e3ecdc..26fb64d9 100644
--- a/scripts/Arch/Scripts/deploy.fish
+++ b/scripts/Arch/Scripts/deploy.fish
@@ -178,16 +178,12 @@ function deploySoftware -d "Deploys a the specified software action" -a action
                 networkmanager-openvpn \
                 networkmanager-openconnect \
                 proton-vpn-gtk-app \
-                protonvpn-cli-community
-
-            and if collectionActive common
-                yayinst \
-                    img2pdf \
-                    numbat-bin \
-                    nvtop \
-                    pdf2svg \
-                    tnef
-            end
+                protonvpn-cli-community \
+                img2pdf \
+                numbat-bin \
+                nvtop \
+                pdf2svg \
+                tnef
         end
 
         and if collectionActive media
diff --git a/scripts/Windows/Scripts/Deployment.ps1 b/scripts/Windows/Scripts/Deployment.ps1
index 79a82112..5c3f0975 100644
--- a/scripts/Windows/Scripts/Deployment.ps1
+++ b/scripts/Windows/Scripts/Deployment.ps1
@@ -129,25 +129,6 @@ function Deploy-SoftwareAction {
         & "$softwarePath/thunderbird/Main.ps1" @arguments;
         & "$softwarePath/putty/Main.ps1" @arguments;
 
-        if ($collections.common) {
-            if ($install) {
-                Install-ChocoPackage `
-                    7zip `
-                    chocolateygui `
-                    DefaultProgramsEditor `
-                    keepass `
-                    ;
-
-                Install-ChocoPackage bitwarden -ArgumentList '--install-arguments="/ALLUSERS=1"';
-
-                Install-WingetPackage `
-                    SomePythonThings.WingetUIStore `
-                    ;
-
-                Remove-DesktopIcon "UniGetUI*";
-            }
-        }
-
         # Internet Access
         if ($install) {
             if (Test-Program "brave") {
@@ -175,8 +156,10 @@ function Deploy-SoftwareAction {
                 # Tools
                 Install-SetupPackage -Source "https://github.com/mRemoteNG/mRemoteNG/releases/download/2023.03.03-v1.77.3-nb/mRemoteNG-Installer-1.77.3.nb-1784.msi" -ArgumentList "/Quiet";
                 Remove-DesktopIcon "mRemoteNG*";
+                Install-ChocoPackage bitwarden -ArgumentList '--install-arguments="/ALLUSERS=1"';
 
                 Install-ChocoPackage `
+                    7zip `
                     gimp `
                     gpu-z `
                     windirstat `
@@ -189,6 +172,9 @@ function Deploy-SoftwareAction {
                     krita `
                     MetaX `
                     obs-studio `
+                    chocolateygui `
+                    DefaultProgramsEditor `
+                    keepass `
                     ;
 
                 Remove-DesktopIcon "GIMP*";
@@ -204,9 +190,11 @@ function Deploy-SoftwareAction {
                 Install-WingetPackage `
                     AntSoftware.AntRenamer `
                     AppWork.JDownloader `
+                    SomePythonThings.WingetUIStore `
                     ;
 
                 Remove-DesktopIcon "JDownloader*";
+                Remove-DesktopIcon "UniGetUI*";
             }
         }