From 36ebbef6d7dfe62583c643970a1859df14dc7bd7 Mon Sep 17 00:00:00 2001
From: Menno van Leeuwen <menno@vleeuwen.me>
Date: Wed, 22 Jan 2025 16:00:37 +0100
Subject: [PATCH] refactor: streamline Nix installation process and simplify
 pipx installation

---
 setup.sh | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/setup.sh b/setup.sh
index 75562a1..549d0be 100755
--- a/setup.sh
+++ b/setup.sh
@@ -141,10 +141,6 @@ install_nix() {
     
     sh install-nix.sh install || die "Failed to install Nix"
     . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh || die "Failed to source Nix profile"
-
-    log_success "Nix has been installed. Please open a new shell and re-run the script."
-    log_info "'~/dotfiles/setup.sh --continue' to continue setup."
-    exit 0
 }
 
 setup_symlinks() {
@@ -248,15 +244,7 @@ ensure_pipx() {
     if ! command -v pipx >/dev/null 2>&1; then
         log_info "Installing pipx..."
         
-        # On Fedora/RedHat, install pipx using dnf
-        if command -v dnf >/dev/null 2>&1; then
-            sudo dnf install pipx || die "Failed to install pipx"
-        fi
-
-        # On Ubuntu/Debian, install pipx using apt
-        if command -v apt >/dev/null 2>&1; then
-            sudo apt install pipx || die "Failed to install pipx"
-        fi
+        attempt_package_install "pipx"
 
         # On Arch Linux, install pipx using pacman
         if command -v pacman >/dev/null 2>&1; then