From 5b7775f33e999514651935ad9dc5083c89119168 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Sat, 18 Jan 2025 14:34:16 +0100
Subject: [PATCH 01/22] refactor: seperate files, function and structs into
 seperate packages

---
 .goreleaser.yaml                              |   3 +
 cmd.go => cmd/cmd.go                          |  13 +-
 install_cmd.go => cmd/install_cmd.go          |  23 ++-
 .../package_commands.go                       |   2 +-
 remove_cmd.go => cmd/remove_cmd.go            |  23 ++-
 search_cmd.go => cmd/search_cmd.go            |  20 +--
 main.go => cmd/sst/main.go                    |   3 +-
 config.toml                                   |  99 ++++++++++-
 config.go => config/config.go                 |  11 +-
 dotfiles.go                                   |  42 -----
 dotfiles/dotfiles.go                          |  43 +++++
 go.mod                                        |   7 +-
 go.sum                                        |   2 -
 internal/shell/shell.go                       |  23 +++
 magefile.go                                   |   1 -
 model.go                                      | 164 ------------------
 cargo.go => packagemanager/cargo.go           |  16 +-
 cargo_test.go => packagemanager/cargo_test.go |  11 +-
 flatpak.go => packagemanager/flatpak.go       |  30 +++-
 .../flatpak_test.go                           |   8 +-
 golang.go => packagemanager/golang.go         |  16 +-
 .../golang_test.go                            |  12 +-
 homebrew.go => packagemanager/homebrew.go     |  15 +-
 .../homebrew_test.go                          |  12 +-
 osinfo.go => packagemanager/os.go             |  52 +++---
 osinfo_test.go => packagemanager/os_test.go   |  23 +--
 package.go => packagemanager/package.go       |  19 +-
 .../packagemanager.go                         |   2 +-
 pipx.go => packagemanager/pipx.go             |  16 +-
 pipx_test.go => packagemanager/pipx_test.go   |  12 +-
 packagemanager/utils.go                       |  19 ++
 tui.go                                        | 146 ----------------
 tui/tui.go                                    | 115 ++++++++++++
 utils.go                                      |  64 -------
 utils/utils.go                                |  32 ++++
 utils/utils_test.go                           |  40 +++++
 utils_test.go                                 |  85 ---------
 37 files changed, 547 insertions(+), 677 deletions(-)
 rename cmd.go => cmd/cmd.go (87%)
 rename install_cmd.go => cmd/install_cmd.go (65%)
 rename package_commands.go => cmd/package_commands.go (99%)
 rename remove_cmd.go => cmd/remove_cmd.go (63%)
 rename search_cmd.go => cmd/search_cmd.go (77%)
 rename main.go => cmd/sst/main.go (55%)
 rename config.go => config/config.go (59%)
 delete mode 100644 dotfiles.go
 create mode 100644 dotfiles/dotfiles.go
 create mode 100644 internal/shell/shell.go
 delete mode 100644 model.go
 rename cargo.go => packagemanager/cargo.go (60%)
 rename cargo_test.go => packagemanager/cargo_test.go (72%)
 rename flatpak.go => packagemanager/flatpak.go (71%)
 rename flatpak_test.go => packagemanager/flatpak_test.go (83%)
 rename golang.go => packagemanager/golang.go (60%)
 rename golang_test.go => packagemanager/golang_test.go (72%)
 rename homebrew.go => packagemanager/homebrew.go (68%)
 rename homebrew_test.go => packagemanager/homebrew_test.go (73%)
 rename osinfo.go => packagemanager/os.go (81%)
 rename osinfo_test.go => packagemanager/os_test.go (63%)
 rename package.go => packagemanager/package.go (62%)
 rename packagemanager.go => packagemanager/packagemanager.go (90%)
 rename pipx.go => packagemanager/pipx.go (60%)
 rename pipx_test.go => packagemanager/pipx_test.go (71%)
 create mode 100644 packagemanager/utils.go
 delete mode 100644 tui.go
 create mode 100644 tui/tui.go
 delete mode 100644 utils.go
 create mode 100644 utils/utils.go
 create mode 100644 utils/utils_test.go
 delete mode 100644 utils_test.go

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 3a2d8da..2f22d5a 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -3,6 +3,9 @@
 
 version: 2
 
+env:
+  - GITHUB_TOKEN={{ .Env.CODEBERG_TOKEN }}
+
 before:
   hooks:
     - go mod tidy
diff --git a/cmd.go b/cmd/cmd.go
similarity index 87%
rename from cmd.go
rename to cmd/cmd.go
index 598ccdb..102668c 100644
--- a/cmd.go
+++ b/cmd/cmd.go
@@ -1,23 +1,24 @@
-package main
+package cmd
 
 import (
 	"fmt"
 	"os"
+	"system_setup_tool/tui"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
-var rootCmd = &cobra.Command{
+var RootCmd = &cobra.Command{
 	Use:   "system_setup_tool",
 	Short: "Installs packages based on TOML configuration",
-	Run:   run,
+	Run:   tui.Run,
 }
 
 func init() {
 	cobra.OnInitialize(initConfig)
-	rootCmd.PersistentFlags().StringP("config", "c", "", "Path to the configuration file")
-	viper.BindPFlag("config", rootCmd.PersistentFlags().Lookup("config"))
+	RootCmd.PersistentFlags().StringP("config", "c", "", "Path to the configuration file")
+	viper.BindPFlag("config", RootCmd.PersistentFlags().Lookup("config"))
 
 	addCmd.Flags().StringP("name", "n", "", "The name of the package you want to add")
 	addCmd.Flags().StringP("manager", "m", "", "The package manager you want to add the package to (homebrew|cargo|flatpak|pipx|go)")
@@ -38,7 +39,7 @@ func init() {
 	searchCmd.Flags().StringP("manager", "m", "", "The package manager you want to search a package with. (Options: os|homebrew|flatpak)")
 
 	packageCmd.AddCommand(addCmd, deleteCmd, showCmd, enableCmd)
-	rootCmd.AddCommand(packageCmd, searchCmd, installCmd, removeCmd)
+	RootCmd.AddCommand(packageCmd, searchCmd, installCmd, removeCmd)
 }
 
 func initConfig() {
diff --git a/install_cmd.go b/cmd/install_cmd.go
similarity index 65%
rename from install_cmd.go
rename to cmd/install_cmd.go
index 468ab9f..ed36c43 100644
--- a/install_cmd.go
+++ b/cmd/install_cmd.go
@@ -1,8 +1,11 @@
-package main
+package cmd
 
 import (
 	"fmt"
 	"log"
+	"system_setup_tool/utils"
+
+	pm "system_setup_tool/packagemanager"
 
 	"github.com/spf13/cobra"
 )
@@ -14,29 +17,25 @@ var installCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		packageName := args[0]
 		managerName, _ := cmd.Flags().GetString("manager")
-		var manager PackageManager
+		var manager pm.PackageManager
 		switch managerName {
 		case "os":
-			opSys, err := getLinuxDistribution()
-			if err != nil {
-				log.Printf("error getting OS information: %v", err)
-			}
-			sudoPassword, err := getSudoPassword()
+			sudoPassword, err := utils.GetSudoPassword()
 			if err != nil {
 				log.Fatal(err)
 			}
-			osManager := NewOSManager(opSys, sudoPassword, []string{packageName})
+			osManager := pm.NewOSManager(sudoPassword)
 			if err := osManager.Install([]string{packageName}); err != nil {
 				log.Printf("error: %v\n", err)
 			}
 		case "homebrew":
-			manager = &HomebrewManager{}
+			manager = &pm.HomebrewManager{}
 		case "cargo":
-			manager = &CargoManager{}
+			manager = &pm.CargoManager{}
 		case "pipx":
-			manager = &PipxManager{}
+			manager = &pm.PipxManager{}
 		case "flatpak":
-			manager = &FlatpakManager{}
+			manager = &pm.FlatpakManager{}
 		default:
 			fmt.Println("No PackageManager found")
 		}
diff --git a/package_commands.go b/cmd/package_commands.go
similarity index 99%
rename from package_commands.go
rename to cmd/package_commands.go
index a73126d..d3b50f5 100644
--- a/package_commands.go
+++ b/cmd/package_commands.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
diff --git a/remove_cmd.go b/cmd/remove_cmd.go
similarity index 63%
rename from remove_cmd.go
rename to cmd/remove_cmd.go
index 6609578..7e36cc6 100644
--- a/remove_cmd.go
+++ b/cmd/remove_cmd.go
@@ -1,7 +1,10 @@
-package main
+package cmd
 
 import (
 	"log"
+	"system_setup_tool/utils"
+
+	pm "system_setup_tool/packagemanager"
 
 	"github.com/spf13/cobra"
 )
@@ -13,29 +16,25 @@ var removeCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		packageName := args[0]
 		managerName, _ := cmd.Flags().GetString("manager")
-		var manager PackageManager
+		var manager pm.PackageManager
 		switch managerName {
 		case "os":
-			opSys, err := getLinuxDistribution()
-			if err != nil {
-				log.Printf("error getting OS information: %v", err)
-			}
-			sudoPassword, err := getSudoPassword()
+			sudoPassword, err := utils.GetSudoPassword()
 			if err != nil {
 				log.Fatal(err)
 			}
-			osManager := NewOSManager(opSys, sudoPassword, []string{packageName})
+			osManager := pm.NewOSManager(sudoPassword)
 			if err := osManager.Install([]string{packageName}); err != nil {
 				log.Printf("error: %v\n", err)
 			}
 		case "homebrew":
-			manager = &HomebrewManager{}
+			manager = &pm.HomebrewManager{}
 		case "cargo":
-			manager = &CargoManager{}
+			manager = &pm.CargoManager{}
 		case "pipx":
-			manager = &PipxManager{}
+			manager = &pm.PipxManager{}
 		case "flatpak":
-			manager = &FlatpakManager{}
+			manager = &pm.FlatpakManager{}
 		default:
 		}
 		if err := manager.RemovePackage(packageName); err != nil {
diff --git a/search_cmd.go b/cmd/search_cmd.go
similarity index 77%
rename from search_cmd.go
rename to cmd/search_cmd.go
index 8514355..1bc77bc 100644
--- a/search_cmd.go
+++ b/cmd/search_cmd.go
@@ -1,10 +1,11 @@
-package main
+package cmd
 
 import (
 	"fmt"
-	"log"
 	"strings"
 
+	pm "system_setup_tool/packagemanager"
+
 	"github.com/spf13/cobra"
 )
 
@@ -18,16 +19,11 @@ var searchCmd = &cobra.Command{
 		if managerName == "os" {
 			managerName = "OS Package Manager"
 		}
-		opSys, err := getLinuxDistribution()
-		if err != nil {
-			log.Printf("error getting OS information: %v", err)
-			return
-		}
 
-		managers := []PackageManager{
-			NewOSManager(opSys, "", nil),
-			&HomebrewManager{},
-			&FlatpakManager{},
+		managers := []pm.PackageManager{
+			pm.NewOSManager(""),
+			&pm.HomebrewManager{},
+			&pm.FlatpakManager{},
 		}
 
 		if managerName != "" {
@@ -57,7 +53,7 @@ func displayResults(results []string, manager string) {
 	}
 }
 
-func searchAndDisplayResults(manager PackageManager, packageName string) {
+func searchAndDisplayResults(manager pm.PackageManager, packageName string) {
 	fmt.Printf("Searching in %s:\n", manager.Name())
 	results := manager.SearchPackage(packageName)
 	displayResults(results, manager.Name())
diff --git a/main.go b/cmd/sst/main.go
similarity index 55%
rename from main.go
rename to cmd/sst/main.go
index 376027d..959f384 100644
--- a/main.go
+++ b/cmd/sst/main.go
@@ -3,10 +3,11 @@ package main
 import (
 	"log"
 	"os"
+	"system_setup_tool/cmd"
 )
 
 func main() {
-	if err := rootCmd.Execute(); err != nil {
+	if err := cmd.RootCmd.Execute(); err != nil {
 		log.Println(err)
 		os.Exit(1)
 	}
diff --git a/config.toml b/config.toml
index e3f63a0..9d94c2c 100644
--- a/config.toml
+++ b/config.toml
@@ -12,20 +12,107 @@ packages = ['typst-cli']
 
 [package_managers.flatpak]
 enable = true
-packages = ['com.spotify.Client', 'us.zoom.Zoom', 'org.zotero.Zotero', 'com.google.AndroidStudio', 'io.freetubeapp.FreeTube', 'com.discordapp.Discord', 'com.nextcloud.desktopclient.nextcloud', 'com.github.tchx84.Flatseal', 'io.github.flattool.Warehouse', 'org.onlyoffice.desktopeditors']
+packages = [
+  'com.spotify.Client',
+  'us.zoom.Zoom',
+  'org.zotero.Zotero',
+  'com.google.AndroidStudio',
+  'io.freetubeapp.FreeTube',
+  'com.discordapp.Discord',
+  'com.nextcloud.desktopclient.nextcloud',
+  'com.github.tchx84.Flatseal',
+  'io.github.flattool.Warehouse',
+  'org.onlyoffice.desktopeditors',
+]
 
 [package_managers.go]
 enable = true
-packages = ['github.com/stefanlogue/meteor', 'golang.org/x/tools/gopls', 'github.com/go-delve/delve/cmd/dlv', 'github.com/air-verse/air']
+packages = [
+  'github.com/stefanlogue/meteor',
+  'golang.org/x/tools/gopls',
+  'github.com/go-delve/delve/cmd/dlv',
+  'github.com/air-verse/air',
+]
 
 [package_managers.homebrew]
 enable = true
-packages = ['fd', 'fzf', 'ripgrep', 'neovim', 'helix', 'node', 'yazi', 'zk', 'bat', 'bottom', 'btop', 'git-cliff', 'glow', 'lazygit', 'goreleaser', 'harlequin', 'mage', 'posting', 'typst', 'wails', 'zoxide', 'lsd', 'jq', 'yq', 'timewarrior', 'tmux', 'fastfetch', 'stow', 'distrobox']
+packages = [
+  'oh-my-posh',
+  'fd',
+  'fzf',
+  'ripgrep',
+  'neovim',
+  'helix',
+  'node',
+  'yazi',
+  'zk',
+  'bat',
+  'bottom',
+  'btop',
+  'git-cliff',
+  'glow',
+  'lazygit',
+  'goreleaser',
+  'harlequin',
+  'mage',
+  'posting',
+  'typst',
+  'wails',
+  'zoxide',
+  'lsd',
+  'jq',
+  'yq',
+  'timewarrior',
+  'tmux',
+  'fastfetch',
+  'stow',
+  'distrobox',
+]
 
 [package_managers.pipx]
 enable = true
 packages = ['euporie']
 
-[packages]
-headless = ['git', 'curl', 'wget', 'biber', 'bear', 'docker', 'docker-compose', 'zsh', 'npm', 'task', 'tree-sitter-cli', 'python3-pip', 'latexmk', 'luarocks']
-non_headless = ['flameshot', 'fuzzel', 'hyprcursor', 'hypridle', 'hyprland', 'hyprland-qtutils', 'hyprlock', 'hyprpaper', 'hyprutils', 'kitty', 'mako', 'SwayNotificationCenter', 'SwayNotificationCenter-zsh-completion', 'mpv', 'pidgin', 'remmina', 'thunderbird-i18n-de', 'virt-manager', 'vlc', 'waybar', 'nwg-panel', 'nwg-look', 'xdg-desktop-portal-hyprland', 'zathura', 'zathura-pdf-mupdf']
+[package_managers.os]
+enable = true
+packages = [
+  'git',
+  'curl',
+  'wget',
+  'biber',
+  'bear',
+  'docker',
+  'docker-compose',
+  'zsh',
+  'npm',
+  'task',
+  'tree-sitter-cli',
+  'python3-pip',
+  'latexmk',
+  'luarocks',
+  'flameshot',
+  'fuzzel',
+  'hyprcursor',
+  'hypridle',
+  'hyprland',
+  'hyprland-qtutils',
+  'hyprlock',
+  'hyprpaper',
+  'hyprutils',
+  'kitty',
+  'mako',
+  'SwayNotificationCenter',
+  'SwayNotificationCenter-zsh-completion',
+  'mpv',
+  'pidgin',
+  'remmina',
+  'thunderbird-i18n-de',
+  'virt-manager',
+  'vlc',
+  'waybar',
+  'nwg-panel',
+  'nwg-look',
+  'xdg-desktop-portal-hyprland',
+  'zathura',
+  'zathura-pdf-mupdf',
+]
diff --git a/config.go b/config/config.go
similarity index 59%
rename from config.go
rename to config/config.go
index 287a3fa..fddb47a 100644
--- a/config.go
+++ b/config/config.go
@@ -1,4 +1,9 @@
-package main
+package config
+
+import (
+	"system_setup_tool/dotfiles"
+	pm "system_setup_tool/packagemanager"
+)
 
 type PackageManagerConfig struct {
 	Enable   bool     `mapstructure:"enable"`
@@ -7,7 +12,7 @@ type PackageManagerConfig struct {
 
 type Config struct {
 	Headless        bool                            `mapstructure:"headless"`
-	Packages        Packages                        `mapstructure:"packages"`
+	Packages        pm.Packages                     `mapstructure:"packages"`
 	PackageManagers map[string]PackageManagerConfig `mapstructure:"package_managers"`
-	Dotfiles        DotfilesConfig                  `mapstructure:"dotfiles"`
+	Dotfiles        dotfiles.DotfilesConfig         `mapstructure:"dotfiles"`
 }
diff --git a/dotfiles.go b/dotfiles.go
deleted file mode 100644
index 849da76..0000000
--- a/dotfiles.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-)
-
-type DotfilesConfig struct {
-	Enable  bool   `mapstructure:"enable"`
-	GitRepo string `mapstructure:"git_repo"`
-}
-
-func setupDotfiles(config DotfilesConfig) error {
-	if _, err := execLookPath("git"); err != nil {
-		return fmt.Errorf("git ist nicht installiert")
-	}
-
-	if _, err := execLookPath("stow"); err != nil {
-		return fmt.Errorf("gnu stow ist nicht installiert")
-	}
-
-	dotfilesDir := filepath.Join(os.Getenv("HOME"), "dotfiles")
-
-	cmd := execCommand("git", "clone", config.GitRepo, dotfilesDir)
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("fehler beim Klonen der Dotfiles: %v", err)
-	}
-
-	if err := os.Chdir(dotfilesDir); err != nil {
-		return fmt.Errorf("fehler beim Wechseln in das Dotfiles-Verzeichnis: %v", err)
-	}
-
-	cmd = execCommand("stow", ".", "--override='*'")
-	if err := cmd.Run(); err != nil {
-		log.Printf("Fehler beim Linken: %v", err)
-	}
-	fmt.Printf("Alles erfolgreich verlinkt\n")
-
-	return nil
-}
diff --git a/dotfiles/dotfiles.go b/dotfiles/dotfiles.go
new file mode 100644
index 0000000..f6eea51
--- /dev/null
+++ b/dotfiles/dotfiles.go
@@ -0,0 +1,43 @@
+package dotfiles
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"system_setup_tool/internal/shell"
+)
+
+type DotfilesConfig struct {
+	Enable  bool   `mapstructure:"enable"`
+	GitRepo string `mapstructure:"git_repo"`
+}
+
+func SetupDotfiles(config DotfilesConfig) error {
+	if _, err := shell.ExecLookPath("git"); err != nil {
+		return fmt.Errorf("git ist nicht installiert")
+	}
+
+	if _, err := shell.ExecLookPath("stow"); err != nil {
+		return fmt.Errorf("gnu stow not installed")
+	}
+
+	dotfilesDir := filepath.Join(os.Getenv("HOME"), "dotfiles")
+
+	cmd := shell.ExecCommand("git", "clone", config.GitRepo, dotfilesDir)
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("error cloning dotfiles: %v", err)
+	}
+
+	if err := os.Chdir(dotfilesDir); err != nil {
+		return fmt.Errorf("error changing into dotfiles directory: %v", err)
+	}
+
+	cmd = shell.ExecCommand("stow", ".", "--override='*'")
+	if err := cmd.Run(); err != nil {
+		log.Printf("error creating links: %v", err)
+	}
+	fmt.Printf("all linked properly\n")
+
+	return nil
+}
diff --git a/go.mod b/go.mod
index f283e32..72088a7 100644
--- a/go.mod
+++ b/go.mod
@@ -3,10 +3,7 @@ module system_setup_tool
 go 1.23.4
 
 require (
-	github.com/charmbracelet/bubbles v0.20.0
-	github.com/charmbracelet/bubbletea v1.2.4
 	github.com/charmbracelet/huh v0.6.0
-	github.com/charmbracelet/lipgloss v1.0.0
 	github.com/magefile/mage v1.15.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/schollz/progressbar/v3 v3.18.0
@@ -18,7 +15,9 @@ require (
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/catppuccin/go v0.2.0 // indirect
-	github.com/charmbracelet/harmonica v0.2.0 // indirect
+	github.com/charmbracelet/bubbles v0.20.0 // indirect
+	github.com/charmbracelet/bubbletea v1.2.4 // indirect
+	github.com/charmbracelet/lipgloss v1.0.0 // indirect
 	github.com/charmbracelet/x/ansi v0.4.5 // indirect
 	github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
 	github.com/charmbracelet/x/term v0.2.1 // indirect
diff --git a/go.sum b/go.sum
index f3365b5..1146891 100644
--- a/go.sum
+++ b/go.sum
@@ -10,8 +10,6 @@ github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQW
 github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
 github.com/charmbracelet/bubbletea v1.2.4 h1:KN8aCViA0eps9SCOThb2/XPIlea3ANJLUkv3KnQRNCE=
 github.com/charmbracelet/bubbletea v1.2.4/go.mod h1:Qr6fVQw+wX7JkWWkVyXYk/ZUQ92a6XNekLXa3rR18MM=
-github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
-github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
 github.com/charmbracelet/huh v0.6.0 h1:mZM8VvZGuE0hoDXq6XLxRtgfWyTI3b2jZNKh0xWmax8=
 github.com/charmbracelet/huh v0.6.0/go.mod h1:GGNKeWCeNzKpEOh/OJD8WBwTQjV3prFAtQPpLv+AVwU=
 github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
diff --git a/internal/shell/shell.go b/internal/shell/shell.go
new file mode 100644
index 0000000..5b7a8b7
--- /dev/null
+++ b/internal/shell/shell.go
@@ -0,0 +1,23 @@
+package shell
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+)
+
+var (
+	ExecCommand  = exec.Command
+	ExecLookPath = exec.LookPath
+)
+
+func ExecuteShellCommand(command string, env string) error {
+	cmd := ExecCommand("bash", "-c", command)
+	cmd.Env = os.Environ()
+	cmd.Env = append(cmd.Env, env)
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("befehl fehlgeschlagen: %v\nAusgabe: %s", err, output)
+	}
+	return nil
+}
diff --git a/magefile.go b/magefile.go
index 3603577..eb85b08 100644
--- a/magefile.go
+++ b/magefile.go
@@ -1,5 +1,4 @@
 //go:build mage
-// +build mage
 
 package main
 
diff --git a/model.go b/model.go
deleted file mode 100644
index 41cb2e6..0000000
--- a/model.go
+++ /dev/null
@@ -1,164 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/charmbracelet/bubbles/progress"
-	"github.com/charmbracelet/bubbles/spinner"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/lipgloss"
-)
-
-type model struct {
-	packages     []string
-	index        int
-	width        int
-	height       int
-	spinner      spinner.Model
-	progress     progress.Model
-	done         bool
-	sudoPassword string
-	os           OS
-}
-
-func (m model) installSpecialSoftware() error {
-	if _, err := execLookPath("oh-my-posh"); err == nil {
-		fmt.Println("Oh-my-posh ist bereits installiert")
-	} else {
-		poshCommand := "curl -s https://ohmyposh.dev/install.sh | bash -s"
-		if err := installPackage(poshCommand, "", ""); err != nil {
-			return err
-		}
-	}
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		return fmt.Errorf("Fehler beim Ermitteln des Home-Verzeichnisses: %v", err)
-	}
-
-	ohMyZshDir := filepath.Join(homeDir, ".oh-my-zsh")
-	if _, err := os.Stat(ohMyZshDir); !os.IsNotExist(err) {
-		fmt.Println("Oh My Zsh ist bereits installiert.")
-		return nil
-	}
-
-	fmt.Println("Installiere Oh My Zsh...")
-	err = executeShellCommand(`sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`, "")
-	if err != nil {
-		log.Printf("Fehler bei der Installation von Oh My Zsh: %v\n", err)
-	}
-
-	plugins := []string{
-		"git clone https://github.com/zsh-users/zsh-autosuggestions.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions",
-		"git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting",
-		"git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/fast-syntax-highlighting",
-		"git clone --depth 1 -- https://github.com/marlonrichert/zsh-autocomplete.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autocomplete",
-	}
-
-	for _, plugin := range plugins {
-		err := executeShellCommand(plugin, "")
-		if err != nil {
-			log.Printf("Fehler bei der Installation des Plugins: %v\n", err)
-		}
-	}
-
-	fmt.Println("Oh My Zsh wurde erfolgreich installiert.")
-	return nil
-}
-
-func newModel(packages []string, sudoPassword string, os *OS) model {
-	p := progress.New(
-		progress.WithDefaultGradient(),
-		progress.WithWidth(40),
-		progress.WithoutPercentage(),
-	)
-	s := spinner.New()
-	s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("63"))
-	return model{
-		packages:     packages,
-		spinner:      s,
-		progress:     p,
-		sudoPassword: sudoPassword,
-		os:           *os,
-	}
-}
-
-func (m model) Init() tea.Cmd {
-	return tea.Batch(m.installPackageCmd(m.packages[m.index]), m.spinner.Tick)
-}
-
-func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	switch msg := msg.(type) {
-	case tea.WindowSizeMsg:
-		m.width, m.height = msg.Width, msg.Height
-	case tea.KeyMsg:
-		switch msg.String() {
-		case "ctrl+c", "esc", "q":
-			return m, tea.Quit
-		}
-	case installedPkgMsg:
-		pkg := m.packages[m.index]
-		if m.index >= len(m.packages)-1 {
-			m.done = true
-			return m, tea.Sequence(
-				tea.Printf("%s %s", checkMark, pkg),
-				tea.Quit,
-			)
-		}
-
-		m.index++
-		progressCmd := m.progress.SetPercent(float64(m.index) / float64(len(m.packages)))
-
-		return m, tea.Batch(
-			progressCmd,
-			tea.Printf("%s %s", checkMark, pkg),
-			m.installPackageCmd(m.packages[m.index]),
-		)
-	case spinner.TickMsg:
-		var cmd tea.Cmd
-		m.spinner, cmd = m.spinner.Update(msg)
-		return m, cmd
-	case progress.FrameMsg:
-		newModel, cmd := m.progress.Update(msg)
-		if newModel, ok := newModel.(progress.Model); ok {
-			m.progress = newModel
-		}
-		return m, cmd
-	}
-	return m, nil
-}
-
-func (m model) View() string {
-	n := len(m.packages)
-	w := lipgloss.Width(fmt.Sprintf("%d", n))
-
-	if m.done {
-		return doneStyle.Render(fmt.Sprintf("Done! Installed %d packages.\n", n))
-	}
-
-	pkgCount := fmt.Sprintf(" %*d/%*d", w, m.index, w, n)
-
-	spin := m.spinner.View() + " "
-	prog := m.progress.View()
-	cellsAvail := max(0, m.width-lipgloss.Width(spin+prog+pkgCount))
-
-	pkgName := currentPkgNameStyle.Render(m.packages[m.index])
-	info := lipgloss.NewStyle().MaxWidth(cellsAvail).Render("Installing " + pkgName)
-
-	cellsRemaining := max(0, m.width-lipgloss.Width(spin+info+prog+pkgCount))
-	gap := strings.Repeat(" ", cellsRemaining)
-
-	return spin + info + gap + prog + pkgCount
-}
-
-func (m model) installPackageCmd(pkg string) tea.Cmd {
-	return func() tea.Msg {
-		if err := installPackage(m.os.InstallCommand, pkg, m.sudoPassword); err != nil {
-			log.Printf("Fehler beim Installieren von %s: %v", pkg, err)
-		}
-		return installedPkgMsg(pkg)
-	}
-}
diff --git a/cargo.go b/packagemanager/cargo.go
similarity index 60%
rename from cargo.go
rename to packagemanager/cargo.go
index a5a80d8..9623a89 100644
--- a/cargo.go
+++ b/packagemanager/cargo.go
@@ -1,4 +1,6 @@
-package main
+package packagemanager
+
+import "system_setup_tool/internal/shell"
 
 type CargoManager struct{}
 
@@ -6,7 +8,7 @@ func (c *CargoManager) Install(packages []string) error {
 	if len(packages) == 0 {
 		return nil
 	}
-	err := installWithProgress(c, packages)
+	err := InstallWithProgress(c, packages)
 	if err != nil {
 		return err
 	}
@@ -18,25 +20,25 @@ func (c *CargoManager) Name() string {
 }
 
 func (c *CargoManager) InstallManager() error {
-	if _, err := execLookPath("brew"); err != nil {
+	if _, err := shell.ExecLookPath("brew"); err != nil {
 		installHomebrew()
 	}
 
-	if _, err := execLookPath("cargo"); err == nil {
+	if _, err := shell.ExecLookPath("cargo"); err == nil {
 		return nil
 	}
 
-	cmd := execCommand("brew", "install", "rust")
+	cmd := shell.ExecCommand("brew", "install", "rust")
 	return cmd.Run()
 }
 
 func (c *CargoManager) InstallPackage(pkg string) error {
-	cmd := execCommand("cargo", "install", pkg)
+	cmd := shell.ExecCommand("cargo", "install", pkg)
 	return cmd.Run()
 }
 
 func (c *CargoManager) RemovePackage(pkg string) error {
-	cmd := execCommand("cargo", "uninstall", pkg)
+	cmd := shell.ExecCommand("cargo", "uninstall", pkg)
 	return cmd.Run()
 }
 
diff --git a/cargo_test.go b/packagemanager/cargo_test.go
similarity index 72%
rename from cargo_test.go
rename to packagemanager/cargo_test.go
index 5129f56..ef491de 100644
--- a/cargo_test.go
+++ b/packagemanager/cargo_test.go
@@ -1,8 +1,9 @@
 // cargo_test.go
-package main
+package packagemanager
 
 import (
 	"os/exec"
+	"system_setup_tool/internal/shell"
 	"testing"
 )
 
@@ -17,13 +18,13 @@ func TestCargoManager_InstallManager(t *testing.T) {
 	cm := &CargoManager{}
 
 	// Mock exec.LookPath
-	execLookPath = func(file string) (string, error) {
+	shell.ExecLookPath = func(file string) (string, error) {
 		if file == "cargo" {
 			return "/usr/bin/cargo", nil
 		}
 		return "", exec.ErrNotFound
 	}
-	defer func() { execLookPath = exec.LookPath }()
+	defer func() { shell.ExecLookPath = exec.LookPath }()
 
 	if err := cm.InstallManager(); err != nil {
 		t.Errorf("Expected no error, got %v", err)
@@ -34,10 +35,10 @@ func TestCargoManager_InstallPackage(t *testing.T) {
 	cm := &CargoManager{}
 
 	// Mock exec.Command
-	execCommand = func(name string, arg ...string) *exec.Cmd {
+	shell.ExecCommand = func(name string, arg ...string) *exec.Cmd {
 		return exec.Command("echo", "mocked cargo install")
 	}
-	defer func() { execCommand = exec.Command }()
+	defer func() { shell.ExecCommand = exec.Command }()
 
 	if err := cm.InstallPackage("test-package"); err != nil {
 		t.Errorf("Expected no error, got %v", err)
diff --git a/flatpak.go b/packagemanager/flatpak.go
similarity index 71%
rename from flatpak.go
rename to packagemanager/flatpak.go
index 0c926bc..4c30842 100644
--- a/flatpak.go
+++ b/packagemanager/flatpak.go
@@ -1,10 +1,10 @@
-package main
+package packagemanager
 
 import (
 	"fmt"
 	"log"
-	"os/exec"
 	"strings"
+	"system_setup_tool/internal/shell"
 )
 
 type FlatpakManager struct {
@@ -13,11 +13,23 @@ type FlatpakManager struct {
 	Config       FlatpakConfig
 }
 
+func NewFlatpakManager(sudoPassword string, config FlatpakConfig) *FlatpakManager {
+	os, err := GetLinuxDistribution()
+	if err != nil {
+		log.Fatalf("error geting os information: %v", err)
+	}
+	return &FlatpakManager{
+		OS:           os,
+		SudoPassword: sudoPassword,
+		Config:       config,
+	}
+}
+
 func (f *FlatpakManager) Install(packages []string) error {
 	if len(packages) == 0 {
 		return nil
 	}
-	err := installWithProgress(f, packages)
+	err := InstallWithProgress(f, packages)
 	if err != nil {
 		return err
 	}
@@ -29,7 +41,7 @@ func (f *FlatpakManager) Name() string {
 }
 
 func (f *FlatpakManager) InstallManager() error {
-	if _, err := exec.LookPath("flatpak"); err == nil {
+	if _, err := shell.ExecLookPath("flatpak"); err == nil {
 		return nil
 	}
 
@@ -69,7 +81,7 @@ func installFlatpak(os *OS, sudoPassword string) error {
 		return fmt.Errorf("keine Flatpak-Installation für OS %s definiert", os.ID)
 	}
 
-	if err := installPackage(command, "", sudoPassword); err != nil {
+	if err := InstallPackage(command, "", sudoPassword); err != nil {
 		return fmt.Errorf("fehler bei der Flatpak-Installation: %v", err)
 	}
 	return nil
@@ -77,7 +89,7 @@ func installFlatpak(os *OS, sudoPassword string) error {
 
 func addFlatpakRemotes(remotes []Remote) error {
 	for _, remote := range remotes {
-		cmd := execCommand("flatpak", "remote-add", "--if-not-exists", remote.Name, remote.URL)
+		cmd := shell.ExecCommand("flatpak", "remote-add", "--if-not-exists", remote.Name, remote.URL)
 		if err := cmd.Run(); err != nil {
 			return fmt.Errorf("fehler beim Hinzufügen des Remotes %s: %v", remote.Name, err)
 		}
@@ -86,17 +98,17 @@ func addFlatpakRemotes(remotes []Remote) error {
 }
 
 func (f *FlatpakManager) InstallPackage(pkg string) error {
-	cmd := execCommand("flatpak", "install", "-y", pkg)
+	cmd := shell.ExecCommand("flatpak", "install", "-y", pkg)
 	return cmd.Run()
 }
 
 func (f *FlatpakManager) RemovePackage(pkg string) error {
-	cmd := execCommand("flatpak", "uninstall", "-y", pkg)
+	cmd := shell.ExecCommand("flatpak", "uninstall", "-y", pkg)
 	return cmd.Run()
 }
 
 func (f *FlatpakManager) SearchPackage(pkg string) []string {
-	cmd := execCommand("flatpak", "search", pkg)
+	cmd := shell.ExecCommand("flatpak", "search", pkg)
 	packages, err := cmd.Output()
 	if err != nil {
 		log.Printf("error fetching %s packages: %v", f.Name(), err)
diff --git a/flatpak_test.go b/packagemanager/flatpak_test.go
similarity index 83%
rename from flatpak_test.go
rename to packagemanager/flatpak_test.go
index c99e2d5..96fad8f 100644
--- a/flatpak_test.go
+++ b/packagemanager/flatpak_test.go
@@ -1,8 +1,8 @@
-// flatpak_test.go
-package main
+package packagemanager
 
 import (
 	"os/exec"
+	"system_setup_tool/internal/shell"
 	"testing"
 )
 
@@ -33,10 +33,10 @@ func TestFlatpakManager_InstallPackage(t *testing.T) {
 	fm := &FlatpakManager{}
 
 	// Mock exec.Command
-	execCommand = func(name string, arg ...string) *exec.Cmd {
+	shell.ExecCommand = func(name string, arg ...string) *exec.Cmd {
 		return exec.Command("echo", "mocked flatpak install")
 	}
-	defer func() { execCommand = exec.Command }()
+	defer func() { shell.ExecCommand = exec.Command }()
 
 	if err := fm.InstallPackage("test-package"); err != nil {
 		t.Errorf("Expected no error, got %v", err)
diff --git a/golang.go b/packagemanager/golang.go
similarity index 60%
rename from golang.go
rename to packagemanager/golang.go
index 690c2d4..9392f89 100644
--- a/golang.go
+++ b/packagemanager/golang.go
@@ -1,4 +1,6 @@
-package main
+package packagemanager
+
+import "system_setup_tool/internal/shell"
 
 type GolangManager struct{}
 
@@ -6,7 +8,7 @@ func (g *GolangManager) Install(packages []string) error {
 	if len(packages) == 0 {
 		return nil
 	}
-	err := installWithProgress(g, packages)
+	err := InstallWithProgress(g, packages)
 	if err != nil {
 		return err
 	}
@@ -18,25 +20,25 @@ func (g *GolangManager) Name() string {
 }
 
 func (g *GolangManager) InstallManager() error {
-	if _, err := execLookPath("brew"); err != nil {
+	if _, err := shell.ExecLookPath("brew"); err != nil {
 		installHomebrew()
 	}
 
-	if _, err := execLookPath("go"); err == nil {
+	if _, err := shell.ExecLookPath("go"); err == nil {
 		return nil
 	}
 
-	cmd := execCommand("brew", "install", "golang")
+	cmd := shell.ExecCommand("brew", "install", "golang")
 	return cmd.Run()
 }
 
 func (g *GolangManager) InstallPackage(pkg string) error {
-	cmd := execCommand("go", "install", pkg+"@latest")
+	cmd := shell.ExecCommand("go", "install", pkg+"@latest")
 	return cmd.Run()
 }
 
 func (g *GolangManager) RemovePackage(pkg string) error {
-	cmd := execCommand("go", "uninstall", pkg)
+	cmd := shell.ExecCommand("go", "uninstall", pkg)
 	return cmd.Run()
 }
 
diff --git a/golang_test.go b/packagemanager/golang_test.go
similarity index 72%
rename from golang_test.go
rename to packagemanager/golang_test.go
index 5e67b0a..930fe0b 100644
--- a/golang_test.go
+++ b/packagemanager/golang_test.go
@@ -1,8 +1,8 @@
-// golang_test.go
-package main
+package packagemanager
 
 import (
 	"os/exec"
+	"system_setup_tool/internal/shell"
 	"testing"
 )
 
@@ -17,13 +17,13 @@ func TestGolangManager_InstallManager(t *testing.T) {
 	gm := &GolangManager{}
 
 	// Mock exec.LookPath
-	execLookPath = func(file string) (string, error) {
+	shell.ExecLookPath = func(file string) (string, error) {
 		if file == "go" {
 			return "/usr/local/go/bin/go", nil
 		}
 		return "", exec.ErrNotFound
 	}
-	defer func() { execLookPath = exec.LookPath }()
+	defer func() { shell.ExecLookPath = exec.LookPath }()
 
 	if err := gm.InstallManager(); err != nil {
 		t.Errorf("Expected no error, got %v", err)
@@ -34,10 +34,10 @@ func TestGolangManager_InstallPackage(t *testing.T) {
 	gm := &GolangManager{}
 
 	// Mock exec.Command
-	execCommand = func(name string, arg ...string) *exec.Cmd {
+	shell.ExecCommand = func(name string, arg ...string) *exec.Cmd {
 		return exec.Command("echo", "mocked go install")
 	}
-	defer func() { execCommand = exec.Command }()
+	defer func() { shell.ExecCommand = exec.Command }()
 
 	if err := gm.InstallPackage("github.com/test/package"); err != nil {
 		t.Errorf("Expected no error, got %v", err)
diff --git a/homebrew.go b/packagemanager/homebrew.go
similarity index 68%
rename from homebrew.go
rename to packagemanager/homebrew.go
index 9cd259d..93cbcd6 100644
--- a/homebrew.go
+++ b/packagemanager/homebrew.go
@@ -1,9 +1,10 @@
-package main
+package packagemanager
 
 import (
 	"fmt"
 	"log"
 	"strings"
+	"system_setup_tool/internal/shell"
 )
 
 type HomebrewManager struct{}
@@ -12,7 +13,7 @@ func (h *HomebrewManager) Install(packages []string) error {
 	if len(packages) == 0 {
 		return nil
 	}
-	err := installWithProgress(h, packages)
+	err := InstallWithProgress(h, packages)
 	if err != nil {
 		return err
 	}
@@ -24,7 +25,7 @@ func (h *HomebrewManager) Name() string {
 }
 
 func (h *HomebrewManager) InstallManager() error {
-	if _, err := execLookPath("brew"); err == nil {
+	if _, err := shell.ExecLookPath("brew"); err == nil {
 		return nil
 	}
 
@@ -32,7 +33,7 @@ func (h *HomebrewManager) InstallManager() error {
 }
 
 func installHomebrew() error {
-	err := executeShellCommand("sh -c $(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)", "NONINTERACTE=1")
+	err := shell.ExecuteShellCommand("sh -c $(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)", "NONINTERACTE=1")
 	if err != nil {
 		return fmt.Errorf("fehler bei der Installation von Homebrew: %v", err)
 	}
@@ -40,17 +41,17 @@ func installHomebrew() error {
 }
 
 func (h *HomebrewManager) InstallPackage(pkg string) error {
-	cmd := execCommand("brew", "install", pkg)
+	cmd := shell.ExecCommand("brew", "install", pkg)
 	return cmd.Run()
 }
 
 func (h *HomebrewManager) RemovePackage(pkg string) error {
-	cmd := execCommand("brew", "uninstall", pkg)
+	cmd := shell.ExecCommand("brew", "uninstall", pkg)
 	return cmd.Run()
 }
 
 func (h *HomebrewManager) SearchPackage(pkg string) []string {
-	cmd := execCommand("brew", "search", pkg)
+	cmd := shell.ExecCommand("brew", "search", pkg)
 	packages, err := cmd.Output()
 	if err != nil {
 		log.Printf("error fetching %s packages: %v", h.Name(), err)
diff --git a/homebrew_test.go b/packagemanager/homebrew_test.go
similarity index 73%
rename from homebrew_test.go
rename to packagemanager/homebrew_test.go
index 72da6ee..14128f0 100644
--- a/homebrew_test.go
+++ b/packagemanager/homebrew_test.go
@@ -1,8 +1,8 @@
-// homebrew_test.go
-package main
+package packagemanager
 
 import (
 	"os/exec"
+	"system_setup_tool/internal/shell"
 	"testing"
 )
 
@@ -17,13 +17,13 @@ func TestHomebrewManager_InstallManager(t *testing.T) {
 	hm := &HomebrewManager{}
 
 	// Mock exec.LookPath and executeShellCommand
-	execLookPath = func(file string) (string, error) {
+	shell.ExecLookPath = func(file string) (string, error) {
 		if file == "brew" {
 			return "/usr/local/bin/brew", nil
 		}
 		return "", exec.ErrNotFound
 	}
-	defer func() { execLookPath = exec.LookPath }()
+	defer func() { shell.ExecLookPath = exec.LookPath }()
 
 	if err := hm.InstallManager(); err != nil {
 		t.Errorf("Expected no error, got %v", err)
@@ -34,10 +34,10 @@ func TestHomebrewManager_InstallPackage(t *testing.T) {
 	hm := &HomebrewManager{}
 
 	// Mock exec.Command
-	execCommand = func(name string, arg ...string) *exec.Cmd {
+	shell.ExecCommand = func(name string, arg ...string) *exec.Cmd {
 		return exec.Command("echo", "mocked brew install")
 	}
-	defer func() { execCommand = exec.Command }()
+	defer func() { shell.ExecCommand = exec.Command }()
 
 	if err := hm.InstallPackage("test-package"); err != nil {
 		t.Errorf("Expected no error, got %v", err)
diff --git a/osinfo.go b/packagemanager/os.go
similarity index 81%
rename from osinfo.go
rename to packagemanager/os.go
index bba7397..e337347 100644
--- a/osinfo.go
+++ b/packagemanager/os.go
@@ -1,27 +1,26 @@
-package main
+package packagemanager
 
 import (
 	"fmt"
 	"log"
 	"os"
 	"strings"
-
-	tea "github.com/charmbracelet/bubbletea"
+	"system_setup_tool/internal/shell"
 )
 
 type OSManager struct {
 	OS           *OS
 	SudoPassword string
-	Packages     []string
-	Model        model
 }
 
-func NewOSManager(os *OS, sudoPassword string, packages []string) *OSManager {
+func NewOSManager(sudoPassword string) *OSManager {
+	os, err := GetLinuxDistribution()
+	if err != nil {
+		log.Fatalf("error geting os information: %v", err)
+	}
 	return &OSManager{
 		OS:           os,
 		SudoPassword: sudoPassword,
-		Packages:     packages,
-		Model:        newModel(packages, sudoPassword, os),
 	}
 }
 
@@ -32,42 +31,39 @@ func (o *OSManager) Name() string {
 func (o *OSManager) InstallManager() error { return nil }
 
 func (o *OSManager) Install(packages []string) error {
-	o.Packages = packages
-	o.Model = newModel(packages, o.SudoPassword, o.OS)
-
-	p := tea.NewProgram(o.Model)
-	_, err := p.Run()
-	return err
+	if len(packages) == 0 {
+		return nil
+	}
+	err := InstallWithProgress(o, packages)
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 func (o *OSManager) InstallPackage(pkg string) error {
-	return installPackage(o.OS.InstallCommand, pkg, o.SudoPassword)
+	return InstallPackage(o.OS.InstallCommand, pkg, o.SudoPassword)
 }
 
 func (o *OSManager) InstallBuildEssentials() error {
-	return installBuildEssentials(o.OS, o.SudoPassword)
-}
-
-func (o *OSManager) InstallSpecialSoftware() error {
-	return o.Model.installSpecialSoftware()
+	return InstallBuildEssentials(o.OS, o.SudoPassword)
 }
 
 func (o *OSManager) RemovePackage(pkg string) error {
 	fullCmd := fmt.Sprintf("%s %s", o.OS.RemoveCommand, pkg)
-	command := execCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
 	command.Stdin = strings.NewReader(o.SudoPassword + "\n")
 	return command.Run()
 }
 
 func (o *OSManager) SearchPackage(pkg string) []string {
-
 	cmdParts := strings.Fields(o.OS.SearchCommand)
 	if len(cmdParts) == 0 {
 		log.Printf("Invalid search command for OS package manager")
 		return []string{}
 	}
 
-	cmd := execCommand(cmdParts[0], append(cmdParts[1:], pkg)...)
+	cmd := shell.ExecCommand(cmdParts[0], append(cmdParts[1:], pkg)...)
 	packages, err := cmd.Output()
 	if err != nil {
 		log.Printf("Error fetching %s packages: %v", o.OS.PackageManager, err)
@@ -127,7 +123,7 @@ func parseOsRelease(osRelease string) *OS {
 	return &result
 }
 
-func getLinuxDistribution() (*OS, error) {
+func GetLinuxDistribution() (*OS, error) {
 	_, err := os.Stat("/etc/os-release")
 	if os.IsNotExist(err) {
 		return nil, fmt.Errorf("unable to read system information")
@@ -155,7 +151,7 @@ func (os *OS) getPackageManager() error {
 			"pacman",
 		}
 		for _, pmname := range pmcommands {
-			_, err := execLookPath(pmname)
+			_, err := shell.ExecLookPath(pmname)
 			if err == nil {
 				os.PackageManager = pmname
 				return nil
@@ -213,7 +209,7 @@ func (os *OS) getDeleteCommand() error {
 	}
 }
 
-func installBuildEssentials(os *OS, sudoPassword string) error {
+func InstallBuildEssentials(os *OS, sudoPassword string) error {
 	var command string
 	switch os.PackageManager {
 	case "pacman":
@@ -227,8 +223,8 @@ func installBuildEssentials(os *OS, sudoPassword string) error {
 	}
 
 	fmt.Printf("Installiere Build Essentials für %s...\n", os.Name)
-	if err := installPackage(command, "", sudoPassword); err != nil {
-		return fmt.Errorf("fehler bei der Installation der Build Essentials: %v", err)
+	if err := InstallPackage(command, "", sudoPassword); err != nil {
+		return fmt.Errorf("error installing Build Essentials: %v", err)
 	}
 	return nil
 }
diff --git a/osinfo_test.go b/packagemanager/os_test.go
similarity index 63%
rename from osinfo_test.go
rename to packagemanager/os_test.go
index ddca2ec..25dbf58 100644
--- a/osinfo_test.go
+++ b/packagemanager/os_test.go
@@ -1,26 +1,20 @@
-// osmanager_test.go
-package main
+package packagemanager
 
 import (
 	"testing"
 )
 
 func TestNewOSManager(t *testing.T) {
-	os := &OS{ID: "ubuntu", PackageManager: "apt"}
 	sudoPassword := "testpassword"
-	packages := []string{"git", "curl"}
 
-	manager := NewOSManager(os, sudoPassword, packages)
+	manager := NewOSManager(sudoPassword)
 
-	if manager.OS != os {
-		t.Errorf("Expected OS to be %v, got %v", os, manager.OS)
+	if manager.OS == nil {
+		t.Error("Expected OS to be non-nil")
 	}
 	if manager.SudoPassword != sudoPassword {
 		t.Errorf("Expected SudoPassword to be %s, got %s", sudoPassword, manager.SudoPassword)
 	}
-	if len(manager.Packages) != len(packages) {
-		t.Errorf("Expected Packages length to be %d, got %d", len(packages), len(manager.Packages))
-	}
 }
 
 func TestOSManagerName(t *testing.T) {
@@ -47,4 +41,13 @@ VERSION_ID="20.04"
 	if os.Version != "20.04" {
 		t.Errorf("Expected Version to be '20.04', got %s", os.Version)
 	}
+	if os.PackageManager != "apt" {
+		t.Errorf("Expected PackageManager to be 'apt', got %s", os.PackageManager)
+	}
+	if os.InstallCommand != "apt install -y" {
+		t.Errorf("Expected InstallCommand to be 'apt install -y', got %s", os.InstallCommand)
+	}
+	if os.SearchCommand != "apt search" {
+		t.Errorf("Expected SearchCommand to be 'apt search', got %s", os.SearchCommand)
+	}
 }
diff --git a/package.go b/packagemanager/package.go
similarity index 62%
rename from package.go
rename to packagemanager/package.go
index 77b7a46..ca38da6 100644
--- a/package.go
+++ b/packagemanager/package.go
@@ -1,8 +1,10 @@
-package main
+package packagemanager
 
 import (
 	"fmt"
+	"log"
 	"strings"
+	"system_setup_tool/internal/shell"
 )
 
 type Packages struct {
@@ -10,26 +12,17 @@ type Packages struct {
 	NonHeadless []string `mapstructure:"non_headless"`
 }
 
-func installPackage(cmd, pkg, sudoPassword string) error {
+func InstallPackage(cmd, pkg, sudoPassword string) error {
 	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
-	command := execCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
 	command.Stdin = strings.NewReader(sudoPassword + "\n")
 	output, err := command.CombinedOutput()
 	if err != nil {
 		if strings.Contains(string(output), "not found") || strings.Contains(string(output), "no matching package") || strings.Contains(string(output), "Keine Übereinstimmung") || strings.Contains(string(output), "Ziel nicht gefunden") {
-			unavailablePackages = append(unavailablePackages, pkg)
+			log.Printf("Package %s not available\n", pkg)
 			return nil
 		}
 		return fmt.Errorf("failed to install %s: %v\n%s", pkg, err, string(output))
 	}
 	return nil
 }
-
-func printUnavailablePackages() {
-	if len(unavailablePackages) > 0 {
-		fmt.Println("\nFolgende Pakete waren nicht verfügbar:")
-		for _, pkg := range unavailablePackages {
-			fmt.Printf("- %s\n", pkg)
-		}
-	}
-}
diff --git a/packagemanager.go b/packagemanager/packagemanager.go
similarity index 90%
rename from packagemanager.go
rename to packagemanager/packagemanager.go
index a5f17c2..48362d2 100644
--- a/packagemanager.go
+++ b/packagemanager/packagemanager.go
@@ -1,4 +1,4 @@
-package main
+package packagemanager
 
 type PackageManager interface {
 	Install(packages []string) error
diff --git a/pipx.go b/packagemanager/pipx.go
similarity index 60%
rename from pipx.go
rename to packagemanager/pipx.go
index 8f6820a..a4e1716 100644
--- a/pipx.go
+++ b/packagemanager/pipx.go
@@ -1,4 +1,6 @@
-package main
+package packagemanager
+
+import "system_setup_tool/internal/shell"
 
 type PipxManager struct{}
 
@@ -7,7 +9,7 @@ func (p *PipxManager) Install(packages []string) error {
 		return nil
 	}
 
-	err := installWithProgress(p, packages)
+	err := InstallWithProgress(p, packages)
 	if err != nil {
 		return err
 	}
@@ -19,25 +21,25 @@ func (p *PipxManager) Name() string {
 }
 
 func (p *PipxManager) InstallManager() error {
-	if _, err := execLookPath("brew"); err != nil {
+	if _, err := shell.ExecLookPath("brew"); err != nil {
 		installHomebrew()
 	}
 
-	if _, err := execLookPath("pipx"); err == nil {
+	if _, err := shell.ExecLookPath("pipx"); err == nil {
 		return nil
 	}
 
-	cmd := execCommand("brew", "install", "pipx")
+	cmd := shell.ExecCommand("brew", "install", "pipx")
 	return cmd.Run()
 }
 
 func (p *PipxManager) InstallPackage(pkg string) error {
-	cmd := execCommand("pipx", "install", pkg)
+	cmd := shell.ExecCommand("pipx", "install", pkg)
 	return cmd.Run()
 }
 
 func (p *PipxManager) RemovePackage(pkg string) error {
-	cmd := execCommand("pipx", "uninstall", pkg)
+	cmd := shell.ExecCommand("pipx", "uninstall", pkg)
 	return cmd.Run()
 }
 
diff --git a/pipx_test.go b/packagemanager/pipx_test.go
similarity index 71%
rename from pipx_test.go
rename to packagemanager/pipx_test.go
index a7f7389..b87fb2c 100644
--- a/pipx_test.go
+++ b/packagemanager/pipx_test.go
@@ -1,8 +1,8 @@
-// pipx_test.go
-package main
+package packagemanager
 
 import (
 	"os/exec"
+	"system_setup_tool/internal/shell"
 	"testing"
 )
 
@@ -17,13 +17,13 @@ func TestPipxManager_InstallManager(t *testing.T) {
 	pm := &PipxManager{}
 
 	// Mock exec.LookPath
-	execLookPath = func(file string) (string, error) {
+	shell.ExecLookPath = func(file string) (string, error) {
 		if file == "pipx" {
 			return "/usr/bin/pipx", nil
 		}
 		return "", exec.ErrNotFound
 	}
-	defer func() { execLookPath = exec.LookPath }()
+	defer func() { shell.ExecLookPath = exec.LookPath }()
 
 	if err := pm.InstallManager(); err != nil {
 		t.Errorf("Expected no error, got %v", err)
@@ -34,10 +34,10 @@ func TestPipxManager_InstallPackage(t *testing.T) {
 	pm := &PipxManager{}
 
 	// Mock exec.Command
-	execCommand = func(name string, arg ...string) *exec.Cmd {
+	shell.ExecCommand = func(name string, arg ...string) *exec.Cmd {
 		return exec.Command("echo", "mocked pipx install")
 	}
-	defer func() { execCommand = exec.Command }()
+	defer func() { shell.ExecCommand = exec.Command }()
 
 	if err := pm.InstallPackage("test-package"); err != nil {
 		t.Errorf("Expected no error, got %v", err)
diff --git a/packagemanager/utils.go b/packagemanager/utils.go
new file mode 100644
index 0000000..293679c
--- /dev/null
+++ b/packagemanager/utils.go
@@ -0,0 +1,19 @@
+package packagemanager
+
+import (
+	"log"
+
+	"github.com/schollz/progressbar/v3"
+)
+
+func InstallWithProgress(manager PackageManager, packages []string) error {
+	bar := progressbar.Default(int64(len(packages)), "Installiere "+manager.Name()+"-Pakete...")
+	for _, pkg := range packages {
+		err := manager.InstallPackage(pkg)
+		if err != nil {
+			log.Printf("\nError installing %s: %v\n", pkg, err)
+		}
+		bar.Add(1)
+	}
+	return nil
+}
diff --git a/tui.go b/tui.go
deleted file mode 100644
index ab1be10..0000000
--- a/tui.go
+++ /dev/null
@@ -1,146 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-
-	"github.com/charmbracelet/huh"
-	"github.com/charmbracelet/lipgloss"
-	"github.com/mitchellh/mapstructure"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-var (
-	currentPkgNameStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("211"))
-	doneStyle           = lipgloss.NewStyle().Margin(1, 2)
-	checkMark           = lipgloss.NewStyle().Foreground(lipgloss.Color("42")).SetString("✓")
-	unavailablePackages []string
-)
-
-type installedPkgMsg string
-
-func run(cmd *cobra.Command, args []string) {
-	os, err := getLinuxDistribution()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	sudoPassword, err := getSudoPassword()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	var cfg Config
-	if err := viper.Unmarshal(&cfg); err != nil {
-		log.Fatalf("Fehler beim Lesen der Konfiguration: %v", err)
-	}
-
-	form := huh.NewForm(
-		huh.NewGroup(
-			huh.NewConfirm().
-				Title("Möchten Sie eine headless Installation durchführen?").
-				Value(&cfg.Headless),
-		),
-	).WithTheme(huh.ThemeCatppuccin())
-
-	if err := form.Run(); err != nil {
-		log.Fatalf("Fehler bei der Benutzerabfrage: %v", err)
-	}
-
-	unavailablePackages = []string{}
-	osManager := NewOSManager(os, sudoPassword, cfg.Packages.Headless)
-
-	if err := osManager.Install(cfg.Packages.Headless); err != nil {
-		log.Printf("Warnung bei der Installation der Headless-Pakete: %v", err)
-	}
-	if !cfg.Headless {
-		if err := osManager.Install(cfg.Packages.NonHeadless); err != nil {
-			log.Printf("Warnung bei der Installation der Non-Headless-Pakete: %v", err)
-		}
-	}
-
-	printUnavailablePackages()
-
-	var installBuild bool
-	form = huh.NewForm(
-		huh.NewGroup(
-			huh.NewConfirm().
-				Title("Möchten Sie die Build Essentials installieren?").
-				Value(&installBuild),
-		),
-	).WithTheme(huh.ThemeCatppuccin())
-
-	err = form.Run()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if installBuild {
-		if err := osManager.InstallBuildEssentials(); err != nil {
-			log.Printf("Warnung: %v", err)
-		}
-	}
-
-	var installShellExtensions bool
-	form = huh.NewForm(
-		huh.NewGroup(
-			huh.NewConfirm().
-				Title("Möchten Sie die Shell-Extensions installieren?").
-				Value(&installShellExtensions),
-		),
-	).WithTheme(huh.ThemeCatppuccin())
-
-	err = form.Run()
-	if err != nil {
-		log.Fatal(err)
-	}
-	if installShellExtensions {
-		if err := osManager.InstallSpecialSoftware(); err != nil {
-			log.Printf("Warnung bei der Installation spezieller Software: %v", err)
-		}
-	}
-
-	for name, config := range cfg.PackageManagers {
-		if config.Enable {
-			var manager PackageManager
-			switch name {
-			case "homebrew":
-				manager = &HomebrewManager{}
-			case "go":
-				manager = &GolangManager{}
-			case "cargo":
-				manager = &CargoManager{}
-			case "pipx":
-				manager = &PipxManager{}
-			case "flatpak":
-				flatpakConfig := FlatpakConfig{}
-				if err := mapstructure.Decode(config, &flatpakConfig); err != nil {
-					log.Printf("Fehler beim Dekodieren der Flatpak-Konfiguration: %v", err)
-					continue
-				}
-				manager = &FlatpakManager{
-					OS:           os,
-					SudoPassword: sudoPassword,
-					Config:       flatpakConfig,
-				}
-			default:
-				log.Printf("Unbekannter Paketmanager: %s", name)
-				continue
-			}
-			if err := manager.InstallManager(); err != nil {
-				log.Printf("Warnung Packagemanager %s nicht vorhanden und konnte nicht installiert werden: %v", manager.Name(), err)
-			}
-
-			if err := manager.Install(config.Packages); err != nil {
-				log.Printf("Warnung bei %s-Paketen: %v", manager.Name(), err)
-			}
-		}
-	}
-	if cfg.Dotfiles.Enable {
-		fmt.Println("\nKonfiguriere Dotfiles...")
-		if err := setupDotfiles(cfg.Dotfiles); err != nil {
-			log.Printf("Warnung bei Dotfiles-Setup: %v", err)
-		}
-	}
-}
diff --git a/tui/tui.go b/tui/tui.go
new file mode 100644
index 0000000..a51004e
--- /dev/null
+++ b/tui/tui.go
@@ -0,0 +1,115 @@
+package tui
+
+import (
+	"fmt"
+	"log"
+	"system_setup_tool/config"
+	"system_setup_tool/dotfiles"
+	"system_setup_tool/utils"
+
+	pm "system_setup_tool/packagemanager"
+
+	"github.com/charmbracelet/huh"
+	"github.com/mitchellh/mapstructure"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+type installedPkgMsg string
+
+func Run(cmd *cobra.Command, args []string) {
+	sudoPassword, err := utils.GetSudoPassword()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	var cfg config.Config
+	if err := viper.Unmarshal(&cfg); err != nil {
+		log.Fatalf("Fehler beim Lesen der Konfiguration: %v", err)
+	}
+
+	// form := huh.NewForm(
+	// 	huh.NewGroup(
+	// 		huh.NewConfirm().
+	// 			Title("Möchten Sie eine headless Installation durchführen?").
+	// 			Value(&cfg.Headless),
+	// 	),
+	// ).WithTheme(huh.ThemeCatppuccin())
+	//
+	// if err := form.Run(); err != nil {
+	// 	log.Fatalf("Fehler bei der Benutzerabfrage: %v", err)
+	// }
+	//
+	// osManager := pm.NewOSManager(sudoPassword)
+	//
+	// if err := osManager.Install(cfg.Packages.Headless); err != nil {
+	// 	log.Printf("Warnung bei der Installation der Headless-Pakete: %v", err)
+	// }
+	// if !cfg.Headless {
+	// 	if err := osManager.Install(cfg.Packages.NonHeadless); err != nil {
+	// 		log.Printf("Warnung bei der Installation der Non-Headless-Pakete: %v", err)
+	// 	}
+	// }
+	//
+
+	for name, config := range cfg.PackageManagers {
+		if config.Enable {
+			var manager pm.PackageManager
+			switch name {
+			case "os":
+				manager = pm.NewOSManager(sudoPassword)
+			case "homebrew":
+				manager = &pm.HomebrewManager{}
+			case "go":
+				manager = &pm.GolangManager{}
+			case "cargo":
+				manager = &pm.CargoManager{}
+			case "pipx":
+				manager = &pm.PipxManager{}
+			case "flatpak":
+				flatpakConfig := pm.FlatpakConfig{}
+				if err := mapstructure.Decode(config, &flatpakConfig); err != nil {
+					log.Printf("error decoding flatpak config: %v", err)
+					continue
+				}
+				manager = pm.NewFlatpakManager(sudoPassword, flatpakConfig)
+			default:
+				log.Printf("unknown packagemanager: %s", name)
+				continue
+			}
+			if err := manager.InstallManager(); err != nil {
+				log.Printf("warning packagemanager %s not installed and could not be installed: %v", manager.Name(), err)
+			}
+
+			if err := manager.Install(config.Packages); err != nil {
+				log.Printf("warning at %s-packages: %v", manager.Name(), err)
+			}
+		}
+	}
+	osManager := pm.NewOSManager(sudoPassword)
+	var installBuild bool
+	form := huh.NewForm(
+		huh.NewGroup(
+			huh.NewConfirm().
+				Title("Möchten Sie die Build Essentials installieren?").
+				Value(&installBuild),
+		),
+	).WithTheme(huh.ThemeCatppuccin())
+
+	err = form.Run()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	if installBuild {
+		if err := osManager.InstallBuildEssentials(); err != nil {
+			log.Printf("Warnung: %v", err)
+		}
+	}
+	if cfg.Dotfiles.Enable {
+		fmt.Println("\nconfiguring dotfiles...")
+		if err := dotfiles.SetupDotfiles(cfg.Dotfiles); err != nil {
+			log.Printf("Warnung bei Dotfiles-Setup: %v", err)
+		}
+	}
+}
diff --git a/utils.go b/utils.go
deleted file mode 100644
index 58f6896..0000000
--- a/utils.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-
-	"github.com/charmbracelet/huh"
-	"github.com/schollz/progressbar/v3"
-)
-
-var (
-	execCommand  = exec.Command
-	execLookPath = exec.LookPath
-)
-
-func getSudoPassword() (string, error) {
-	var password string
-	form := huh.NewForm(
-		huh.NewGroup(
-			huh.NewInput().
-				Title("Bitte geben Sie Ihr sudo-Passwort ein").
-				EchoMode(huh.EchoModePassword).
-				Value(&password),
-		),
-	).WithTheme(huh.ThemeCatppuccin())
-
-	err := form.Run()
-	if err != nil {
-		return "", fmt.Errorf("fehler bei der Passwortabfrage: %v", err)
-	}
-	return password, nil
-}
-
-func max(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}
-
-func executeShellCommand(command string, env string) error {
-	cmd := execCommand("bash", "-c", command)
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, env)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("befehl fehlgeschlagen: %v\nAusgabe: %s", err, output)
-	}
-	return nil
-}
-
-func installWithProgress(manager PackageManager, packages []string) error {
-	bar := progressbar.Default(int64(len(packages)), "Installiere "+manager.Name()+"-Pakete...")
-	for _, pkg := range packages {
-		err := manager.InstallPackage(pkg)
-		if err != nil {
-			log.Printf("\nError installing %s: %v\n", pkg, err)
-		}
-		bar.Add(1)
-	}
-	return nil
-}
diff --git a/utils/utils.go b/utils/utils.go
new file mode 100644
index 0000000..9024846
--- /dev/null
+++ b/utils/utils.go
@@ -0,0 +1,32 @@
+package utils
+
+import (
+	"fmt"
+
+	"github.com/charmbracelet/huh"
+)
+
+func GetSudoPassword() (string, error) {
+	var password string
+	form := huh.NewForm(
+		huh.NewGroup(
+			huh.NewInput().
+				Title("Bitte geben Sie Ihr sudo-Passwort ein").
+				EchoMode(huh.EchoModePassword).
+				Value(&password),
+		),
+	).WithTheme(huh.ThemeCatppuccin())
+
+	err := form.Run()
+	if err != nil {
+		return "", fmt.Errorf("fehler bei der Passwortabfrage: %v", err)
+	}
+	return password, nil
+}
+
+func max(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
+}
diff --git a/utils/utils_test.go b/utils/utils_test.go
new file mode 100644
index 0000000..243432e
--- /dev/null
+++ b/utils/utils_test.go
@@ -0,0 +1,40 @@
+package utils
+
+import (
+	"os/exec"
+	"system_setup_tool/internal/shell"
+	"testing"
+)
+
+func TestMax(t *testing.T) {
+	tests := []struct {
+		a, b, want int
+	}{
+		{1, 2, 2},
+		{5, 3, 5},
+		{0, 0, 0},
+		{-1, -5, -1},
+	}
+
+	for _, tt := range tests {
+		got := max(tt.a, tt.b)
+		if got != tt.want {
+			t.Errorf("max(%d, %d) = %d; want %d", tt.a, tt.b, got, tt.want)
+		}
+	}
+}
+
+func TestExecuteShellCommand(t *testing.T) {
+	// Mock execCommand
+	oldExecCommand := shell.ExecCommand
+	defer func() { shell.ExecCommand = oldExecCommand }()
+
+	shell.ExecCommand = func(command string, args ...string) *exec.Cmd {
+		return exec.Command("echo", "mocked command")
+	}
+
+	err := shell.ExecuteShellCommand("test command", "TEST_ENV=value")
+	if err != nil {
+		t.Errorf("executeShellCommand() error = %v; want nil", err)
+	}
+}
diff --git a/utils_test.go b/utils_test.go
deleted file mode 100644
index ffd2eaa..0000000
--- a/utils_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package main
-
-import (
-	"os/exec"
-	"testing"
-)
-
-func TestMax(t *testing.T) {
-	tests := []struct {
-		a, b, want int
-	}{
-		{1, 2, 2},
-		{5, 3, 5},
-		{0, 0, 0},
-		{-1, -5, -1},
-	}
-
-	for _, tt := range tests {
-		got := max(tt.a, tt.b)
-		if got != tt.want {
-			t.Errorf("max(%d, %d) = %d; want %d", tt.a, tt.b, got, tt.want)
-		}
-	}
-}
-
-func TestExecuteShellCommand(t *testing.T) {
-	// Mock execCommand
-	oldExecCommand := execCommand
-	defer func() { execCommand = oldExecCommand }()
-
-	execCommand = func(command string, args ...string) *exec.Cmd {
-		return exec.Command("echo", "mocked command")
-	}
-
-	err := executeShellCommand("test command", "TEST_ENV=value")
-	if err != nil {
-		t.Errorf("executeShellCommand() error = %v; want nil", err)
-	}
-}
-
-func TestInstallWithProgress(t *testing.T) {
-	mockManager := &MockPackageManager{
-		packages: []string{"pkg1", "pkg2"},
-	}
-
-	err := installWithProgress(mockManager, mockManager.packages)
-	if err != nil {
-		t.Errorf("installWithProgress() error = %v; want nil", err)
-	}
-
-	if len(mockManager.installedPackages) != len(mockManager.packages) {
-		t.Errorf("installWithProgress() installed %d packages; want %d", len(mockManager.installedPackages), len(mockManager.packages))
-	}
-}
-
-type MockPackageManager struct {
-	packages          []string
-	installedPackages []string
-}
-
-func (m *MockPackageManager) Install(packages []string) error {
-	m.installedPackages = append(m.installedPackages, packages...)
-	return nil
-}
-
-func (m *MockPackageManager) InstallPackage(pkg string) error {
-	m.installedPackages = append(m.installedPackages, pkg)
-	return nil
-}
-
-func (m *MockPackageManager) InstallManager() error {
-	return nil
-}
-
-func (m *MockPackageManager) Name() string {
-	return "MockManager"
-}
-
-func (m *MockPackageManager) RemovePackage(pkg string) error {
-	return nil
-}
-
-func (m *MockPackageManager) SearchPackage(pkg string) []string {
-	return nil
-}
-- 
2.47.2


From f76829cb92f65cc3c5d92e74c9641b9b2f9c5ece Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Sat, 18 Jan 2025 16:40:08 +0100
Subject: [PATCH 02/22] refactor: move main.go back to project root

---
 cmd/sst/main.go => main.go | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename cmd/sst/main.go => main.go (100%)

diff --git a/cmd/sst/main.go b/main.go
similarity index 100%
rename from cmd/sst/main.go
rename to main.go
-- 
2.47.2


From 7f9d72bddd0b99a94ff4b0894f329eaa0e357454 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Sat, 18 Jan 2025 16:55:56 +0100
Subject: [PATCH 03/22] docs: update changelog.md

---
 changelog.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/changelog.md b/changelog.md
index 10db077..f7bbf83 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.3.0] - 2025-01-18
+
+### 🚀 Features
+
+- *(cli)* Implement search argument
+- *(cli)* Add first implementation for install command
+- *(cli)* Cleanup install command and add remove and search command
+
+### 🐛 Bug Fixes
+
+- *(cli)* Add missing yes flag in flatpak remove cmd
+
+### 🚜 Refactor
+
+- Seperate files, function and structs into seperate packages
+- Move main.go back to project root
+
 ## [0.2.0] - 2025-01-16
 
 ### 🚀 Features
@@ -18,6 +35,7 @@ All notable changes to this project will be documented in this file.
 
 ### 📚 Documentation
 
+- Update changelog.md
 - Update changelog.md
 
 ### ⚙️ Miscellaneous Tasks
-- 
2.47.2


From 3b1799397e21da6c14f2ba7f01e9d031529afec8 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Sun, 19 Jan 2025 13:26:48 +0100
Subject: [PATCH 04/22] fix: fix nil pointer execution if no proper
 packagemanager selected

---
 cmd/install_cmd.go | 3 ++-
 cmd/remove_cmd.go  | 5 ++++-
 cmd/search_cmd.go  | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cmd/install_cmd.go b/cmd/install_cmd.go
index ed36c43..6b8deaa 100644
--- a/cmd/install_cmd.go
+++ b/cmd/install_cmd.go
@@ -28,7 +28,7 @@ var installCmd = &cobra.Command{
 			if err := osManager.Install([]string{packageName}); err != nil {
 				log.Printf("error: %v\n", err)
 			}
-		case "homebrew":
+		case "homebrew", "brew":
 			manager = &pm.HomebrewManager{}
 		case "cargo":
 			manager = &pm.CargoManager{}
@@ -38,6 +38,7 @@ var installCmd = &cobra.Command{
 			manager = &pm.FlatpakManager{}
 		default:
 			fmt.Println("No PackageManager found")
+			return
 		}
 		if err := manager.InstallPackage(packageName); err != nil {
 			log.Printf("error: %v\n", err)
diff --git a/cmd/remove_cmd.go b/cmd/remove_cmd.go
index 7e36cc6..defd1b5 100644
--- a/cmd/remove_cmd.go
+++ b/cmd/remove_cmd.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"fmt"
 	"log"
 	"system_setup_tool/utils"
 
@@ -27,7 +28,7 @@ var removeCmd = &cobra.Command{
 			if err := osManager.Install([]string{packageName}); err != nil {
 				log.Printf("error: %v\n", err)
 			}
-		case "homebrew":
+		case "homebrew", "brew":
 			manager = &pm.HomebrewManager{}
 		case "cargo":
 			manager = &pm.CargoManager{}
@@ -36,6 +37,8 @@ var removeCmd = &cobra.Command{
 		case "flatpak":
 			manager = &pm.FlatpakManager{}
 		default:
+			fmt.Println("No PackageManager found")
+			return
 		}
 		if err := manager.RemovePackage(packageName); err != nil {
 			log.Printf("error: %v\n", err)
diff --git a/cmd/search_cmd.go b/cmd/search_cmd.go
index 1bc77bc..2536fea 100644
--- a/cmd/search_cmd.go
+++ b/cmd/search_cmd.go
@@ -27,6 +27,9 @@ var searchCmd = &cobra.Command{
 		}
 
 		if managerName != "" {
+			if managerName == "brew" {
+				managerName = "homebrew"
+			}
 			for _, m := range managers {
 				if strings.EqualFold(m.Name(), managerName) {
 					searchAndDisplayResults(m, packageName)
-- 
2.47.2


From f39051f93d2de8e5e4ba53440b8d0837f2b4d558 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Sun, 19 Jan 2025 22:21:28 +0100
Subject: [PATCH 05/22] feat(cli): add update and update-all command

---
 cmd/cmd.go                       |  4 +-
 cmd/install_cmd.go               |  7 ++-
 cmd/remove_cmd.go                |  7 ++-
 cmd/search_cmd.go                |  5 +-
 cmd/update_command.go            | 81 ++++++++++++++++++++++++++++++++
 packagemanager/cargo.go          | 13 ++++-
 packagemanager/flatpak.go        | 10 ++++
 packagemanager/golang.go         | 13 ++++-
 packagemanager/homebrew.go       | 10 ++++
 packagemanager/os.go             | 38 +++++++++++++++
 packagemanager/packagemanager.go |  2 +
 packagemanager/pipx.go           | 10 ++++
 12 files changed, 192 insertions(+), 8 deletions(-)
 create mode 100644 cmd/update_command.go

diff --git a/cmd/cmd.go b/cmd/cmd.go
index 102668c..c940ea8 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -38,8 +38,10 @@ func init() {
 
 	searchCmd.Flags().StringP("manager", "m", "", "The package manager you want to search a package with. (Options: os|homebrew|flatpak)")
 
+	updateCmd.Flags().StringP("manager", "m", "os", "The package manager you want to update packages with. (Options: os|homebrew|pipx|flatpak)")
+
 	packageCmd.AddCommand(addCmd, deleteCmd, showCmd, enableCmd)
-	RootCmd.AddCommand(packageCmd, searchCmd, installCmd, removeCmd)
+	RootCmd.AddCommand(packageCmd, searchCmd, installCmd, removeCmd, updateCmd, updateAllCmd)
 }
 
 func initConfig() {
diff --git a/cmd/install_cmd.go b/cmd/install_cmd.go
index 6b8deaa..b31c3b2 100644
--- a/cmd/install_cmd.go
+++ b/cmd/install_cmd.go
@@ -18,6 +18,11 @@ var installCmd = &cobra.Command{
 		packageName := args[0]
 		managerName, _ := cmd.Flags().GetString("manager")
 		var manager pm.PackageManager
+		if managerName == "os" {
+			managerName = "OS Package Manager"
+		} else if managerName == "brew" {
+			managerName = "homebrew"
+		}
 		switch managerName {
 		case "os":
 			sudoPassword, err := utils.GetSudoPassword()
@@ -28,7 +33,7 @@ var installCmd = &cobra.Command{
 			if err := osManager.Install([]string{packageName}); err != nil {
 				log.Printf("error: %v\n", err)
 			}
-		case "homebrew", "brew":
+		case "homebrew":
 			manager = &pm.HomebrewManager{}
 		case "cargo":
 			manager = &pm.CargoManager{}
diff --git a/cmd/remove_cmd.go b/cmd/remove_cmd.go
index defd1b5..a41ff61 100644
--- a/cmd/remove_cmd.go
+++ b/cmd/remove_cmd.go
@@ -18,6 +18,11 @@ var removeCmd = &cobra.Command{
 		packageName := args[0]
 		managerName, _ := cmd.Flags().GetString("manager")
 		var manager pm.PackageManager
+		if managerName == "os" {
+			managerName = "OS Package Manager"
+		} else if managerName == "brew" {
+			managerName = "homebrew"
+		}
 		switch managerName {
 		case "os":
 			sudoPassword, err := utils.GetSudoPassword()
@@ -28,7 +33,7 @@ var removeCmd = &cobra.Command{
 			if err := osManager.Install([]string{packageName}); err != nil {
 				log.Printf("error: %v\n", err)
 			}
-		case "homebrew", "brew":
+		case "homebrew":
 			manager = &pm.HomebrewManager{}
 		case "cargo":
 			manager = &pm.CargoManager{}
diff --git a/cmd/search_cmd.go b/cmd/search_cmd.go
index 2536fea..969f08c 100644
--- a/cmd/search_cmd.go
+++ b/cmd/search_cmd.go
@@ -18,6 +18,8 @@ var searchCmd = &cobra.Command{
 		managerName, _ := cmd.Flags().GetString("manager")
 		if managerName == "os" {
 			managerName = "OS Package Manager"
+		} else if managerName == "brew" {
+			managerName = "homebrew"
 		}
 
 		managers := []pm.PackageManager{
@@ -27,9 +29,6 @@ var searchCmd = &cobra.Command{
 		}
 
 		if managerName != "" {
-			if managerName == "brew" {
-				managerName = "homebrew"
-			}
 			for _, m := range managers {
 				if strings.EqualFold(m.Name(), managerName) {
 					searchAndDisplayResults(m, packageName)
diff --git a/cmd/update_command.go b/cmd/update_command.go
new file mode 100644
index 0000000..ebb23b2
--- /dev/null
+++ b/cmd/update_command.go
@@ -0,0 +1,81 @@
+package cmd
+
+import (
+	"fmt"
+	"log"
+	pm "system_setup_tool/packagemanager"
+	"system_setup_tool/utils"
+
+	"github.com/spf13/cobra"
+)
+
+var updateCmd = &cobra.Command{
+	Use:   "update [package_name]",
+	Short: "update a package with the specified package manager.",
+	Long:  "update a package with the specified package manager.\nIf no package specified, all packages for the package manager will be updated",
+	Args:  cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		packageName := args[0]
+		managerName, _ := cmd.Flags().GetString("manager")
+		var manager pm.PackageManager
+		if managerName == "os" {
+			managerName = "OS Package Manager"
+		} else if managerName == "brew" {
+			managerName = "homebrew"
+		}
+
+		switch managerName {
+		case "os":
+			sudoPassword, err := utils.GetSudoPassword()
+			if err != nil {
+				log.Fatal(err)
+			}
+			osManager := pm.NewOSManager(sudoPassword)
+			if err := osManager.Install([]string{packageName}); err != nil {
+				log.Printf("error: %v\n", err)
+			}
+		case "homebrew":
+			manager = &pm.HomebrewManager{}
+		case "cargo":
+			manager = &pm.CargoManager{}
+		case "pipx":
+			manager = &pm.PipxManager{}
+		case "flatpak":
+			manager = &pm.FlatpakManager{}
+		default:
+			fmt.Println("No PackageManager found")
+			return
+		}
+		if packageName != "" {
+			if err := manager.UpdatePackage(packageName); err != nil {
+				log.Printf("error: %v\n", err)
+			}
+		} else {
+			if err := manager.UpdateAllPackages(); err != nil {
+				log.Printf("error: %v\n", err)
+			}
+		}
+	},
+}
+
+var updateAllCmd = &cobra.Command{
+	Use:   "update-all",
+	Short: "update all packages with all package managers.",
+	Run: func(cmd *cobra.Command, args []string) {
+		sudoPassword, err := utils.GetSudoPassword()
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		managers := []pm.PackageManager{
+			pm.NewOSManager(sudoPassword),
+			&pm.HomebrewManager{},
+			&pm.FlatpakManager{},
+			&pm.PipxManager{},
+		}
+		for _, m := range managers {
+			fmt.Printf("Updating %s-Packages\n", m.Name())
+			m.UpdateAllPackages()
+		}
+	},
+}
diff --git a/packagemanager/cargo.go b/packagemanager/cargo.go
index 9623a89..d99a0f5 100644
--- a/packagemanager/cargo.go
+++ b/packagemanager/cargo.go
@@ -1,6 +1,9 @@
 package packagemanager
 
-import "system_setup_tool/internal/shell"
+import (
+	"fmt"
+	"system_setup_tool/internal/shell"
+)
 
 type CargoManager struct{}
 
@@ -45,3 +48,11 @@ func (c *CargoManager) RemovePackage(pkg string) error {
 func (c *CargoManager) SearchPackage(pkg string) []string {
 	return []string{}
 }
+
+func (c *CargoManager) UpdatePackage(pkg string) error {
+	return fmt.Errorf("update not supported")
+}
+
+func (c *CargoManager) UpdateAllPackages() error {
+	return fmt.Errorf("update not supported")
+}
diff --git a/packagemanager/flatpak.go b/packagemanager/flatpak.go
index 4c30842..2f4a72b 100644
--- a/packagemanager/flatpak.go
+++ b/packagemanager/flatpak.go
@@ -116,3 +116,13 @@ func (f *FlatpakManager) SearchPackage(pkg string) []string {
 	packageList := strings.Split(strings.TrimSpace(string(packages)), "\n")
 	return packageList
 }
+
+func (f *FlatpakManager) UpdatePackage(pkg string) error {
+	cmd := shell.ExecCommand("flatpak", "update", "-y", pkg)
+	return cmd.Run()
+}
+
+func (f *FlatpakManager) UpdateAllPackages() error {
+	cmd := shell.ExecCommand("flatpak", "update", "-y")
+	return cmd.Run()
+}
diff --git a/packagemanager/golang.go b/packagemanager/golang.go
index 9392f89..87d779f 100644
--- a/packagemanager/golang.go
+++ b/packagemanager/golang.go
@@ -1,6 +1,9 @@
 package packagemanager
 
-import "system_setup_tool/internal/shell"
+import (
+	"fmt"
+	"system_setup_tool/internal/shell"
+)
 
 type GolangManager struct{}
 
@@ -45,3 +48,11 @@ func (g *GolangManager) RemovePackage(pkg string) error {
 func (g *GolangManager) SearchPackage(pkg string) []string {
 	return []string{}
 }
+
+func (g *GolangManager) UpdatePackage(pkg string) error {
+	return fmt.Errorf("update not supported")
+}
+
+func (g *GolangManager) UpdateAllPackages() error {
+	return fmt.Errorf("update not supported")
+}
diff --git a/packagemanager/homebrew.go b/packagemanager/homebrew.go
index 93cbcd6..2baa2f2 100644
--- a/packagemanager/homebrew.go
+++ b/packagemanager/homebrew.go
@@ -59,3 +59,13 @@ func (h *HomebrewManager) SearchPackage(pkg string) []string {
 	packageList := strings.Split(strings.TrimSpace(string(packages)), "\n")
 	return packageList
 }
+
+func (h *HomebrewManager) UpdatePackage(pkg string) error {
+	cmd := shell.ExecCommand("brew", "upgrade", pkg)
+	return cmd.Run()
+}
+
+func (h *HomebrewManager) UpdateAllPackages() error {
+	cmd := shell.ExecCommand("brew", "update")
+	return cmd.Run()
+}
diff --git a/packagemanager/os.go b/packagemanager/os.go
index e337347..48f1934 100644
--- a/packagemanager/os.go
+++ b/packagemanager/os.go
@@ -74,6 +74,20 @@ func (o *OSManager) SearchPackage(pkg string) []string {
 	return packageList
 }
 
+func (o *OSManager) UpdatePackage(pkg string) error {
+	fullCmd := fmt.Sprintf("%s %s", o.OS.UpdateCommand, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(o.SudoPassword + "\n")
+	return command.Run()
+}
+
+func (o *OSManager) UpdateAllPackages() error {
+	fullCmd := fmt.Sprintf("%s", o.OS.UpdateCommand)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(o.SudoPassword + "\n")
+	return command.Run()
+}
+
 type OS struct {
 	ID             string
 	Name           string
@@ -82,6 +96,7 @@ type OS struct {
 	InstallCommand string
 	SearchCommand  string
 	RemoveCommand  string
+	UpdateCommand  string
 }
 
 func parseOsRelease(osRelease string) *OS {
@@ -91,6 +106,9 @@ func parseOsRelease(osRelease string) *OS {
 	result.Version = "Unknown"
 	result.PackageManager = "Unkown"
 	result.InstallCommand = "Unkown"
+	result.SearchCommand = "Unkown"
+	result.RemoveCommand = "Unkown"
+	result.UpdateCommand = "Unkown"
 
 	lines := strings.Split(osRelease, "\n")
 
@@ -120,6 +138,10 @@ func parseOsRelease(osRelease string) *OS {
 	if err != nil {
 		log.Fatal(err)
 	}
+	err = result.getUpdateCommand()
+	if err != nil {
+		log.Fatal(err)
+	}
 	return &result
 }
 
@@ -209,6 +231,22 @@ func (os *OS) getDeleteCommand() error {
 	}
 }
 
+func (os *OS) getUpdateCommand() error {
+	switch os.PackageManager {
+	case "apt":
+		os.UpdateCommand = "apt update"
+		return nil
+	case "pacman":
+		os.UpdateCommand = "pacman -S"
+		return nil
+	case "dnf":
+		os.UpdateCommand = "dnf update"
+		return nil
+	default:
+		return fmt.Errorf("no install command found for package manager: %s", os.ID)
+	}
+}
+
 func InstallBuildEssentials(os *OS, sudoPassword string) error {
 	var command string
 	switch os.PackageManager {
diff --git a/packagemanager/packagemanager.go b/packagemanager/packagemanager.go
index 48362d2..8350beb 100644
--- a/packagemanager/packagemanager.go
+++ b/packagemanager/packagemanager.go
@@ -6,5 +6,7 @@ type PackageManager interface {
 	InstallManager() error
 	RemovePackage(pkg string) error
 	SearchPackage(pkg string) []string
+	UpdatePackage(pkg string) error
+	UpdateAllPackages() error
 	Name() string
 }
diff --git a/packagemanager/pipx.go b/packagemanager/pipx.go
index a4e1716..c8711ec 100644
--- a/packagemanager/pipx.go
+++ b/packagemanager/pipx.go
@@ -46,3 +46,13 @@ func (p *PipxManager) RemovePackage(pkg string) error {
 func (p *PipxManager) SearchPackage(pkg string) []string {
 	return []string{}
 }
+
+func (p *PipxManager) UpdatePackage(pkg string) error {
+	cmd := shell.ExecCommand("pipx", "upgrade", pkg)
+	return cmd.Run()
+}
+
+func (p *PipxManager) UpdateAllPackages() error {
+	cmd := shell.ExecCommand("pipx", "upgrade-all")
+	return cmd.Run()
+}
-- 
2.47.2


From 8dabc7357b8fc6f911f3d0ab5d407c92d57d2cab Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Sun, 19 Jan 2025 22:54:49 +0100
Subject: [PATCH 06/22] feat(packagemanager): added packagemanager definitions
 for winget and chocolatey

---
 packagemanager/choco.go    | 66 ++++++++++++++++++++++++++++++++++++++
 packagemanager/homebrew.go |  2 +-
 packagemanager/os.go       | 23 +++++++++----
 packagemanager/winget.go   | 66 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 149 insertions(+), 8 deletions(-)
 create mode 100644 packagemanager/choco.go
 create mode 100644 packagemanager/winget.go

diff --git a/packagemanager/choco.go b/packagemanager/choco.go
new file mode 100644
index 0000000..71d4c8d
--- /dev/null
+++ b/packagemanager/choco.go
@@ -0,0 +1,66 @@
+package packagemanager
+
+import (
+	"log"
+	"strings"
+	"system_setup_tool/internal/shell"
+)
+
+type ChocoManager struct{}
+
+func (c *ChocoManager) Install(packages []string) error {
+	if len(packages) == 0 {
+		return nil
+	}
+	err := InstallWithProgress(c, packages)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (c *ChocoManager) Name() string {
+	return "Chocolatey"
+}
+
+func (c *ChocoManager) InstallManager() error {
+	if _, err := shell.ExecLookPath("choco"); err == nil {
+		return nil
+	}
+
+	return installHomebrew()
+}
+
+func installChoco() error {
+	return nil
+}
+
+func (c *ChocoManager) InstallPackage(pkg string) error {
+	cmd := shell.ExecCommand("choco", "install", pkg)
+	return cmd.Run()
+}
+
+func (c *ChocoManager) RemovePackage(pkg string) error {
+	cmd := shell.ExecCommand("choco", "uninstall", pkg)
+	return cmd.Run()
+}
+
+func (c *ChocoManager) SearchPackage(pkg string) []string {
+	cmd := shell.ExecCommand("choco", "search", pkg)
+	packages, err := cmd.Output()
+	if err != nil {
+		log.Printf("error fetching %s packages: %v", c.Name(), err)
+	}
+	packageList := strings.Split(strings.TrimSpace(string(packages)), "\n")
+	return packageList
+}
+
+func (c *ChocoManager) UpdatePackage(pkg string) error {
+	cmd := shell.ExecCommand("choco", "update", pkg)
+	return cmd.Run()
+}
+
+func (c *ChocoManager) UpdateAllPackages() error {
+	cmd := shell.ExecCommand("choco", "update")
+	return cmd.Run()
+}
diff --git a/packagemanager/homebrew.go b/packagemanager/homebrew.go
index 2baa2f2..af72153 100644
--- a/packagemanager/homebrew.go
+++ b/packagemanager/homebrew.go
@@ -66,6 +66,6 @@ func (h *HomebrewManager) UpdatePackage(pkg string) error {
 }
 
 func (h *HomebrewManager) UpdateAllPackages() error {
-	cmd := shell.ExecCommand("brew", "update")
+	cmd := shell.ExecCommand("brew", "upgrade")
 	return cmd.Run()
 }
diff --git a/packagemanager/os.go b/packagemanager/os.go
index 48f1934..e6fe90a 100644
--- a/packagemanager/os.go
+++ b/packagemanager/os.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"runtime"
 	"strings"
 	"system_setup_tool/internal/shell"
 )
@@ -14,14 +15,22 @@ type OSManager struct {
 }
 
 func NewOSManager(sudoPassword string) *OSManager {
-	os, err := GetLinuxDistribution()
-	if err != nil {
-		log.Fatalf("error geting os information: %v", err)
-	}
-	return &OSManager{
-		OS:           os,
-		SudoPassword: sudoPassword,
+	switch runtime.GOOS {
+	case "linux":
+		os, err := GetLinuxDistribution()
+		if err != nil {
+			log.Fatalf("error geting os information: %v", err)
+		}
+		return &OSManager{
+			OS:           os,
+			SudoPassword: sudoPassword,
+		}
+	case "windows":
+	case "darwin":
+	default:
+		log.Fatal("Operating system not supported")
 	}
+	return nil
 }
 
 func (o *OSManager) Name() string {
diff --git a/packagemanager/winget.go b/packagemanager/winget.go
new file mode 100644
index 0000000..2d5d14b
--- /dev/null
+++ b/packagemanager/winget.go
@@ -0,0 +1,66 @@
+package packagemanager
+
+import (
+	"log"
+	"strings"
+	"system_setup_tool/internal/shell"
+)
+
+type WingetManager struct{}
+
+func (w *WingetManager) Install(packages []string) error {
+	if len(packages) == 0 {
+		return nil
+	}
+	err := InstallWithProgress(w, packages)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (w *WingetManager) Name() string {
+	return "Winget"
+}
+
+func (w *WingetManager) InstallManager() error {
+	if _, err := shell.ExecLookPath("winget"); err == nil {
+		return nil
+	}
+
+	return installHomebrew()
+}
+
+func installWinget() error {
+	return nil
+}
+
+func (w *WingetManager) InstallPackage(pkg string) error {
+	cmd := shell.ExecCommand("winget", "install", pkg)
+	return cmd.Run()
+}
+
+func (w *WingetManager) RemovePackage(pkg string) error {
+	cmd := shell.ExecCommand("winget", "uninstall", pkg)
+	return cmd.Run()
+}
+
+func (w *WingetManager) SearchPackage(pkg string) []string {
+	cmd := shell.ExecCommand("winget", "search", pkg)
+	packages, err := cmd.Output()
+	if err != nil {
+		log.Printf("error fetching %s packages: %v", w.Name(), err)
+	}
+	packageList := strings.Split(strings.TrimSpace(string(packages)), "\n")
+	return packageList
+}
+
+func (w *WingetManager) UpdatePackage(pkg string) error {
+	cmd := shell.ExecCommand("winget", "update", pkg)
+	return cmd.Run()
+}
+
+func (w *WingetManager) UpdateAllPackages() error {
+	cmd := shell.ExecCommand("winget", "update")
+	return cmd.Run()
+}
-- 
2.47.2


From 8281883e4deef3a9426e1a5d8f362fab1faaad59 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Mon, 20 Jan 2025 21:28:44 +0100
Subject: [PATCH 07/22] feat(cli,packagemanager): implemented first working
 windows and macos versions

in order to implement sst for windows and macos the structure of
osmanager has been changed.
Now osmanager has a new field pm, which contains the specific
packagemanager for the os.
Linux packagemanagers have been implemented as packagemanagers on their
own.
---
 cmd/install_cmd.go          |  20 +--
 cmd/remove_cmd.go           |  18 +--
 cmd/search_cmd.go           |  26 +++-
 cmd/update_command.go       |  18 +--
 go.mod                      |   2 +-
 packagemanager/apt.go       |  76 +++++++++++
 packagemanager/dnf.go       |  76 +++++++++++
 packagemanager/os.go        | 249 +++++++++++++++---------------------
 packagemanager/os_test.go   |   9 --
 packagemanager/pacman.go    |  76 +++++++++++
 packagemanager/win.go       |  30 +++++
 packagemanager/win_dummy.go |   8 ++
 12 files changed, 422 insertions(+), 186 deletions(-)
 create mode 100644 packagemanager/apt.go
 create mode 100644 packagemanager/dnf.go
 create mode 100644 packagemanager/pacman.go
 create mode 100644 packagemanager/win.go
 create mode 100644 packagemanager/win_dummy.go

diff --git a/cmd/install_cmd.go b/cmd/install_cmd.go
index b31c3b2..be9de12 100644
--- a/cmd/install_cmd.go
+++ b/cmd/install_cmd.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"log"
+	"runtime"
 	"system_setup_tool/utils"
 
 	pm "system_setup_tool/packagemanager"
@@ -24,14 +25,15 @@ var installCmd = &cobra.Command{
 			managerName = "homebrew"
 		}
 		switch managerName {
-		case "os":
-			sudoPassword, err := utils.GetSudoPassword()
-			if err != nil {
-				log.Fatal(err)
-			}
-			osManager := pm.NewOSManager(sudoPassword)
-			if err := osManager.Install([]string{packageName}); err != nil {
-				log.Printf("error: %v\n", err)
+		case "OS Package Manager":
+			if runtime.GOOS != "windows" {
+				sudoPassword, err := utils.GetSudoPassword()
+				if err != nil {
+					log.Fatal(err)
+				}
+				manager = pm.NewOSManager(sudoPassword)
+			} else {
+				manager = pm.NewOSManager("")
 			}
 		case "homebrew":
 			manager = &pm.HomebrewManager{}
@@ -45,7 +47,7 @@ var installCmd = &cobra.Command{
 			fmt.Println("No PackageManager found")
 			return
 		}
-		if err := manager.InstallPackage(packageName); err != nil {
+		if err := manager.Install([]string{packageName}); err != nil {
 			log.Printf("error: %v\n", err)
 		}
 	},
diff --git a/cmd/remove_cmd.go b/cmd/remove_cmd.go
index a41ff61..30b80f2 100644
--- a/cmd/remove_cmd.go
+++ b/cmd/remove_cmd.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"log"
+	"runtime"
 	"system_setup_tool/utils"
 
 	pm "system_setup_tool/packagemanager"
@@ -24,14 +25,15 @@ var removeCmd = &cobra.Command{
 			managerName = "homebrew"
 		}
 		switch managerName {
-		case "os":
-			sudoPassword, err := utils.GetSudoPassword()
-			if err != nil {
-				log.Fatal(err)
-			}
-			osManager := pm.NewOSManager(sudoPassword)
-			if err := osManager.Install([]string{packageName}); err != nil {
-				log.Printf("error: %v\n", err)
+		case "OS Package Manager":
+			if runtime.GOOS != "windows" {
+				sudoPassword, err := utils.GetSudoPassword()
+				if err != nil {
+					log.Fatal(err)
+				}
+				manager = pm.NewOSManager(sudoPassword)
+			} else {
+				manager = pm.NewOSManager("")
 			}
 		case "homebrew":
 			manager = &pm.HomebrewManager{}
diff --git a/cmd/search_cmd.go b/cmd/search_cmd.go
index 969f08c..6fe1f68 100644
--- a/cmd/search_cmd.go
+++ b/cmd/search_cmd.go
@@ -2,6 +2,8 @@ package cmd
 
 import (
 	"fmt"
+	"log"
+	"runtime"
 	"strings"
 
 	pm "system_setup_tool/packagemanager"
@@ -22,10 +24,26 @@ var searchCmd = &cobra.Command{
 			managerName = "homebrew"
 		}
 
-		managers := []pm.PackageManager{
-			pm.NewOSManager(""),
-			&pm.HomebrewManager{},
-			&pm.FlatpakManager{},
+		var managers []pm.PackageManager
+		switch runtime.GOOS {
+		case "linux":
+			managers = []pm.PackageManager{
+				pm.NewOSManager(""),
+				&pm.HomebrewManager{},
+				&pm.FlatpakManager{},
+			}
+		case "windows":
+			managers = []pm.PackageManager{
+				pm.NewOSManager(""),
+				&pm.WingetManager{},
+				&pm.ChocoManager{},
+			}
+		case "darwin":
+			managers = []pm.PackageManager{
+				pm.NewOSManager(""),
+			}
+		default:
+			log.Println("No Package Managers found")
 		}
 
 		if managerName != "" {
diff --git a/cmd/update_command.go b/cmd/update_command.go
index ebb23b2..a6162b5 100644
--- a/cmd/update_command.go
+++ b/cmd/update_command.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"log"
+	"runtime"
 	pm "system_setup_tool/packagemanager"
 	"system_setup_tool/utils"
 
@@ -25,14 +26,15 @@ var updateCmd = &cobra.Command{
 		}
 
 		switch managerName {
-		case "os":
-			sudoPassword, err := utils.GetSudoPassword()
-			if err != nil {
-				log.Fatal(err)
-			}
-			osManager := pm.NewOSManager(sudoPassword)
-			if err := osManager.Install([]string{packageName}); err != nil {
-				log.Printf("error: %v\n", err)
+		case "OS Package Manager":
+			if runtime.GOOS != "windows" {
+				sudoPassword, err := utils.GetSudoPassword()
+				if err != nil {
+					log.Fatal(err)
+				}
+				manager = pm.NewOSManager(sudoPassword)
+			} else {
+				manager = pm.NewOSManager("")
 			}
 		case "homebrew":
 			manager = &pm.HomebrewManager{}
diff --git a/go.mod b/go.mod
index 72088a7..396303f 100644
--- a/go.mod
+++ b/go.mod
@@ -9,6 +9,7 @@ require (
 	github.com/schollz/progressbar/v3 v3.18.0
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
+	golang.org/x/sys v0.29.0
 )
 
 require (
@@ -50,7 +51,6 @@ require (
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
 	golang.org/x/sync v0.9.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/term v0.28.0 // indirect
 	golang.org/x/text v0.18.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
diff --git a/packagemanager/apt.go b/packagemanager/apt.go
new file mode 100644
index 0000000..dd63647
--- /dev/null
+++ b/packagemanager/apt.go
@@ -0,0 +1,76 @@
+package packagemanager
+
+import (
+	"fmt"
+	"log"
+	"strings"
+	"system_setup_tool/internal/shell"
+)
+
+type AptManager struct {
+	SudoPassword string
+}
+
+func (a *AptManager) Install(packages []string) error {
+	if len(packages) == 0 {
+		return nil
+	}
+	err := InstallWithProgress(a, packages)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (a *AptManager) Name() string {
+	return "OS Home Manager"
+}
+
+func (a *AptManager) InstallManager() error {
+	return nil
+}
+
+func (a *AptManager) InstallPackage(pkg string) error {
+	cmd := "apt install -y"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(a.SudoPassword + "\n")
+	return command.Run()
+}
+
+func (a *AptManager) RemovePackage(pkg string) error {
+	cmd := "apt remove -y"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(a.SudoPassword + "\n")
+	return command.Run()
+}
+
+func (a *AptManager) SearchPackage(pkg string) []string {
+	cmd := "apt search -y"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(a.SudoPassword + "\n")
+	packages, err := command.Output()
+	if err != nil {
+		log.Printf("error fetching %s packages: %v", a.Name(), err)
+	}
+	packageList := strings.Split(strings.TrimSpace(string(packages)), "\n")
+	return packageList
+}
+
+func (a *AptManager) UpdatePackage(pkg string) error {
+	cmd := "apt update -y"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(a.SudoPassword + "\n")
+	return command.Run()
+}
+
+func (a *AptManager) UpdateAllPackages() error {
+	cmd := "apt update -y"
+	fullCmd := fmt.Sprintf("%s", cmd)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(a.SudoPassword + "\n")
+	return command.Run()
+}
diff --git a/packagemanager/dnf.go b/packagemanager/dnf.go
new file mode 100644
index 0000000..d68a59f
--- /dev/null
+++ b/packagemanager/dnf.go
@@ -0,0 +1,76 @@
+package packagemanager
+
+import (
+	"fmt"
+	"log"
+	"strings"
+	"system_setup_tool/internal/shell"
+)
+
+type DnfManager struct {
+	SudoPassword string
+}
+
+func (d *DnfManager) Install(packages []string) error {
+	if len(packages) == 0 {
+		return nil
+	}
+	err := InstallWithProgress(d, packages)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (d *DnfManager) Name() string {
+	return "OS Home Manager"
+}
+
+func (d *DnfManager) InstallManager() error {
+	return nil
+}
+
+func (d *DnfManager) InstallPackage(pkg string) error {
+	cmd := "dnf install -y --best"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(d.SudoPassword + "\n")
+	return command.Run()
+}
+
+func (d *DnfManager) RemovePackage(pkg string) error {
+	cmd := "dnf remove -y"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(d.SudoPassword + "\n")
+	return command.Run()
+}
+
+func (d *DnfManager) SearchPackage(pkg string) []string {
+	cmd := "dnf search -y"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(d.SudoPassword + "\n")
+	packages, err := command.Output()
+	if err != nil {
+		log.Printf("error fetching %s packages: %v", d.Name(), err)
+	}
+	packageList := strings.Split(strings.TrimSpace(string(packages)), "\n")
+	return packageList
+}
+
+func (d *DnfManager) UpdatePackage(pkg string) error {
+	cmd := "dnf update -y"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(d.SudoPassword + "\n")
+	return command.Run()
+}
+
+func (d *DnfManager) UpdateAllPackages() error {
+	cmd := "dnf update -y"
+	fullCmd := fmt.Sprintf("%s", cmd)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(d.SudoPassword + "\n")
+	return command.Run()
+}
diff --git a/packagemanager/os.go b/packagemanager/os.go
index e6fe90a..efc84d6 100644
--- a/packagemanager/os.go
+++ b/packagemanager/os.go
@@ -12,6 +12,7 @@ import (
 type OSManager struct {
 	OS           *OS
 	SudoPassword string
+	pm           PackageManager
 }
 
 func NewOSManager(sudoPassword string) *OSManager {
@@ -19,14 +20,66 @@ func NewOSManager(sudoPassword string) *OSManager {
 	case "linux":
 		os, err := GetLinuxDistribution()
 		if err != nil {
-			log.Fatalf("error geting os information: %v", err)
+			log.Fatalf("error getting os information: %v", err)
+		}
+		var pm PackageManager
+		switch os.ID {
+		case "debian", "ubuntu":
+			pm = &AptManager{SudoPassword: sudoPassword}
+		case "arch":
+			pm = &PacmanManager{SudoPassword: sudoPassword}
+		case "fedora":
+			pm = &DnfManager{SudoPassword: sudoPassword}
+		default:
+			log.Fatalf("Unsupported Linux distribution: %s", os.ID)
 		}
 		return &OSManager{
 			OS:           os,
 			SudoPassword: sudoPassword,
+			pm:           pm,
 		}
 	case "windows":
+		os, err := getPlatformInfo()
+		if err != nil {
+			return nil
+		}
+
+		if _, err := shell.ExecLookPath("winget"); err == nil {
+			return &OSManager{
+				OS:           os,
+				SudoPassword: "",
+				pm:           &WingetManager{},
+			}
+		} else if _, err := shell.ExecLookPath("choco"); err == nil {
+			return &OSManager{
+				OS:           os,
+				SudoPassword: "",
+				pm:           &ChocoManager{},
+			}
+		} else {
+			log.Println("Neither Winget nor Chocolatey found on Windows. Package management functionality will be limited.")
+		}
 	case "darwin":
+		os, err := platformInfoMac()
+		if err != nil {
+			return nil
+		}
+		_, err = shell.ExecLookPath("brew")
+		if err == nil {
+			return &OSManager{
+				OS:           os,
+				SudoPassword: sudoPassword,
+				pm:           &HomebrewManager{},
+			}
+		} else {
+			manager := &HomebrewManager{}
+			manager.InstallManager()
+			return &OSManager{
+				OS:           os,
+				SudoPassword: sudoPassword,
+				pm:           manager,
+			}
+		}
 	default:
 		log.Fatal("Operating system not supported")
 	}
@@ -43,7 +96,7 @@ func (o *OSManager) Install(packages []string) error {
 	if len(packages) == 0 {
 		return nil
 	}
-	err := InstallWithProgress(o, packages)
+	err := InstallWithProgress(o.pm, packages)
 	if err != nil {
 		return err
 	}
@@ -51,7 +104,7 @@ func (o *OSManager) Install(packages []string) error {
 }
 
 func (o *OSManager) InstallPackage(pkg string) error {
-	return InstallPackage(o.OS.InstallCommand, pkg, o.SudoPassword)
+	return o.pm.InstallPackage(pkg) //(o.OS.InstallCommand, pkg, o.SudoPassword)
 }
 
 func (o *OSManager) InstallBuildEssentials() error {
@@ -59,42 +112,19 @@ func (o *OSManager) InstallBuildEssentials() error {
 }
 
 func (o *OSManager) RemovePackage(pkg string) error {
-	fullCmd := fmt.Sprintf("%s %s", o.OS.RemoveCommand, pkg)
-	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
-	command.Stdin = strings.NewReader(o.SudoPassword + "\n")
-	return command.Run()
+	return o.pm.RemovePackage(pkg)
 }
 
 func (o *OSManager) SearchPackage(pkg string) []string {
-	cmdParts := strings.Fields(o.OS.SearchCommand)
-	if len(cmdParts) == 0 {
-		log.Printf("Invalid search command for OS package manager")
-		return []string{}
-	}
-
-	cmd := shell.ExecCommand(cmdParts[0], append(cmdParts[1:], pkg)...)
-	packages, err := cmd.Output()
-	if err != nil {
-		log.Printf("Error fetching %s packages: %v", o.OS.PackageManager, err)
-		return []string{}
-	}
-
-	packageList := strings.Split(strings.TrimSpace(string(packages)), "\n")
-	return packageList
+	return o.pm.SearchPackage(pkg)
 }
 
 func (o *OSManager) UpdatePackage(pkg string) error {
-	fullCmd := fmt.Sprintf("%s %s", o.OS.UpdateCommand, pkg)
-	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
-	command.Stdin = strings.NewReader(o.SudoPassword + "\n")
-	return command.Run()
+	return o.pm.UpdatePackage(pkg)
 }
 
 func (o *OSManager) UpdateAllPackages() error {
-	fullCmd := fmt.Sprintf("%s", o.OS.UpdateCommand)
-	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
-	command.Stdin = strings.NewReader(o.SudoPassword + "\n")
-	return command.Run()
+	return o.pm.UpdateAllPackages()
 }
 
 type OS struct {
@@ -102,10 +132,6 @@ type OS struct {
 	Name           string
 	Version        string
 	PackageManager string
-	InstallCommand string
-	SearchCommand  string
-	RemoveCommand  string
-	UpdateCommand  string
 }
 
 func parseOsRelease(osRelease string) *OS {
@@ -113,11 +139,6 @@ func parseOsRelease(osRelease string) *OS {
 	result.ID = "Unknown"
 	result.Name = "Unknown"
 	result.Version = "Unknown"
-	result.PackageManager = "Unkown"
-	result.InstallCommand = "Unkown"
-	result.SearchCommand = "Unkown"
-	result.RemoveCommand = "Unkown"
-	result.UpdateCommand = "Unkown"
 
 	lines := strings.Split(osRelease, "\n")
 
@@ -135,22 +156,6 @@ func parseOsRelease(osRelease string) *OS {
 			result.Version = strings.Trim(splitLine[1], "\"")
 		}
 	}
-	err := result.getPackageManager()
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = result.getInstallCommand()
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = result.getSearchCommand()
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = result.getUpdateCommand()
-	if err != nil {
-		log.Fatal(err)
-	}
 	return &result
 }
 
@@ -164,98 +169,6 @@ func GetLinuxDistribution() (*OS, error) {
 	return parseOsRelease(string(osRelease)), nil
 }
 
-func (os *OS) getPackageManager() error {
-	switch os.ID {
-	case "debian", "ubuntu":
-		os.PackageManager = "apt"
-		return nil
-	case "arch":
-		os.PackageManager = "pacman"
-		return nil
-	case "fedora":
-		os.PackageManager = "dnf"
-		return nil
-	default:
-		pmcommands := []string{
-			"apt",
-			"dnf",
-			"pacman",
-		}
-		for _, pmname := range pmcommands {
-			_, err := shell.ExecLookPath(pmname)
-			if err == nil {
-				os.PackageManager = pmname
-				return nil
-			}
-		}
-		return fmt.Errorf("no packagemanager found for os: %s", os)
-	}
-}
-
-func (os *OS) getInstallCommand() error {
-	switch os.PackageManager {
-	case "apt":
-		os.InstallCommand = "apt install -y"
-		return nil
-	case "pacman":
-		os.InstallCommand = "pacman -S --noconfirm --needed"
-		return nil
-	case "dnf":
-		os.InstallCommand = "dnf install -y --best"
-		return nil
-	default:
-		return fmt.Errorf("no install command found for package manager: %s", os.ID)
-	}
-}
-
-func (os *OS) getSearchCommand() error {
-	switch os.PackageManager {
-	case "apt":
-		os.SearchCommand = "apt search"
-		return nil
-	case "pacman":
-		os.SearchCommand = "pacman -Ss"
-		return nil
-	case "dnf":
-		os.SearchCommand = "dnf search"
-		return nil
-	default:
-		return fmt.Errorf("no install command found for package manager: %s", os.ID)
-	}
-}
-
-func (os *OS) getDeleteCommand() error {
-	switch os.PackageManager {
-	case "apt":
-		os.RemoveCommand = "apt remove"
-		return nil
-	case "pacman":
-		os.RemoveCommand = "pacman -R"
-		return nil
-	case "dnf":
-		os.RemoveCommand = "dnf remove"
-		return nil
-	default:
-		return fmt.Errorf("no install command found for package manager: %s", os.ID)
-	}
-}
-
-func (os *OS) getUpdateCommand() error {
-	switch os.PackageManager {
-	case "apt":
-		os.UpdateCommand = "apt update"
-		return nil
-	case "pacman":
-		os.UpdateCommand = "pacman -S"
-		return nil
-	case "dnf":
-		os.UpdateCommand = "dnf update"
-		return nil
-	default:
-		return fmt.Errorf("no install command found for package manager: %s", os.ID)
-	}
-}
-
 func InstallBuildEssentials(os *OS, sudoPassword string) error {
 	var command string
 	switch os.PackageManager {
@@ -275,3 +188,45 @@ func InstallBuildEssentials(os *OS, sudoPassword string) error {
 	}
 	return nil
 }
+
+func getSysctlValue(key string) (string, error) {
+	stdout, err := shell.ExecCommand(".", "sysctl", key).Output()
+	if err != nil {
+		return "", err
+	}
+	version := strings.TrimPrefix(string(stdout), key+": ")
+	return strings.TrimSpace(version), nil
+}
+
+func platformInfoMac() (*OS, error) {
+	var result OS
+	result.ID = "Unknown"
+	result.Name = "MacOS"
+	result.Version = "Unknown"
+
+	version, err := getSysctlValue("kern.osproductversion")
+	if err != nil {
+		return nil, err
+	}
+	result.Version = version
+	ID, err := getSysctlValue("kern.osversion")
+	if err != nil {
+		return nil, err
+	}
+	result.ID = ID
+
+	return &result, nil
+}
+
+func getPlatformInfo() (*OS, error) {
+	switch runtime.GOOS {
+	case "windows":
+		return platformInfoWin()
+	case "darwin":
+		return platformInfoMac()
+	case "linux":
+		return GetLinuxDistribution()
+	default:
+		return nil, fmt.Errorf("unsupported operating system: %s", runtime.GOOS)
+	}
+}
diff --git a/packagemanager/os_test.go b/packagemanager/os_test.go
index 25dbf58..f4d76eb 100644
--- a/packagemanager/os_test.go
+++ b/packagemanager/os_test.go
@@ -41,13 +41,4 @@ VERSION_ID="20.04"
 	if os.Version != "20.04" {
 		t.Errorf("Expected Version to be '20.04', got %s", os.Version)
 	}
-	if os.PackageManager != "apt" {
-		t.Errorf("Expected PackageManager to be 'apt', got %s", os.PackageManager)
-	}
-	if os.InstallCommand != "apt install -y" {
-		t.Errorf("Expected InstallCommand to be 'apt install -y', got %s", os.InstallCommand)
-	}
-	if os.SearchCommand != "apt search" {
-		t.Errorf("Expected SearchCommand to be 'apt search', got %s", os.SearchCommand)
-	}
 }
diff --git a/packagemanager/pacman.go b/packagemanager/pacman.go
new file mode 100644
index 0000000..94f018b
--- /dev/null
+++ b/packagemanager/pacman.go
@@ -0,0 +1,76 @@
+package packagemanager
+
+import (
+	"fmt"
+	"log"
+	"strings"
+	"system_setup_tool/internal/shell"
+)
+
+type PacmanManager struct {
+	SudoPassword string
+}
+
+func (m *PacmanManager) Install(packages []string) error {
+	if len(packages) == 0 {
+		return nil
+	}
+	err := InstallWithProgress(m, packages)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (m *PacmanManager) Name() string {
+	return "OS Home Manager"
+}
+
+func (m *PacmanManager) InstallManager() error {
+	return nil
+}
+
+func (m *PacmanManager) InstallPackage(pkg string) error {
+	cmd := "pacman -S --noconfirm --needed"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(m.SudoPassword + "\n")
+	return command.Run()
+}
+
+func (m *PacmanManager) RemovePackage(pkg string) error {
+	cmd := "pacman -R"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(m.SudoPassword + "\n")
+	return command.Run()
+}
+
+func (p *PacmanManager) SearchPackage(pkg string) []string {
+	cmd := "pacman -Ss"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(p.SudoPassword + "\n")
+	packages, err := command.Output()
+	if err != nil {
+		log.Printf("error fetching %s packages: %v", p.Name(), err)
+	}
+	packageList := strings.Split(strings.TrimSpace(string(packages)), "\n")
+	return packageList
+}
+
+func (p *PacmanManager) UpdatePackage(pkg string) error {
+	cmd := "pacman -S"
+	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(p.SudoPassword + "\n")
+	return command.Run()
+}
+
+func (p *PacmanManager) UpdateAllPackages() error {
+	cmd := "apt -S"
+	fullCmd := fmt.Sprintf("%s", cmd)
+	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
+	command.Stdin = strings.NewReader(p.SudoPassword + "\n")
+	return command.Run()
+}
diff --git a/packagemanager/win.go b/packagemanager/win.go
new file mode 100644
index 0000000..4488b57
--- /dev/null
+++ b/packagemanager/win.go
@@ -0,0 +1,30 @@
+//go:build windows
+// +build windows
+
+package packagemanager
+
+import (
+	"fmt"
+
+	"golang.org/x/sys/windows/registry"
+)
+
+func platformInfoWin() (*OS, error) {
+	var result OS
+	result.ID = "Unknown"
+	result.Name = "Windows"
+	result.Version = "Unknown"
+
+	key, _ := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
+
+	productName, _, _ := key.GetStringValue("ProductName")
+	currentBuild, _, _ := key.GetStringValue("CurrentBuildNumber")
+	displayVersion, _, _ := key.GetStringValue("DisplayVersion")
+	releaseId, _, _ := key.GetStringValue("ReleaseId")
+
+	result.Name = productName
+	result.Version = fmt.Sprintf("%s (Build: %s)", releaseId, currentBuild)
+	result.ID = displayVersion
+
+	return &result, key.Close()
+}
diff --git a/packagemanager/win_dummy.go b/packagemanager/win_dummy.go
new file mode 100644
index 0000000..3482159
--- /dev/null
+++ b/packagemanager/win_dummy.go
@@ -0,0 +1,8 @@
+//go:build linux
+// +build linux
+
+package packagemanager
+
+func platformInfoWin() (*OS, error) {
+	return nil, nil
+}
-- 
2.47.2


From fc966df8f574f1bac15e7a52471e0aecde586dff Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Mon, 20 Jan 2025 21:33:07 +0100
Subject: [PATCH 08/22] docs: update changelog.md

---
 changelog.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/changelog.md b/changelog.md
index f7bbf83..b012ff6 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.4.0] - 2025-01-20
+
+### 🚀 Features
+
+- *(cli)* Add update and update-all command
+- *(packagemanager)* Added packagemanager definitions for winget and chocolatey
+- *(cli,packagemanager)* Implemented first working windows and macos versions
+
+## [0.3.1] - 2025-01-19
+
+### 🐛 Bug Fixes
+
+- Fix nil pointer execution if no proper packagemanager selected
+
 ## [0.3.0] - 2025-01-18
 
 ### 🚀 Features
@@ -19,6 +33,10 @@ All notable changes to this project will be documented in this file.
 - Seperate files, function and structs into seperate packages
 - Move main.go back to project root
 
+### 📚 Documentation
+
+- Update changelog.md
+
 ## [0.2.0] - 2025-01-16
 
 ### 🚀 Features
-- 
2.47.2


From 05e774764fb1c7cb7da8d5cca9d90b689fc24acb Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Mon, 20 Jan 2025 21:37:13 +0100
Subject: [PATCH 09/22] fix(packagemanager): added missing build tag for macos

---
 packagemanager/win_dummy.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packagemanager/win_dummy.go b/packagemanager/win_dummy.go
index 3482159..b98c8d2 100644
--- a/packagemanager/win_dummy.go
+++ b/packagemanager/win_dummy.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build linux || darwin
+// +build linux darwin
 
 package packagemanager
 
-- 
2.47.2


From 0306ad36ef1a299d5c74143afbc92d8cd3f50f6c Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Mon, 20 Jan 2025 21:37:35 +0100
Subject: [PATCH 10/22] docs: update changelog.md

---
 changelog.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index b012ff6..2846d08 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.4.0] - 2025-01-20
+## [unreleased]
 
 ### 🚀 Features
 
@@ -10,6 +10,14 @@ All notable changes to this project will be documented in this file.
 - *(packagemanager)* Added packagemanager definitions for winget and chocolatey
 - *(cli,packagemanager)* Implemented first working windows and macos versions
 
+### 🐛 Bug Fixes
+
+- *(packagemanager)* Added missing build tag for macos
+
+### 📚 Documentation
+
+- Update changelog.md
+
 ## [0.3.1] - 2025-01-19
 
 ### 🐛 Bug Fixes
-- 
2.47.2


From afaf7707aa03c63a50481f068e7b9d4264c4b0d4 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Mon, 20 Jan 2025 22:10:19 +0100
Subject: [PATCH 11/22] feat(cli): add concurrent execution of search and
 update to improve performance

---
 changelog.md          |  2 +-
 cmd/search_cmd.go     | 36 ++++++++++++++++++++++---
 cmd/update_command.go | 62 ++++++++++++++++++++++++++++++++++---------
 packagemanager/dnf.go |  7 ++---
 4 files changed, 85 insertions(+), 22 deletions(-)

diff --git a/changelog.md b/changelog.md
index 2846d08..b7242bf 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [unreleased]
+## [0.4.0] - 2025-01-20
 
 ### 🚀 Features
 
diff --git a/cmd/search_cmd.go b/cmd/search_cmd.go
index 6fe1f68..ca92f53 100644
--- a/cmd/search_cmd.go
+++ b/cmd/search_cmd.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"runtime"
 	"strings"
+	"sync"
 
 	pm "system_setup_tool/packagemanager"
 
@@ -57,9 +58,7 @@ var searchCmd = &cobra.Command{
 			return
 		}
 
-		for _, manager := range managers {
-			searchAndDisplayResults(manager, packageName)
-		}
+		searchConcurrently(managers, packageName)
 	},
 }
 
@@ -79,3 +78,34 @@ func searchAndDisplayResults(manager pm.PackageManager, packageName string) {
 	displayResults(results, manager.Name())
 	fmt.Println()
 }
+
+func searchConcurrently(managers []pm.PackageManager, packageName string) {
+	var wg sync.WaitGroup
+	results := make(chan struct {
+		manager pm.PackageManager
+		results []string
+	}, len(managers))
+
+	for _, manager := range managers {
+		wg.Add(1)
+		go func(m pm.PackageManager) {
+			defer wg.Done()
+			searchResults := m.SearchPackage(packageName)
+			results <- struct {
+				manager pm.PackageManager
+				results []string
+			}{m, searchResults}
+		}(manager)
+	}
+
+	go func() {
+		wg.Wait()
+		close(results)
+	}()
+
+	for result := range results {
+		fmt.Printf("Results from %s:\n", result.manager.Name())
+		displayResults(result.results, result.manager.Name())
+		fmt.Println()
+	}
+}
diff --git a/cmd/update_command.go b/cmd/update_command.go
index a6162b5..14c0621 100644
--- a/cmd/update_command.go
+++ b/cmd/update_command.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"runtime"
+	"sync"
 	pm "system_setup_tool/packagemanager"
 	"system_setup_tool/utils"
 
@@ -64,20 +65,55 @@ var updateAllCmd = &cobra.Command{
 	Use:   "update-all",
 	Short: "update all packages with all package managers.",
 	Run: func(cmd *cobra.Command, args []string) {
-		sudoPassword, err := utils.GetSudoPassword()
-		if err != nil {
-			log.Fatal(err)
-		}
 
-		managers := []pm.PackageManager{
-			pm.NewOSManager(sudoPassword),
-			&pm.HomebrewManager{},
-			&pm.FlatpakManager{},
-			&pm.PipxManager{},
-		}
-		for _, m := range managers {
-			fmt.Printf("Updating %s-Packages\n", m.Name())
-			m.UpdateAllPackages()
+		var managers []pm.PackageManager
+		switch runtime.GOOS {
+		case "linux":
+			sudoPassword, err := utils.GetSudoPassword()
+			if err != nil {
+				log.Fatal(err)
+			}
+			managers = []pm.PackageManager{
+				pm.NewOSManager(sudoPassword),
+				&pm.HomebrewManager{},
+				&pm.FlatpakManager{},
+				&pm.PipxManager{},
+			}
+		case "windows":
+			managers = []pm.PackageManager{
+				pm.NewOSManager(""),
+				&pm.WingetManager{},
+				&pm.ChocoManager{},
+				&pm.PipxManager{},
+			}
+		case "darwin":
+			sudoPassword, err := utils.GetSudoPassword()
+			if err != nil {
+				log.Fatal(err)
+			}
+			managers = []pm.PackageManager{
+				pm.NewOSManager(sudoPassword),
+				&pm.PipxManager{},
+			}
+		default:
+			log.Println("No Package Managers found")
 		}
+		updateAllConcurrently(managers)
 	},
 }
+
+func updateAllConcurrently(managers []pm.PackageManager) {
+	var wg sync.WaitGroup
+	for _, m := range managers {
+		wg.Add(1)
+		go func(manager pm.PackageManager) {
+			defer wg.Done()
+			fmt.Printf("Updating %s-Packages\n", manager.Name())
+			err := manager.UpdateAllPackages()
+			if err != nil {
+				log.Printf("Error updating %s: %v\n", manager.Name(), err)
+			}
+		}(m)
+	}
+	wg.Wait()
+}
diff --git a/packagemanager/dnf.go b/packagemanager/dnf.go
index d68a59f..6c539b2 100644
--- a/packagemanager/dnf.go
+++ b/packagemanager/dnf.go
@@ -47,11 +47,8 @@ func (d *DnfManager) RemovePackage(pkg string) error {
 }
 
 func (d *DnfManager) SearchPackage(pkg string) []string {
-	cmd := "dnf search -y"
-	fullCmd := fmt.Sprintf("%s %s", cmd, pkg)
-	command := shell.ExecCommand("sudo", "-S", "sh", "-c", fullCmd)
-	command.Stdin = strings.NewReader(d.SudoPassword + "\n")
-	packages, err := command.Output()
+	cmd := shell.ExecCommand("dnf", "search", pkg)
+	packages, err := cmd.Output()
 	if err != nil {
 		log.Printf("error fetching %s packages: %v", d.Name(), err)
 	}
-- 
2.47.2


From 53a50f2be47d2ab868ae31b1760db3c53f3b437e Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Wed, 22 Jan 2025 13:21:47 +0100
Subject: [PATCH 12/22] fix(packagemanager): reimplement getPackagemanager to
 enable installing buildtools on linux

---
 packagemanager/os.go | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/packagemanager/os.go b/packagemanager/os.go
index efc84d6..703e887 100644
--- a/packagemanager/os.go
+++ b/packagemanager/os.go
@@ -156,6 +156,10 @@ func parseOsRelease(osRelease string) *OS {
 			result.Version = strings.Trim(splitLine[1], "\"")
 		}
 	}
+	err := result.getPackageManager()
+	if err != nil {
+		log.Fatal(err)
+	}
 	return &result
 }
 
@@ -230,3 +234,31 @@ func getPlatformInfo() (*OS, error) {
 		return nil, fmt.Errorf("unsupported operating system: %s", runtime.GOOS)
 	}
 }
+
+func (os *OS) getPackageManager() error {
+	switch os.ID {
+	case "debian", "ubuntu":
+		os.PackageManager = "apt"
+		return nil
+	case "arch":
+		os.PackageManager = "pacman"
+		return nil
+	case "fedora":
+		os.PackageManager = "dnf"
+		return nil
+	default:
+		pmcommands := []string{
+			"apt",
+			"dnf",
+			"pacman",
+		}
+		for _, pmname := range pmcommands {
+			_, err := shell.ExecLookPath(pmname)
+			if err == nil {
+				os.PackageManager = pmname
+				return nil
+			}
+		}
+		return fmt.Errorf("no packagemanager found fos os: %s", os.Name)
+	}
+}
-- 
2.47.2


From 70dbc9e062484df79bb1838218ec9643583aa93e Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Thu, 23 Jan 2025 07:59:26 +0100
Subject: [PATCH 13/22] feat(cli): add aliases to commands

---
 cmd/cmd.go            |  7 ++++---
 cmd/install_cmd.go    |  7 ++++---
 cmd/search_cmd.go     |  7 ++++---
 cmd/update_command.go |  9 +++++----
 config.toml           |  3 ---
 magefile.go           | 14 +++-----------
 6 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/cmd/cmd.go b/cmd/cmd.go
index c940ea8..7b5a390 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -10,9 +10,10 @@ import (
 )
 
 var RootCmd = &cobra.Command{
-	Use:   "system_setup_tool",
-	Short: "Installs packages based on TOML configuration",
-	Run:   tui.Run,
+	Use:     "system_setup_tool",
+	Short:   "Installs packages based on TOML configuration",
+	Version: "0.4.0",
+	Run:     tui.Run,
 }
 
 func init() {
diff --git a/cmd/install_cmd.go b/cmd/install_cmd.go
index be9de12..b12d83f 100644
--- a/cmd/install_cmd.go
+++ b/cmd/install_cmd.go
@@ -12,9 +12,10 @@ import (
 )
 
 var installCmd = &cobra.Command{
-	Use:   "install [package_name]",
-	Short: "Install a package with the specified package manager",
-	Args:  cobra.ExactArgs(1),
+	Use:     "install [package_name]",
+	Short:   "Install a package with the specified package manager",
+	Args:    cobra.ExactArgs(1),
+	Aliases: []string{"i"},
 	Run: func(cmd *cobra.Command, args []string) {
 		packageName := args[0]
 		managerName, _ := cmd.Flags().GetString("manager")
diff --git a/cmd/search_cmd.go b/cmd/search_cmd.go
index ca92f53..7d1dff3 100644
--- a/cmd/search_cmd.go
+++ b/cmd/search_cmd.go
@@ -13,9 +13,10 @@ import (
 )
 
 var searchCmd = &cobra.Command{
-	Use:   "search [package_name]",
-	Short: "Search for a package across package managers (will search in os|flatpak|homebrew)",
-	Args:  cobra.ExactArgs(1),
+	Use:     "search [package_name]",
+	Short:   "Search for a package across package managers (will search in os|flatpak|homebrew)",
+	Args:    cobra.ExactArgs(1),
+	Aliases: []string{"s"},
 	Run: func(cmd *cobra.Command, args []string) {
 		packageName := args[0]
 		managerName, _ := cmd.Flags().GetString("manager")
diff --git a/cmd/update_command.go b/cmd/update_command.go
index 14c0621..79e2d09 100644
--- a/cmd/update_command.go
+++ b/cmd/update_command.go
@@ -12,10 +12,11 @@ import (
 )
 
 var updateCmd = &cobra.Command{
-	Use:   "update [package_name]",
-	Short: "update a package with the specified package manager.",
-	Long:  "update a package with the specified package manager.\nIf no package specified, all packages for the package manager will be updated",
-	Args:  cobra.ExactArgs(1),
+	Use:     "update [package_name]",
+	Short:   "update a package with the specified package manager.",
+	Long:    "update a package with the specified package manager.\nIf no package specified, all packages for the package manager will be updated",
+	Args:    cobra.ExactArgs(1),
+	Aliases: []string{"u"},
 	Run: func(cmd *cobra.Command, args []string) {
 		packageName := args[0]
 		managerName, _ := cmd.Flags().GetString("manager")
diff --git a/config.toml b/config.toml
index 9d94c2c..6dd18cd 100644
--- a/config.toml
+++ b/config.toml
@@ -101,8 +101,6 @@ packages = [
   'hyprutils',
   'kitty',
   'mako',
-  'SwayNotificationCenter',
-  'SwayNotificationCenter-zsh-completion',
   'mpv',
   'pidgin',
   'remmina',
@@ -110,7 +108,6 @@ packages = [
   'virt-manager',
   'vlc',
   'waybar',
-  'nwg-panel',
   'nwg-look',
   'xdg-desktop-portal-hyprland',
   'zathura',
diff --git a/magefile.go b/magefile.go
index eb85b08..b0be26b 100644
--- a/magefile.go
+++ b/magefile.go
@@ -16,9 +16,8 @@ import (
 
 // A build step that requires additional params, or platform specific steps for example
 func Build() error {
-	mg.Deps(InstallDeps)
 	fmt.Println("Building...")
-	cmd := exec.Command("go", "build", "-o", "system_setup_tool", ".")
+	cmd := exec.Command("go", "build", "-o", "sst", ".")
 	return cmd.Run()
 }
 
@@ -26,20 +25,13 @@ func Build() error {
 func Install() error {
 	mg.Deps(Build)
 	fmt.Println("Installing...")
-	return os.Rename("./system_setup_tool", "/usr/bin/system_setup_tool")
-}
-
-// Manage your deps, or running package managers.
-func InstallDeps() error {
-	fmt.Println("Installing Deps...")
-	cmd := exec.Command("go", "get", "github.com/stretchr/piglatin")
-	return cmd.Run()
+	return os.Rename("./sst", "~/.local/bin/sst")
 }
 
 // Clean up after yourself
 func Clean() {
 	fmt.Println("Cleaning...")
-	os.RemoveAll("MyApp")
+	os.RemoveAll("system_setup_tool")
 }
 
 // Use gofmt to format your code
-- 
2.47.2


From f8abf29594a677ebc82016cbad03400edb9be72c Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Fri, 24 Jan 2025 08:10:09 +0100
Subject: [PATCH 14/22] feat(config): add creation of default config if no
 config exists

---
 cmd/cmd.go  |  65 +++++++++++++++++++++++++++--
 config.toml | 115 ----------------------------------------------------
 2 files changed, 62 insertions(+), 118 deletions(-)
 delete mode 100644 config.toml

diff --git a/cmd/cmd.go b/cmd/cmd.go
index 7b5a390..3218b50 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -2,7 +2,9 @@ package cmd
 
 import (
 	"fmt"
+	"log"
 	"os"
+	"path/filepath"
 	"system_setup_tool/tui"
 
 	"github.com/spf13/cobra"
@@ -51,11 +53,68 @@ func initConfig() {
 	} else {
 		viper.SetConfigName("config")
 		viper.SetConfigType("toml")
-		viper.AddConfigPath(".")
+		dirname, err := os.UserConfigDir()
+		if err != nil {
+			log.Println("cant obtain config dir")
+		} else {
+			viper.AddConfigPath(filepath.Join(dirname, "sst"))
+		}
 	}
 
 	if err := viper.ReadInConfig(); err != nil {
-		fmt.Println("Error reading configuration file:", err)
-		os.Exit(1)
+		if _, ok := err.(viper.ConfigFileNotFoundError); ok {
+			fmt.Println("no config file found, creating a new one...")
+			if err := createDefaultConfig(); err != nil {
+				log.Printf("error creating default config: %v\n", err)
+				os.Exit(1)
+			}
+		} else {
+			log.Printf("error reading config file: %v\n", err)
+			os.Exit(1)
+		}
 	}
 }
+
+func createDefaultConfig() error {
+	v := viper.New()
+
+	v.SetDefault("config", "")
+	v.SetDefault("headless", true)
+
+	v.SetDefault("dotfiles.enable", false)
+	v.SetDefault("dotfiles.git_repo", "")
+
+	v.SetDefault("package_managers.cargo.enable", false)
+	v.SetDefault("package_managers.cargo.packages", []string{})
+
+	v.SetDefault("package_managers.flatpak.enable", false)
+	v.SetDefault("package_managers.flatpak.packages", []string{})
+
+	v.SetDefault("package_managers.go.enable", false)
+	v.SetDefault("package_managers.go.packages", []string{})
+
+	v.SetDefault("package_managers.homebrew.enable", false)
+	v.SetDefault("package_managers.homebrew.packages", []string{})
+
+	v.SetDefault("package_managers.pipx.enable", false)
+	v.SetDefault("package_managers.pipx.packages", []string{})
+
+	v.SetDefault("package_managers.os.enable", true)
+	v.SetDefault("package_managers.os.packages", []string{})
+
+	configDir := filepath.Join(os.Getenv("HOME"), ".config", "sst")
+	if err := os.MkdirAll(configDir, 0755); err != nil {
+		return fmt.Errorf("error creating config dir: %w", err)
+	}
+
+	configPath := filepath.Join(configDir, "config.toml")
+	v.SetConfigFile(configPath)
+	v.SetConfigType("toml")
+
+	if err := v.WriteConfig(); err != nil {
+		return fmt.Errorf("error writing default config: %w", err)
+	}
+
+	fmt.Println("default config created:", configPath)
+	return nil
+}
diff --git a/config.toml b/config.toml
deleted file mode 100644
index 6dd18cd..0000000
--- a/config.toml
+++ /dev/null
@@ -1,115 +0,0 @@
-config = ''
-headless = true
-
-[dotfiles]
-enable = false
-git_repo = 'https://codeberg.org/Pata1704/dotfiles.git'
-
-[package_managers]
-[package_managers.cargo]
-enable = true
-packages = ['typst-cli']
-
-[package_managers.flatpak]
-enable = true
-packages = [
-  'com.spotify.Client',
-  'us.zoom.Zoom',
-  'org.zotero.Zotero',
-  'com.google.AndroidStudio',
-  'io.freetubeapp.FreeTube',
-  'com.discordapp.Discord',
-  'com.nextcloud.desktopclient.nextcloud',
-  'com.github.tchx84.Flatseal',
-  'io.github.flattool.Warehouse',
-  'org.onlyoffice.desktopeditors',
-]
-
-[package_managers.go]
-enable = true
-packages = [
-  'github.com/stefanlogue/meteor',
-  'golang.org/x/tools/gopls',
-  'github.com/go-delve/delve/cmd/dlv',
-  'github.com/air-verse/air',
-]
-
-[package_managers.homebrew]
-enable = true
-packages = [
-  'oh-my-posh',
-  'fd',
-  'fzf',
-  'ripgrep',
-  'neovim',
-  'helix',
-  'node',
-  'yazi',
-  'zk',
-  'bat',
-  'bottom',
-  'btop',
-  'git-cliff',
-  'glow',
-  'lazygit',
-  'goreleaser',
-  'harlequin',
-  'mage',
-  'posting',
-  'typst',
-  'wails',
-  'zoxide',
-  'lsd',
-  'jq',
-  'yq',
-  'timewarrior',
-  'tmux',
-  'fastfetch',
-  'stow',
-  'distrobox',
-]
-
-[package_managers.pipx]
-enable = true
-packages = ['euporie']
-
-[package_managers.os]
-enable = true
-packages = [
-  'git',
-  'curl',
-  'wget',
-  'biber',
-  'bear',
-  'docker',
-  'docker-compose',
-  'zsh',
-  'npm',
-  'task',
-  'tree-sitter-cli',
-  'python3-pip',
-  'latexmk',
-  'luarocks',
-  'flameshot',
-  'fuzzel',
-  'hyprcursor',
-  'hypridle',
-  'hyprland',
-  'hyprland-qtutils',
-  'hyprlock',
-  'hyprpaper',
-  'hyprutils',
-  'kitty',
-  'mako',
-  'mpv',
-  'pidgin',
-  'remmina',
-  'thunderbird-i18n-de',
-  'virt-manager',
-  'vlc',
-  'waybar',
-  'nwg-look',
-  'xdg-desktop-portal-hyprland',
-  'zathura',
-  'zathura-pdf-mupdf',
-]
-- 
2.47.2


From 8ed3b0c01302889a6e6c37aed6c8708e0562f948 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Fri, 24 Jan 2025 09:24:59 +0100
Subject: [PATCH 15/22] feat(cli): add history command and logging for actions

---
 changelog.md            | 13 +++++++++++++
 cmd/cmd.go              | 17 +++++++++++++++--
 cmd/history_cmd.go      | 28 ++++++++++++++++++++++++++++
 cmd/install_cmd.go      |  3 +++
 cmd/package_commands.go | 10 ++++++++++
 cmd/remove_cmd.go       |  3 +++
 cmd/search_cmd.go       |  4 ++++
 cmd/update_command.go   |  8 ++++++++
 utils/utils.go          | 28 ++++++++++++++++++++++++++--
 9 files changed, 110 insertions(+), 4 deletions(-)
 create mode 100644 cmd/history_cmd.go

diff --git a/changelog.md b/changelog.md
index b7242bf..a5ec126 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [unreleased]
+
+### 🚀 Features
+
+- *(cli)* Add concurrent execution of search and update to improve performance
+- *(cli)* Add aliases to commands
+- *(config)* Add creation of default config if no config exists
+
+### 🐛 Bug Fixes
+
+- *(packagemanager)* Reimplement getPackagemanager to enable installing buildtools on linux
+
 ## [0.4.0] - 2025-01-20
 
 ### 🚀 Features
@@ -16,6 +28,7 @@ All notable changes to this project will be documented in this file.
 
 ### 📚 Documentation
 
+- Update changelog.md
 - Update changelog.md
 
 ## [0.3.1] - 2025-01-19
diff --git a/cmd/cmd.go b/cmd/cmd.go
index 3218b50..1c2e2c9 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -43,8 +43,21 @@ func init() {
 
 	updateCmd.Flags().StringP("manager", "m", "os", "The package manager you want to update packages with. (Options: os|homebrew|pipx|flatpak)")
 
-	packageCmd.AddCommand(addCmd, deleteCmd, showCmd, enableCmd)
-	RootCmd.AddCommand(packageCmd, searchCmd, installCmd, removeCmd, updateCmd, updateAllCmd)
+	packageCmd.AddCommand(
+		addCmd,
+		deleteCmd,
+		showCmd,
+		enableCmd,
+	)
+	RootCmd.AddCommand(
+		packageCmd,
+		searchCmd,
+		installCmd,
+		removeCmd,
+		updateCmd,
+		updateAllCmd,
+		historyCmd,
+	)
 }
 
 func initConfig() {
diff --git a/cmd/history_cmd.go b/cmd/history_cmd.go
new file mode 100644
index 0000000..f6b198c
--- /dev/null
+++ b/cmd/history_cmd.go
@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+
+	"github.com/spf13/cobra"
+)
+
+var historyCmd = &cobra.Command{
+	Use:   "history",
+	Short: "Zeigt die Befehlshistorie an",
+	Run: func(cmd *cobra.Command, args []string) {
+		dirname, err := os.UserConfigDir()
+		if err != nil {
+			log.Printf("error getting user config dir: %v\n", err)
+		}
+		historyFile := filepath.Join(dirname, "sst", "sst_history")
+		content, err := os.ReadFile(historyFile)
+		if err != nil {
+			fmt.Println("error reading history: ", err)
+			return
+		}
+		fmt.Println(string(content))
+	},
+}
diff --git a/cmd/install_cmd.go b/cmd/install_cmd.go
index b12d83f..7e4c7a7 100644
--- a/cmd/install_cmd.go
+++ b/cmd/install_cmd.go
@@ -51,5 +51,8 @@ var installCmd = &cobra.Command{
 		if err := manager.Install([]string{packageName}); err != nil {
 			log.Printf("error: %v\n", err)
 		}
+		if err := utils.LogToHistory("installed", packageName, manager.Name()); err != nil {
+			fmt.Println("error logging action:", err)
+		}
 	},
 }
diff --git a/cmd/package_commands.go b/cmd/package_commands.go
index d3b50f5..74aec53 100644
--- a/cmd/package_commands.go
+++ b/cmd/package_commands.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"sort"
+	"system_setup_tool/utils"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -58,6 +59,9 @@ var addCmd = &cobra.Command{
 		}
 
 		fmt.Printf("Package %s has been added to the configuration for %s\n", name, manager)
+		if err := utils.LogToHistory("added", name, manager); err != nil {
+			fmt.Println("error logging action:", err)
+		}
 	},
 }
 
@@ -120,6 +124,9 @@ var deleteCmd = &cobra.Command{
 			}
 
 			fmt.Printf("Package %s was not found in the configuration for %s\n", name, manager)
+			if err := utils.LogToHistory("removed", name, manager); err != nil {
+				fmt.Println("error logging action:", err)
+			}
 		}
 	},
 }
@@ -187,5 +194,8 @@ var enableCmd = &cobra.Command{
 		}
 
 		fmt.Printf("Package manager %s has been %s\n", manager, map[bool]string{true: "enabled", false: "disabled"}[enable])
+		if err := utils.LogToHistory("enabled", "", manager); err != nil {
+			fmt.Println("error logging action:", err)
+		}
 	},
 }
diff --git a/cmd/remove_cmd.go b/cmd/remove_cmd.go
index 30b80f2..36c4bff 100644
--- a/cmd/remove_cmd.go
+++ b/cmd/remove_cmd.go
@@ -50,5 +50,8 @@ var removeCmd = &cobra.Command{
 		if err := manager.RemovePackage(packageName); err != nil {
 			log.Printf("error: %v\n", err)
 		}
+		if err := utils.LogToHistory("removed", packageName, manager.Name()); err != nil {
+			fmt.Println("error logging action:", err)
+		}
 	},
 }
diff --git a/cmd/search_cmd.go b/cmd/search_cmd.go
index 7d1dff3..3b9c28e 100644
--- a/cmd/search_cmd.go
+++ b/cmd/search_cmd.go
@@ -8,6 +8,7 @@ import (
 	"sync"
 
 	pm "system_setup_tool/packagemanager"
+	"system_setup_tool/utils"
 
 	"github.com/spf13/cobra"
 )
@@ -108,5 +109,8 @@ func searchConcurrently(managers []pm.PackageManager, packageName string) {
 		fmt.Printf("Results from %s:\n", result.manager.Name())
 		displayResults(result.results, result.manager.Name())
 		fmt.Println()
+		if err := utils.LogToHistory("searched", packageName, result.manager.Name()); err != nil {
+			fmt.Println("error logging action:", err)
+		}
 	}
 }
diff --git a/cmd/update_command.go b/cmd/update_command.go
index 79e2d09..6f5ca15 100644
--- a/cmd/update_command.go
+++ b/cmd/update_command.go
@@ -53,10 +53,18 @@ var updateCmd = &cobra.Command{
 		if packageName != "" {
 			if err := manager.UpdatePackage(packageName); err != nil {
 				log.Printf("error: %v\n", err)
+			} else {
+				if err := utils.LogToHistory("updated", packageName, manager.Name()); err != nil {
+					fmt.Println("error logging action:", err)
+				}
 			}
 		} else {
 			if err := manager.UpdateAllPackages(); err != nil {
 				log.Printf("error: %v\n", err)
+			} else {
+				if err := utils.LogToHistory("updated", "all", "all"); err != nil {
+					fmt.Println("error logging action:", err)
+				}
 			}
 		}
 	},
diff --git a/utils/utils.go b/utils/utils.go
index 9024846..a3679f8 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -2,6 +2,9 @@ package utils
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+	"time"
 
 	"github.com/charmbracelet/huh"
 )
@@ -11,7 +14,7 @@ func GetSudoPassword() (string, error) {
 	form := huh.NewForm(
 		huh.NewGroup(
 			huh.NewInput().
-				Title("Bitte geben Sie Ihr sudo-Passwort ein").
+				Title("Enter your password").
 				EchoMode(huh.EchoModePassword).
 				Value(&password),
 		),
@@ -19,7 +22,7 @@ func GetSudoPassword() (string, error) {
 
 	err := form.Run()
 	if err != nil {
-		return "", fmt.Errorf("fehler bei der Passwortabfrage: %v", err)
+		return "", fmt.Errorf("error at password-dialog: %v", err)
 	}
 	return password, nil
 }
@@ -30,3 +33,24 @@ func max(a, b int) int {
 	}
 	return b
 }
+
+func LogToHistory(action, pkg, manager string) error {
+	dirname, err := os.UserConfigDir()
+	if err != nil {
+		return fmt.Errorf("cant obtain config dir: %v", err)
+	}
+	historyFile := filepath.Join(dirname, "sst", "sst_history")
+	f, err := os.OpenFile(historyFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	timestamp := time.Now().Format("2006-01-02 15:04:05")
+	logEntry := fmt.Sprintf("%s: action: [%s] - package: [%s] - packagemanager: [%s]\n", timestamp, action, pkg, manager)
+
+	if _, err := f.WriteString(logEntry); err != nil {
+		return err
+	}
+	return nil
+}
-- 
2.47.2


From 7d4a54b34ccad17f906211362676b26ee0e723f5 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Fri, 24 Jan 2025 10:11:32 +0100
Subject: [PATCH 16/22] feat(cli): add max history length

---
 cmd/history_cmd.go |  3 ++-
 utils/utils.go     | 60 ++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/cmd/history_cmd.go b/cmd/history_cmd.go
index f6b198c..2b1fedb 100644
--- a/cmd/history_cmd.go
+++ b/cmd/history_cmd.go
@@ -11,7 +11,8 @@ import (
 
 var historyCmd = &cobra.Command{
 	Use:   "history",
-	Short: "Zeigt die Befehlshistorie an",
+	Short: "show command history",
+	Long:  "Shows history of the last 2000 commands",
 	Run: func(cmd *cobra.Command, args []string) {
 		dirname, err := os.UserConfigDir()
 		if err != nil {
diff --git a/utils/utils.go b/utils/utils.go
index a3679f8..59c7fba 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/charmbracelet/huh"
@@ -34,23 +35,68 @@ func max(a, b int) int {
 	return b
 }
 
+const (
+	maxHistoryLines = 2000
+	historyFileName = "sst_history"
+)
+
+// func LogToHistory(action, pkg, manager string) error {
+// 	dirname, err := os.UserConfigDir()
+// 	if err != nil {
+// 		return fmt.Errorf("cant obtain config dir: %v", err)
+// 	}
+// 	historyFile := filepath.Join(dirname, "sst", "sst_history")
+// 	f, err := os.OpenFile(historyFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+// 	if err != nil {
+// 		return err
+// 	}
+// 	defer f.Close()
+
+// 	timestamp := time.Now().Format("2006-01-02 15:04:05")
+// 	logEntry := fmt.Sprintf("%s: action: [%s] - package: [%s] - packagemanager: [%s]\n", timestamp, action, pkg, manager)
+
+// 	if _, err := f.WriteString(logEntry); err != nil {
+// 		return err
+// 	}
+// 	return nil
+// }
+//
+
 func LogToHistory(action, pkg, manager string) error {
 	dirname, err := os.UserConfigDir()
 	if err != nil {
 		return fmt.Errorf("cant obtain config dir: %v", err)
 	}
-	historyFile := filepath.Join(dirname, "sst", "sst_history")
-	f, err := os.OpenFile(historyFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	historyFile := filepath.Join(dirname, "sst", historyFileName)
+
+	lines, err := readHistoryLines(historyFile)
 	if err != nil {
 		return err
 	}
-	defer f.Close()
 
 	timestamp := time.Now().Format("2006-01-02 15:04:05")
-	logEntry := fmt.Sprintf("%s: action: [%s] - package: [%s] - packagemanager: [%s]\n", timestamp, action, pkg, manager)
+	newLine := fmt.Sprintf("%s: action: [%s] - package: [%s] - packagemanager: [%s]", timestamp, action, pkg, manager)
+	lines = append(lines, newLine)
 
-	if _, err := f.WriteString(logEntry); err != nil {
-		return err
+	if len(lines) > maxHistoryLines {
+		lines = lines[len(lines)-maxHistoryLines:]
 	}
-	return nil
+
+	return writeHistoryLines(historyFile, lines)
+}
+
+func readHistoryLines(filePath string) ([]string, error) {
+	content, err := os.ReadFile(filePath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return []string{}, nil
+		}
+		return nil, err
+	}
+	return strings.Split(string(content), "\n"), nil
+}
+
+func writeHistoryLines(filePath string, lines []string) error {
+	content := strings.Join(lines, "\n")
+	return os.WriteFile(filePath, []byte(content), 0644)
 }
-- 
2.47.2


From b18b7761fce146b5a8db3bf3b138f37b82f2f365 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Fri, 24 Jan 2025 10:24:48 +0100
Subject: [PATCH 17/22] refactor(cli): perform code clean up

---
 utils/utils.go | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/utils/utils.go b/utils/utils.go
index 59c7fba..33d87e5 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -40,28 +40,6 @@ const (
 	historyFileName = "sst_history"
 )
 
-// func LogToHistory(action, pkg, manager string) error {
-// 	dirname, err := os.UserConfigDir()
-// 	if err != nil {
-// 		return fmt.Errorf("cant obtain config dir: %v", err)
-// 	}
-// 	historyFile := filepath.Join(dirname, "sst", "sst_history")
-// 	f, err := os.OpenFile(historyFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	defer f.Close()
-
-// 	timestamp := time.Now().Format("2006-01-02 15:04:05")
-// 	logEntry := fmt.Sprintf("%s: action: [%s] - package: [%s] - packagemanager: [%s]\n", timestamp, action, pkg, manager)
-
-// 	if _, err := f.WriteString(logEntry); err != nil {
-// 		return err
-// 	}
-// 	return nil
-// }
-//
-
 func LogToHistory(action, pkg, manager string) error {
 	dirname, err := os.UserConfigDir()
 	if err != nil {
@@ -75,8 +53,8 @@ func LogToHistory(action, pkg, manager string) error {
 	}
 
 	timestamp := time.Now().Format("2006-01-02 15:04:05")
-	newLine := fmt.Sprintf("%s: action: [%s] - package: [%s] - packagemanager: [%s]", timestamp, action, pkg, manager)
-	lines = append(lines, newLine)
+	logEntry := fmt.Sprintf("%s: action: [%s] - package: [%s] - packagemanager: [%s]", timestamp, action, pkg, manager)
+	lines = append(lines, logEntry)
 
 	if len(lines) > maxHistoryLines {
 		lines = lines[len(lines)-maxHistoryLines:]
-- 
2.47.2


From 3519efeccc99c6fbe2bd103359dda3be821d761f Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Fri, 24 Jan 2025 10:28:04 +0100
Subject: [PATCH 18/22] update Changelog.md

---
 changelog.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index a5ec126..a64bd84 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,18 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
-## [unreleased]
+## [0.5.0] - 2025-01-24
 
 ### 🚀 Features
 
 - *(cli)* Add concurrent execution of search and update to improve performance
 - *(cli)* Add aliases to commands
 - *(config)* Add creation of default config if no config exists
+- *(cli)* Add history command and logging for actions
+- *(cli)* Add max history length
 
 ### 🐛 Bug Fixes
 
 - *(packagemanager)* Reimplement getPackagemanager to enable installing buildtools on linux
 
+### 🚜 Refactor
+
+- *(cli)* Perform code clean up
+
 ## [0.4.0] - 2025-01-20
 
 ### 🚀 Features
-- 
2.47.2


From 11b8541630458937021a2884e794d94c9572e841 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Fri, 31 Jan 2025 17:56:02 +0100
Subject: [PATCH 19/22] feat(cli): add check command

---
 cmd/check_cmd.go                 | 49 ++++++++++++++++++++++++++++++++
 cmd/cmd.go                       |  3 ++
 packagemanager/apt.go            |  5 ++++
 packagemanager/cargo.go          | 11 +++++++
 packagemanager/choco.go          |  5 ++++
 packagemanager/dnf.go            |  5 ++++
 packagemanager/flatpak.go        |  5 ++++
 packagemanager/golang.go         | 11 +++++++
 packagemanager/homebrew.go       |  5 ++++
 packagemanager/os.go             |  4 +++
 packagemanager/packagemanager.go |  1 +
 packagemanager/pacman.go         |  5 ++++
 packagemanager/pipx.go           | 10 ++++++-
 packagemanager/winget.go         |  5 ++++
 14 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 cmd/check_cmd.go

diff --git a/cmd/check_cmd.go b/cmd/check_cmd.go
new file mode 100644
index 0000000..aab0f87
--- /dev/null
+++ b/cmd/check_cmd.go
@@ -0,0 +1,49 @@
+package cmd
+
+import (
+	"fmt"
+	"log"
+
+	pm "system_setup_tool/packagemanager"
+	"system_setup_tool/utils"
+
+	"github.com/spf13/cobra"
+)
+
+var checkCmd = &cobra.Command{
+	Use:     "check [package-name]",
+	Short:   "Check if the specified package is installed",
+	Args:    cobra.ExactArgs(1),
+	Aliases: []string{"c"},
+	Run: func(cmd *cobra.Command, args []string) {
+		packageName := args[0]
+		managerName, _ := cmd.Flags().GetString("manager")
+		var manager pm.PackageManager
+		if managerName == "os" {
+			managerName = "OS Package Manager"
+		} else if managerName == "brew" {
+			managerName = "homebrew"
+		}
+		switch managerName {
+		case "OS Package Manager":
+			manager = pm.NewOSManager("")
+		case "homebrew":
+			manager = &pm.HomebrewManager{}
+		case "cargo":
+			manager = &pm.CargoManager{}
+		case "pipx":
+			manager = &pm.PipxManager{}
+		case "flatpak":
+			manager = &pm.FlatpakManager{}
+		default:
+			fmt.Println("No PackageManager found")
+		}
+		if err := manager.Check(packageName); err != nil {
+			log.Printf("error: %v\n", err)
+		}
+		fmt.Printf("Package: %s installed\n", packageName)
+		if err := utils.LogToHistory("checked", packageName, manager.Name()); err != nil {
+			fmt.Println("error logging action:", err)
+		}
+	},
+}
diff --git a/cmd/cmd.go b/cmd/cmd.go
index 1c2e2c9..52b2f40 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -43,6 +43,8 @@ func init() {
 
 	updateCmd.Flags().StringP("manager", "m", "os", "The package manager you want to update packages with. (Options: os|homebrew|pipx|flatpak)")
 
+	checkCmd.Flags().StringP("manager", "m", "os", "The package manager you want to check for a packages with. (Options: os|homebrew|pipx|flatpak)")
+
 	packageCmd.AddCommand(
 		addCmd,
 		deleteCmd,
@@ -57,6 +59,7 @@ func init() {
 		updateCmd,
 		updateAllCmd,
 		historyCmd,
+		checkCmd,
 	)
 }
 
diff --git a/packagemanager/apt.go b/packagemanager/apt.go
index dd63647..67df45b 100644
--- a/packagemanager/apt.go
+++ b/packagemanager/apt.go
@@ -74,3 +74,8 @@ func (a *AptManager) UpdateAllPackages() error {
 	command.Stdin = strings.NewReader(a.SudoPassword + "\n")
 	return command.Run()
 }
+
+func (a *AptManager) Check(pkg string) error {
+	cmd := shell.ExecCommand("/bin/sh", "-c", fmt.Sprintf("dpkg -l | grep %s", pkg))
+	return cmd.Run()
+}
diff --git a/packagemanager/cargo.go b/packagemanager/cargo.go
index d99a0f5..fe63d6e 100644
--- a/packagemanager/cargo.go
+++ b/packagemanager/cargo.go
@@ -2,6 +2,8 @@ package packagemanager
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
 	"system_setup_tool/internal/shell"
 )
 
@@ -56,3 +58,12 @@ func (c *CargoManager) UpdatePackage(pkg string) error {
 func (c *CargoManager) UpdateAllPackages() error {
 	return fmt.Errorf("update not supported")
 }
+
+func (c *CargoManager) Check(pkg string) error {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return err
+	}
+	cmd := shell.ExecCommand("ls", filepath.Join(home, ".cargo", "bin", pkg))
+	return cmd.Run()
+}
diff --git a/packagemanager/choco.go b/packagemanager/choco.go
index 71d4c8d..dc38249 100644
--- a/packagemanager/choco.go
+++ b/packagemanager/choco.go
@@ -64,3 +64,8 @@ func (c *ChocoManager) UpdateAllPackages() error {
 	cmd := shell.ExecCommand("choco", "update")
 	return cmd.Run()
 }
+
+func (c *ChocoManager) Check(pkg string) error {
+	cmd := shell.ExecCommand("choco", "search", "--local-only", pkg)
+	return cmd.Run()
+}
diff --git a/packagemanager/dnf.go b/packagemanager/dnf.go
index 6c539b2..02be368 100644
--- a/packagemanager/dnf.go
+++ b/packagemanager/dnf.go
@@ -71,3 +71,8 @@ func (d *DnfManager) UpdateAllPackages() error {
 	command.Stdin = strings.NewReader(d.SudoPassword + "\n")
 	return command.Run()
 }
+
+func (d *DnfManager) Check(pkg string) error {
+	cmd := shell.ExecCommand("/bin/sh", "-c", fmt.Sprintf("dnf list installed | grep %s", pkg))
+	return cmd.Run()
+}
diff --git a/packagemanager/flatpak.go b/packagemanager/flatpak.go
index 2f4a72b..bfca427 100644
--- a/packagemanager/flatpak.go
+++ b/packagemanager/flatpak.go
@@ -126,3 +126,8 @@ func (f *FlatpakManager) UpdateAllPackages() error {
 	cmd := shell.ExecCommand("flatpak", "update", "-y")
 	return cmd.Run()
 }
+
+func (f *FlatpakManager) Check(pkg string) error {
+	cmd := shell.ExecCommand("/bin/sh", "-c", fmt.Sprintf("flatpak list | grep %s", pkg))
+	return cmd.Run()
+}
diff --git a/packagemanager/golang.go b/packagemanager/golang.go
index 87d779f..cfd25ab 100644
--- a/packagemanager/golang.go
+++ b/packagemanager/golang.go
@@ -2,6 +2,8 @@ package packagemanager
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
 	"system_setup_tool/internal/shell"
 )
 
@@ -56,3 +58,12 @@ func (g *GolangManager) UpdatePackage(pkg string) error {
 func (g *GolangManager) UpdateAllPackages() error {
 	return fmt.Errorf("update not supported")
 }
+
+func (g *GolangManager) Check(pkg string) error {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		fmt.Printf("error: %v\n", err)
+	}
+	cmd := shell.ExecCommand("ls", filepath.Join(home, "go", "bin", pkg))
+	return cmd.Run()
+}
diff --git a/packagemanager/homebrew.go b/packagemanager/homebrew.go
index af72153..2cf3258 100644
--- a/packagemanager/homebrew.go
+++ b/packagemanager/homebrew.go
@@ -69,3 +69,8 @@ func (h *HomebrewManager) UpdateAllPackages() error {
 	cmd := shell.ExecCommand("brew", "upgrade")
 	return cmd.Run()
 }
+
+func (h *HomebrewManager) Check(pkg string) error {
+	cmd := shell.ExecCommand("brew", "list", pkg)
+	return cmd.Run()
+}
diff --git a/packagemanager/os.go b/packagemanager/os.go
index 703e887..a1d6dff 100644
--- a/packagemanager/os.go
+++ b/packagemanager/os.go
@@ -127,6 +127,10 @@ func (o *OSManager) UpdateAllPackages() error {
 	return o.pm.UpdateAllPackages()
 }
 
+func (o *OSManager) Check(pkg string) error {
+	return o.pm.Check(pkg)
+}
+
 type OS struct {
 	ID             string
 	Name           string
diff --git a/packagemanager/packagemanager.go b/packagemanager/packagemanager.go
index 8350beb..55e5236 100644
--- a/packagemanager/packagemanager.go
+++ b/packagemanager/packagemanager.go
@@ -2,6 +2,7 @@ package packagemanager
 
 type PackageManager interface {
 	Install(packages []string) error
+	Check(pkg string) error
 	InstallPackage(pkg string) error
 	InstallManager() error
 	RemovePackage(pkg string) error
diff --git a/packagemanager/pacman.go b/packagemanager/pacman.go
index 94f018b..05cad0f 100644
--- a/packagemanager/pacman.go
+++ b/packagemanager/pacman.go
@@ -74,3 +74,8 @@ func (p *PacmanManager) UpdateAllPackages() error {
 	command.Stdin = strings.NewReader(p.SudoPassword + "\n")
 	return command.Run()
 }
+
+func (p *PacmanManager) Check(pkg string) error {
+	cmd := shell.ExecCommand("/bin/sh", "-c", fmt.Sprintf("paxman -Q | grep %s", pkg))
+	return cmd.Run()
+}
diff --git a/packagemanager/pipx.go b/packagemanager/pipx.go
index c8711ec..81d3c90 100644
--- a/packagemanager/pipx.go
+++ b/packagemanager/pipx.go
@@ -1,6 +1,9 @@
 package packagemanager
 
-import "system_setup_tool/internal/shell"
+import (
+	"fmt"
+	"system_setup_tool/internal/shell"
+)
 
 type PipxManager struct{}
 
@@ -56,3 +59,8 @@ func (p *PipxManager) UpdateAllPackages() error {
 	cmd := shell.ExecCommand("pipx", "upgrade-all")
 	return cmd.Run()
 }
+
+func (p *PipxManager) Check(pkg string) error {
+	cmd := shell.ExecCommand("/bin/sh", "-c", fmt.Sprintf("pipx list | grep %s", pkg))
+	return cmd.Run()
+}
diff --git a/packagemanager/winget.go b/packagemanager/winget.go
index 2d5d14b..bdfabad 100644
--- a/packagemanager/winget.go
+++ b/packagemanager/winget.go
@@ -64,3 +64,8 @@ func (w *WingetManager) UpdateAllPackages() error {
 	cmd := shell.ExecCommand("winget", "update")
 	return cmd.Run()
 }
+
+func (w *WingetManager) Check(pkg string) error {
+	cmd := shell.ExecCommand("wiget", "show", pkg)
+	return cmd.Run()
+}
-- 
2.47.2


From e49138fdd263c5857455661857e09479e85b4c53 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Tue, 4 Feb 2025 16:11:03 +0100
Subject: [PATCH 20/22] refactor(packagemanager,cli,tui): move packages in
 specific subfolders

---
 cmd/check_cmd.go                                         | 4 ++--
 cmd/cmd.go                                               | 2 +-
 cmd/install_cmd.go                                       | 4 ++--
 cmd/package_commands.go                                  | 2 +-
 cmd/remove_cmd.go                                        | 4 ++--
 cmd/search_cmd.go                                        | 4 ++--
 cmd/update_command.go                                    | 4 ++--
 {config => internal/config}/config.go                    | 4 ++--
 {dotfiles => internal/dotfiles}/dotfiles.go              | 0
 {tui => internal/tui}/tui.go                             | 8 ++++----
 {utils => internal/utils}/utils.go                       | 0
 {utils => internal/utils}/utils_test.go                  | 0
 {packagemanager => pkg/packagemanager}/apt.go            | 0
 {packagemanager => pkg/packagemanager}/cargo.go          | 0
 {packagemanager => pkg/packagemanager}/cargo_test.go     | 0
 {packagemanager => pkg/packagemanager}/choco.go          | 0
 {packagemanager => pkg/packagemanager}/dnf.go            | 0
 {packagemanager => pkg/packagemanager}/flatpak.go        | 0
 {packagemanager => pkg/packagemanager}/flatpak_test.go   | 0
 {packagemanager => pkg/packagemanager}/golang.go         | 0
 {packagemanager => pkg/packagemanager}/golang_test.go    | 0
 {packagemanager => pkg/packagemanager}/homebrew.go       | 0
 {packagemanager => pkg/packagemanager}/homebrew_test.go  | 0
 {packagemanager => pkg/packagemanager}/os.go             | 0
 {packagemanager => pkg/packagemanager}/os_test.go        | 0
 {packagemanager => pkg/packagemanager}/package.go        | 0
 {packagemanager => pkg/packagemanager}/packagemanager.go | 0
 {packagemanager => pkg/packagemanager}/pacman.go         | 0
 {packagemanager => pkg/packagemanager}/pipx.go           | 0
 {packagemanager => pkg/packagemanager}/pipx_test.go      | 0
 {packagemanager => pkg/packagemanager}/utils.go          | 0
 {packagemanager => pkg/packagemanager}/win.go            | 0
 {packagemanager => pkg/packagemanager}/win_dummy.go      | 0
 {packagemanager => pkg/packagemanager}/winget.go         | 0
 34 files changed, 18 insertions(+), 18 deletions(-)
 rename {config => internal/config}/config.go (85%)
 rename {dotfiles => internal/dotfiles}/dotfiles.go (100%)
 rename {tui => internal/tui}/tui.go (94%)
 rename {utils => internal/utils}/utils.go (100%)
 rename {utils => internal/utils}/utils_test.go (100%)
 rename {packagemanager => pkg/packagemanager}/apt.go (100%)
 rename {packagemanager => pkg/packagemanager}/cargo.go (100%)
 rename {packagemanager => pkg/packagemanager}/cargo_test.go (100%)
 rename {packagemanager => pkg/packagemanager}/choco.go (100%)
 rename {packagemanager => pkg/packagemanager}/dnf.go (100%)
 rename {packagemanager => pkg/packagemanager}/flatpak.go (100%)
 rename {packagemanager => pkg/packagemanager}/flatpak_test.go (100%)
 rename {packagemanager => pkg/packagemanager}/golang.go (100%)
 rename {packagemanager => pkg/packagemanager}/golang_test.go (100%)
 rename {packagemanager => pkg/packagemanager}/homebrew.go (100%)
 rename {packagemanager => pkg/packagemanager}/homebrew_test.go (100%)
 rename {packagemanager => pkg/packagemanager}/os.go (100%)
 rename {packagemanager => pkg/packagemanager}/os_test.go (100%)
 rename {packagemanager => pkg/packagemanager}/package.go (100%)
 rename {packagemanager => pkg/packagemanager}/packagemanager.go (100%)
 rename {packagemanager => pkg/packagemanager}/pacman.go (100%)
 rename {packagemanager => pkg/packagemanager}/pipx.go (100%)
 rename {packagemanager => pkg/packagemanager}/pipx_test.go (100%)
 rename {packagemanager => pkg/packagemanager}/utils.go (100%)
 rename {packagemanager => pkg/packagemanager}/win.go (100%)
 rename {packagemanager => pkg/packagemanager}/win_dummy.go (100%)
 rename {packagemanager => pkg/packagemanager}/winget.go (100%)

diff --git a/cmd/check_cmd.go b/cmd/check_cmd.go
index aab0f87..d31efcd 100644
--- a/cmd/check_cmd.go
+++ b/cmd/check_cmd.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
-	pm "system_setup_tool/packagemanager"
-	"system_setup_tool/utils"
+	"system_setup_tool/internal/utils"
+	pm "system_setup_tool/pkg/packagemanager"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/cmd.go b/cmd/cmd.go
index 52b2f40..3fda9ce 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
-	"system_setup_tool/tui"
+	"system_setup_tool/internal/tui"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
diff --git a/cmd/install_cmd.go b/cmd/install_cmd.go
index 7e4c7a7..73d179c 100644
--- a/cmd/install_cmd.go
+++ b/cmd/install_cmd.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"log"
 	"runtime"
-	"system_setup_tool/utils"
+	"system_setup_tool/internal/utils"
 
-	pm "system_setup_tool/packagemanager"
+	pm "system_setup_tool/pkg/packagemanager"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/package_commands.go b/cmd/package_commands.go
index 74aec53..d0f1da4 100644
--- a/cmd/package_commands.go
+++ b/cmd/package_commands.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 	"sort"
-	"system_setup_tool/utils"
+	"system_setup_tool/internal/utils"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
diff --git a/cmd/remove_cmd.go b/cmd/remove_cmd.go
index 36c4bff..00af703 100644
--- a/cmd/remove_cmd.go
+++ b/cmd/remove_cmd.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"log"
 	"runtime"
-	"system_setup_tool/utils"
+	"system_setup_tool/internal/utils"
 
-	pm "system_setup_tool/packagemanager"
+	pm "system_setup_tool/pkg/packagemanager"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/search_cmd.go b/cmd/search_cmd.go
index 3b9c28e..d076c94 100644
--- a/cmd/search_cmd.go
+++ b/cmd/search_cmd.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"sync"
 
-	pm "system_setup_tool/packagemanager"
-	"system_setup_tool/utils"
+	"system_setup_tool/internal/utils"
+	pm "system_setup_tool/pkg/packagemanager"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/update_command.go b/cmd/update_command.go
index 6f5ca15..1731c8c 100644
--- a/cmd/update_command.go
+++ b/cmd/update_command.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"runtime"
 	"sync"
-	pm "system_setup_tool/packagemanager"
-	"system_setup_tool/utils"
+	"system_setup_tool/internal/utils"
+	pm "system_setup_tool/pkg/packagemanager"
 
 	"github.com/spf13/cobra"
 )
diff --git a/config/config.go b/internal/config/config.go
similarity index 85%
rename from config/config.go
rename to internal/config/config.go
index fddb47a..9a8eb7e 100644
--- a/config/config.go
+++ b/internal/config/config.go
@@ -1,8 +1,8 @@
 package config
 
 import (
-	"system_setup_tool/dotfiles"
-	pm "system_setup_tool/packagemanager"
+	"system_setup_tool/internal/dotfiles"
+	pm "system_setup_tool/pkg/packagemanager"
 )
 
 type PackageManagerConfig struct {
diff --git a/dotfiles/dotfiles.go b/internal/dotfiles/dotfiles.go
similarity index 100%
rename from dotfiles/dotfiles.go
rename to internal/dotfiles/dotfiles.go
diff --git a/tui/tui.go b/internal/tui/tui.go
similarity index 94%
rename from tui/tui.go
rename to internal/tui/tui.go
index a51004e..a387915 100644
--- a/tui/tui.go
+++ b/internal/tui/tui.go
@@ -3,11 +3,11 @@ package tui
 import (
 	"fmt"
 	"log"
-	"system_setup_tool/config"
-	"system_setup_tool/dotfiles"
-	"system_setup_tool/utils"
+	"system_setup_tool/internal/config"
+	"system_setup_tool/internal/dotfiles"
+	"system_setup_tool/internal/utils"
 
-	pm "system_setup_tool/packagemanager"
+	pm "system_setup_tool/pkg/packagemanager"
 
 	"github.com/charmbracelet/huh"
 	"github.com/mitchellh/mapstructure"
diff --git a/utils/utils.go b/internal/utils/utils.go
similarity index 100%
rename from utils/utils.go
rename to internal/utils/utils.go
diff --git a/utils/utils_test.go b/internal/utils/utils_test.go
similarity index 100%
rename from utils/utils_test.go
rename to internal/utils/utils_test.go
diff --git a/packagemanager/apt.go b/pkg/packagemanager/apt.go
similarity index 100%
rename from packagemanager/apt.go
rename to pkg/packagemanager/apt.go
diff --git a/packagemanager/cargo.go b/pkg/packagemanager/cargo.go
similarity index 100%
rename from packagemanager/cargo.go
rename to pkg/packagemanager/cargo.go
diff --git a/packagemanager/cargo_test.go b/pkg/packagemanager/cargo_test.go
similarity index 100%
rename from packagemanager/cargo_test.go
rename to pkg/packagemanager/cargo_test.go
diff --git a/packagemanager/choco.go b/pkg/packagemanager/choco.go
similarity index 100%
rename from packagemanager/choco.go
rename to pkg/packagemanager/choco.go
diff --git a/packagemanager/dnf.go b/pkg/packagemanager/dnf.go
similarity index 100%
rename from packagemanager/dnf.go
rename to pkg/packagemanager/dnf.go
diff --git a/packagemanager/flatpak.go b/pkg/packagemanager/flatpak.go
similarity index 100%
rename from packagemanager/flatpak.go
rename to pkg/packagemanager/flatpak.go
diff --git a/packagemanager/flatpak_test.go b/pkg/packagemanager/flatpak_test.go
similarity index 100%
rename from packagemanager/flatpak_test.go
rename to pkg/packagemanager/flatpak_test.go
diff --git a/packagemanager/golang.go b/pkg/packagemanager/golang.go
similarity index 100%
rename from packagemanager/golang.go
rename to pkg/packagemanager/golang.go
diff --git a/packagemanager/golang_test.go b/pkg/packagemanager/golang_test.go
similarity index 100%
rename from packagemanager/golang_test.go
rename to pkg/packagemanager/golang_test.go
diff --git a/packagemanager/homebrew.go b/pkg/packagemanager/homebrew.go
similarity index 100%
rename from packagemanager/homebrew.go
rename to pkg/packagemanager/homebrew.go
diff --git a/packagemanager/homebrew_test.go b/pkg/packagemanager/homebrew_test.go
similarity index 100%
rename from packagemanager/homebrew_test.go
rename to pkg/packagemanager/homebrew_test.go
diff --git a/packagemanager/os.go b/pkg/packagemanager/os.go
similarity index 100%
rename from packagemanager/os.go
rename to pkg/packagemanager/os.go
diff --git a/packagemanager/os_test.go b/pkg/packagemanager/os_test.go
similarity index 100%
rename from packagemanager/os_test.go
rename to pkg/packagemanager/os_test.go
diff --git a/packagemanager/package.go b/pkg/packagemanager/package.go
similarity index 100%
rename from packagemanager/package.go
rename to pkg/packagemanager/package.go
diff --git a/packagemanager/packagemanager.go b/pkg/packagemanager/packagemanager.go
similarity index 100%
rename from packagemanager/packagemanager.go
rename to pkg/packagemanager/packagemanager.go
diff --git a/packagemanager/pacman.go b/pkg/packagemanager/pacman.go
similarity index 100%
rename from packagemanager/pacman.go
rename to pkg/packagemanager/pacman.go
diff --git a/packagemanager/pipx.go b/pkg/packagemanager/pipx.go
similarity index 100%
rename from packagemanager/pipx.go
rename to pkg/packagemanager/pipx.go
diff --git a/packagemanager/pipx_test.go b/pkg/packagemanager/pipx_test.go
similarity index 100%
rename from packagemanager/pipx_test.go
rename to pkg/packagemanager/pipx_test.go
diff --git a/packagemanager/utils.go b/pkg/packagemanager/utils.go
similarity index 100%
rename from packagemanager/utils.go
rename to pkg/packagemanager/utils.go
diff --git a/packagemanager/win.go b/pkg/packagemanager/win.go
similarity index 100%
rename from packagemanager/win.go
rename to pkg/packagemanager/win.go
diff --git a/packagemanager/win_dummy.go b/pkg/packagemanager/win_dummy.go
similarity index 100%
rename from packagemanager/win_dummy.go
rename to pkg/packagemanager/win_dummy.go
diff --git a/packagemanager/winget.go b/pkg/packagemanager/winget.go
similarity index 100%
rename from packagemanager/winget.go
rename to pkg/packagemanager/winget.go
-- 
2.47.2


From 0cc50e15c920f60e4dc808e3a2d3fc06ecf2408a Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Tue, 4 Feb 2025 16:11:55 +0100
Subject: [PATCH 21/22] docs(cli): update version

---
 cmd/cmd.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/cmd.go b/cmd/cmd.go
index 3fda9ce..796c07a 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -14,7 +14,7 @@ import (
 var RootCmd = &cobra.Command{
 	Use:     "system_setup_tool",
 	Short:   "Installs packages based on TOML configuration",
-	Version: "0.4.0",
+	Version: "0.6.0-alpha",
 	Run:     tui.Run,
 }
 
-- 
2.47.2


From 179e2a6ec3b07e0ab571d5970d0cb77aa4f66d20 Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Tue, 4 Feb 2025 16:16:18 +0100
Subject: [PATCH 22/22] chore(docs): prepare release

---
 changelog.md | 14 ++++++++++++++
 cmd/cmd.go   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index a64bd84..ac3aeeb 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.6.0] - 2025-02-04
+
+### 🚀 Features
+
+- *(cli)* Add check command
+
+### 🚜 Refactor
+
+- *(packagemanager,cli,tui)* Move packages in specific subfolders
+
+### 📚 Documentation
+
+- *(cli)* Update version
+
 ## [0.5.0] - 2025-01-24
 
 ### 🚀 Features
diff --git a/cmd/cmd.go b/cmd/cmd.go
index 796c07a..92de0c4 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -14,7 +14,7 @@ import (
 var RootCmd = &cobra.Command{
 	Use:     "system_setup_tool",
 	Short:   "Installs packages based on TOML configuration",
-	Version: "0.6.0-alpha",
+	Version: "0.6.0",
 	Run:     tui.Run,
 }
 
-- 
2.47.2