From a986d9b17e0f62ce73d207db1c9c3c7f7924c711 Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Sun, 28 Sep 2025 03:15:43 -0400
Subject: [PATCH] Reduce removals list to only things that cannot be unchecked
 during installation

---
 README.md       | 30 +++++++++++++++++++++++++++++-
 applications.go |  7 -------
 removals.go     | 16 +++-------------
 system.go       |  2 +-
 4 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 16b1d58..acd02c9 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,35 @@
 This is a simple utility meant to address what I personally dislike about the base CachyOS installation.
 
 ## Usage
-Begin by installing CachyOS via the standard GUI installer. You may desire to uncheck the installation of `cachyos-zsh-config` and `firefox`. Please use systemd-boot.
+Begin by installing CachyOS via the standard GUI installer.
+
+If you intend on using all options provided by this utility, it is best to use systemd-boot, ext4, and to **_un_**check the following during installation:
+- CachyOS Packages
+    - cachyos-micro-settings
+    - cachyos-wallpapers
+- CachyOS shell configuration
+- Base-devel + Common packages
+    - X-system
+    - Network
+        - modemmanager
+    - firewall
+    - packages management
+        - paru
+        - octopi
+    - audio
+        - pavucontrol
+    - Some applications selection
+        - alacritty
+        - btop
+        - nano-syntax-highlighting
+        - vi
+        - ripgrep
+        - micro
+        - nano
+        - vim
+- CPU specific Microcode update packages
+    - whichever one you don't need
+- Firefox and language package
 
 As soon as the system is installed and booted, run this utility as root and follow the prompts! That's it.
 
diff --git a/applications.go b/applications.go
index d1590de..4d84163 100644
--- a/applications.go
+++ b/applications.go
@@ -26,7 +26,6 @@ func applications() {
 			fallthrough
 		case 4:
 			managePackage("-S", "yay-bin")
-			managePackage("-Rcns", "paru")
 
 			if !doAll {
 				break
@@ -34,7 +33,6 @@ func applications() {
 			fallthrough
 		case 5:
 			managePackage("-S", "htop")
-			managePackage("-Rcns", "btop")
 
 			if !doAll {
 				break
@@ -42,11 +40,6 @@ func applications() {
 			fallthrough
 		case 6:
 			managePackage("-S", "neovim")
-			cmd := exec.Command("pacman", "-Rcns", "vi", "vim", "nano", "micro", "--noconfirm")
-			err := cmd.Run()
-			if err != nil {
-				other.PrintError("Failed to perform application removals for neovim installation", 1)
-			}
 
 			if !doAll {
 				break
diff --git a/removals.go b/removals.go
index d83af5d..364faea 100644
--- a/removals.go
+++ b/removals.go
@@ -10,32 +10,22 @@ import (
 func removals() {
 	for {
 		var doAll bool
-		choice := front.InputMenuGen("Application to remove:", []string{"back", "all", "alacritty", "pavucontrol", "bash", "linux-cachyos-lts", "ufw", "modemmanager"})
+		choice := front.InputMenuGen("Application to remove:", []string{"back", "all", "bash", "linux-cachyos-lts"})
 		var target string
 		switch choice {
 		case 1:
 			return
 		case 2:
-			cmd := exec.Command("pacman", "-Rcns", "back", "alacritty", "pavucontrol", "bash", "linux-cachyos-lts", "ufw", "modemmanager", "--noconfirm")
+			cmd := exec.Command("pacman", "-Rcns", "bash", "linux-cachyos-lts", "--noconfirm")
 			err := cmd.Run()
 			if err != nil {
 				other.PrintError("Failed to perform application removals", 1)
 			}
 			doAll = true
 		case 3:
-			target = "alacritty"
-		case 4:
-			target = "pavucontrol"
-		case 5:
 			target = "bash"
-		case 6:
+		case 4:
 			target = "linux-cachyos-lts"
-		case 7:
-			target = "ufw"
-			manageService("stop", "ufw.service")
-			manageService("disable", "ufw.service")
-		case 8:
-			target = "modemmanager"
 		}
 		if !doAll {
 			managePackage("-Rcns", target)
diff --git a/system.go b/system.go
index 82cd258..bd1428d 100644
--- a/system.go
+++ b/system.go
@@ -79,7 +79,7 @@ depends=(
 			}
 			managePackage("-U", "/tmp/custom-base-devel/base-devel-1-2-any.pkg.tar.xz")
 			managePackage("-S", "opendoas")
-			cmd = exec.Command("pacman", "-R", "sudo", "qt-sudo", "octopi")
+			cmd = exec.Command("pacman", "-R", "sudo", "qt-sudo", "octopi", "--noconfirm")
 			err = cmd.Run()
 			if err != nil {
 				other.PrintError("Failed to remove sudo", 1)