fix: use proper go version in module file

.github/workflows/ci.yaml

@@ -32,9 +32,9 @@ jobs:
           go-version: "1.25.0"
 
       - name: lint
-        uses: golangci/golangci-lint-action@v8
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v2.5.0
+          version: latest
 
   nix-build:
     strategy:
@@ -44,7 +44,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: DeterminateSystems/nix-installer-action@v17
+      - uses: cachix/install-nix-action@v30
+        with:
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: nix-community/cache-nix-action@v6
         with:

cmd/cli_test.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/karol-broda/snitch/internal/errutil"
 	"github.com/karol-broda/snitch/internal/testutil"
 )
 
@@ -408,16 +407,16 @@ func TestEnvironmentVariables(t *testing.T) {
 		oldEnvVars := make(map[string]string)
 		for key, value := range tt.envVars {
 			oldEnvVars[key] = os.Getenv(key)
-			errutil.Setenv(key, value)
+			os.Setenv(key, value)
 		}
 
 		// Clean up environment variables
 		defer func() {
 			for key, oldValue := range oldEnvVars {
 				if oldValue == "" {
-					errutil.Unsetenv(key)
+					os.Unsetenv(key)
 				} else {
-					errutil.Setenv(key, oldValue)
+					os.Setenv(key, oldValue)
 				}
 			}
 		}()

cmd/ls.go

@@ -8,18 +8,16 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"github.com/karol-broda/snitch/internal/collector"
+	"github.com/karol-broda/snitch/internal/color"
+	"github.com/karol-broda/snitch/internal/config"
+	"github.com/karol-broda/snitch/internal/resolver"
 	"strconv"
 	"strings"
 	"text/tabwriter"
 
 	"github.com/charmbracelet/lipgloss"
 	"github.com/spf13/cobra"
-
-	"github.com/karol-broda/snitch/internal/collector"
-	"github.com/karol-broda/snitch/internal/color"
-	"github.com/karol-broda/snitch/internal/config"
-	"github.com/karol-broda/snitch/internal/errutil"
-	"github.com/karol-broda/snitch/internal/resolver"
 	"github.com/tidwall/pretty"
 	"golang.org/x/term"
 )
@@ -187,7 +185,7 @@ func printCSV(conns []collector.Connection, headers bool, timestamp bool, select
 
 func printPlainTable(conns []collector.Connection, headers bool, timestamp bool, selectedFields []string) {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
-	defer errutil.Flush(w)
+	defer w.Flush()
 
 	if len(selectedFields) == 0 {
 		selectedFields = []string{"pid", "process", "user", "proto", "state", "laddr", "lport", "raddr", "rport"}
@@ -201,7 +199,7 @@ func printPlainTable(conns []collector.Connection, headers bool, timestamp bool,
 		for _, field := range selectedFields {
 			headerRow = append(headerRow, strings.ToUpper(field))
 		}
-		errutil.Ignore(fmt.Fprintln(w, strings.Join(headerRow, "\t")))
+		fmt.Fprintln(w, strings.Join(headerRow, "\t"))
 	}
 
 	for _, conn := range conns {
@@ -210,7 +208,7 @@ func printPlainTable(conns []collector.Connection, headers bool, timestamp bool,
 		for _, field := range selectedFields {
 			row = append(row, fieldMap[field])
 		}
-		errutil.Ignore(fmt.Fprintln(w, strings.Join(row, "\t")))
+		fmt.Fprintln(w, strings.Join(row, "\t"))
 	}
 }
 

cmd/stats.go

@@ -8,6 +8,7 @@ import (
 	"log"
 	"os"
 	"os/signal"
+	"github.com/karol-broda/snitch/internal/collector"
 	"sort"
 	"strconv"
 	"strings"
@@ -16,9 +17,6 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-
-	"github.com/karol-broda/snitch/internal/collector"
-	"github.com/karol-broda/snitch/internal/errutil"
 )
 
 type StatsData struct {
@@ -229,19 +227,19 @@ func printStatsCSV(stats *StatsData, headers bool) {
 
 func printStatsTable(stats *StatsData, headers bool) {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
-	defer errutil.Flush(w)
+	defer w.Flush()
 
 	if headers {
-		errutil.Ignore(fmt.Fprintf(w, "TIMESTAMP\t%s\n", stats.Timestamp.Format(time.RFC3339)))
-		errutil.Ignore(fmt.Fprintf(w, "TOTAL CONNECTIONS\t%d\n", stats.Total))
-		errutil.Ignore(fmt.Fprintln(w))
+		fmt.Fprintf(w, "TIMESTAMP\t%s\n", stats.Timestamp.Format(time.RFC3339))
+		fmt.Fprintf(w, "TOTAL CONNECTIONS\t%d\n", stats.Total)
+		fmt.Fprintln(w)
 	}
 
 	// Protocol breakdown
 	if len(stats.ByProto) > 0 {
 		if headers {
-			errutil.Ignore(fmt.Fprintln(w, "BY PROTOCOL:"))
-			errutil.Ignore(fmt.Fprintln(w, "PROTO\tCOUNT"))
+			fmt.Fprintln(w, "BY PROTOCOL:")
+			fmt.Fprintln(w, "PROTO\tCOUNT")
 		}
 		protocols := make([]string, 0, len(stats.ByProto))
 		for proto := range stats.ByProto {
@@ -249,16 +247,16 @@ func printStatsTable(stats *StatsData, headers bool) {
 		}
 		sort.Strings(protocols)
 		for _, proto := range protocols {
-			errutil.Ignore(fmt.Fprintf(w, "%s\t%d\n", strings.ToUpper(proto), stats.ByProto[proto]))
+			fmt.Fprintf(w, "%s\t%d\n", strings.ToUpper(proto), stats.ByProto[proto])
 		}
-		errutil.Ignore(fmt.Fprintln(w))
+		fmt.Fprintln(w)
 	}
 
 	// State breakdown
 	if len(stats.ByState) > 0 {
 		if headers {
-			errutil.Ignore(fmt.Fprintln(w, "BY STATE:"))
-			errutil.Ignore(fmt.Fprintln(w, "STATE\tCOUNT"))
+			fmt.Fprintln(w, "BY STATE:")
+			fmt.Fprintln(w, "STATE\tCOUNT")
 		}
 		states := make([]string, 0, len(stats.ByState))
 		for state := range stats.ByState {
@@ -266,16 +264,16 @@ func printStatsTable(stats *StatsData, headers bool) {
 		}
 		sort.Strings(states)
 		for _, state := range states {
-			errutil.Ignore(fmt.Fprintf(w, "%s\t%d\n", state, stats.ByState[state]))
+			fmt.Fprintf(w, "%s\t%d\n", state, stats.ByState[state])
 		}
-		errutil.Ignore(fmt.Fprintln(w))
+		fmt.Fprintln(w)
 	}
 
 	// Process breakdown (top 10)
 	if len(stats.ByProc) > 0 {
 		if headers {
-			errutil.Ignore(fmt.Fprintln(w, "BY PROCESS (TOP 10):"))
-			errutil.Ignore(fmt.Fprintln(w, "PID\tPROCESS\tCOUNT"))
+			fmt.Fprintln(w, "BY PROCESS (TOP 10):")
+			fmt.Fprintln(w, "PID\tPROCESS\tCOUNT")
 		}
 		limit := 10
 		if len(stats.ByProc) < limit {
@@ -283,7 +281,7 @@ func printStatsTable(stats *StatsData, headers bool) {
 		}
 		for i := 0; i < limit; i++ {
 			proc := stats.ByProc[i]
-			errutil.Ignore(fmt.Fprintf(w, "%d\t%s\t%d\n", proc.PID, proc.Process, proc.Count))
+			fmt.Fprintf(w, "%d\t%s\t%d\n", proc.PID, proc.Process, proc.Count)
 		}
 	}
 }

cmd/upgrade.go

@@ -18,7 +18,6 @@ import (
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 
-	"github.com/karol-broda/snitch/internal/errutil"
 	"github.com/karol-broda/snitch/internal/tui"
 )
 
@@ -94,13 +93,13 @@ func runUpgrade(cmd *cobra.Command, args []string) error {
 
 	if currentClean == latestClean {
 		green := color.New(color.FgGreen)
-		errutil.Println(green, tui.SymbolSuccess+" you are running the latest version")
+		green.Println(tui.SymbolSuccess + " you are running the latest version")
 		return nil
 	}
 
 	if current == "dev" {
 		yellow := color.New(color.FgYellow)
-		errutil.Println(yellow, tui.SymbolWarning+" you are running a development build")
+		yellow.Println(tui.SymbolWarning + " you are running a development build")
 		fmt.Println()
 		fmt.Println("use one of the methods below to install a release version:")
 		fmt.Println()
@@ -109,7 +108,7 @@ func runUpgrade(cmd *cobra.Command, args []string) error {
 	}
 
 	green := color.New(color.FgGreen, color.Bold)
-	errutil.Printf(green, tui.SymbolSuccess+" update available: %s "+tui.SymbolArrowRight+" %s\n", current, latest)
+	green.Printf(tui.SymbolSuccess+" update available: %s "+tui.SymbolArrowRight+" %s\n", current, latest)
 	fmt.Println()
 
 	if !upgradeYes {
@@ -117,8 +116,8 @@ func runUpgrade(cmd *cobra.Command, args []string) error {
 		fmt.Println()
 		faint := color.New(color.Faint)
 		cmdStyle := color.New(color.FgCyan)
-		errutil.Print(faint, "  in-place      ")
-		errutil.Println(cmdStyle, "snitch upgrade --yes")
+		faint.Print("  in-place      ")
+		cmdStyle.Println("snitch upgrade --yes")
 		return nil
 	}
 
@@ -135,17 +134,17 @@ func handleSpecificVersion(current, target string) error {
 
 	if isVersionLower(targetClean, firstUpgradeVersion) {
 		yellow := color.New(color.FgYellow)
-		errutil.Printf(yellow, tui.SymbolWarning+" warning: the upgrade command was introduced in v%s\n", firstUpgradeVersion)
+		yellow.Printf(tui.SymbolWarning+" warning: the upgrade command was introduced in v%s\n", firstUpgradeVersion)
 		faint := color.New(color.Faint)
-		errutil.Printf(faint, "  version %s does not include this command\n", target)
-		errutil.Println(faint, "  you will need to use other methods to upgrade from that version")
+		faint.Printf("  version %s does not include this command\n", target)
+		faint.Println("  you will need to use other methods to upgrade from that version")
 		fmt.Println()
 	}
 
 	currentClean := strings.TrimPrefix(current, "v")
 	if currentClean == targetClean {
 		green := color.New(color.FgGreen)
-		errutil.Println(green, tui.SymbolSuccess+" you are already running this version")
+		green.Println(tui.SymbolSuccess + " you are already running this version")
 		return nil
 	}
 
@@ -154,15 +153,15 @@ func handleSpecificVersion(current, target string) error {
 		cmdStyle := color.New(color.FgCyan)
 		if isVersionLower(targetClean, currentClean) {
 			yellow := color.New(color.FgYellow)
-			errutil.Printf(yellow, tui.SymbolArrowDown+" this will downgrade from %s to %s\n", current, target)
+			yellow.Printf(tui.SymbolArrowDown+" this will downgrade from %s to %s\n", current, target)
 		} else {
 			green := color.New(color.FgGreen)
-			errutil.Printf(green, tui.SymbolArrowUp+" this will upgrade from %s to %s\n", current, target)
+			green.Printf(tui.SymbolArrowUp+" this will upgrade from %s to %s\n", current, target)
 		}
 		fmt.Println()
-		errutil.Print(faint, "run ")
-		errutil.Printf(cmdStyle, "snitch upgrade --version %s --yes", target)
-		errutil.Println(faint, " to proceed")
+		faint.Print("run ")
+		cmdStyle.Printf("snitch upgrade --version %s --yes", target)
+		faint.Println(" to proceed")
 		return nil
 	}
 
@@ -176,20 +175,20 @@ func handleNixUpgrade(current, latest string) error {
 	currentCommit := extractCommitFromVersion(current)
 	dirty := isNixDirty(current)
 
-	errutil.Print(faint, "current  ")
-	errutil.Print(version, current)
+	faint.Print("current  ")
+	version.Print(current)
 	if currentCommit != "" {
-		errutil.Printf(faint, " (commit %s)", currentCommit)
+		faint.Printf(" (commit %s)", currentCommit)
 	}
 	fmt.Println()
 
-	errutil.Print(faint, "latest   ")
-	errutil.Println(version, latest)
+	faint.Print("latest   ")
+	version.Println(latest)
 	fmt.Println()
 
 	if dirty {
 		yellow := color.New(color.FgYellow)
-		errutil.Println(yellow, tui.SymbolWarning+" you are running a dirty nix build (uncommitted changes)")
+		yellow.Println(tui.SymbolWarning + " you are running a dirty nix build (uncommitted changes)")
 		fmt.Println()
 		printNixUpgradeInstructions()
 		return nil
@@ -197,8 +196,8 @@ func handleNixUpgrade(current, latest string) error {
 
 	if currentCommit == "" {
 		yellow := color.New(color.FgYellow)
-		errutil.Println(yellow, tui.SymbolWarning+" this is a nix installation")
-		errutil.Println(faint, "  nix store is immutable; use nix commands to upgrade")
+		yellow.Println(tui.SymbolWarning + " this is a nix installation")
+		faint.Println("  nix store is immutable; use nix commands to upgrade")
 		fmt.Println()
 		printNixUpgradeInstructions()
 		return nil
@@ -206,11 +205,11 @@ func handleNixUpgrade(current, latest string) error {
 
 	releaseCommit, err := fetchCommitForTag(latest)
 	if err != nil {
-		errutil.Printf(faint, "  (could not fetch release commit: %v)\n", err)
+		faint.Printf("  (could not fetch release commit: %v)\n", err)
 		fmt.Println()
 		yellow := color.New(color.FgYellow)
-		errutil.Println(yellow, tui.SymbolWarning+" this is a nix installation")
-		errutil.Println(faint, "  nix store is immutable; use nix commands to upgrade")
+		yellow.Println(tui.SymbolWarning + " this is a nix installation")
+		faint.Println("  nix store is immutable; use nix commands to upgrade")
 		fmt.Println()
 		printNixUpgradeInstructions()
 		return nil
@@ -223,20 +222,20 @@ func handleNixUpgrade(current, latest string) error {
 
 	if strings.HasPrefix(releaseCommit, currentCommit) || strings.HasPrefix(currentCommit, releaseShort) {
 		green := color.New(color.FgGreen)
-		errutil.Printf(green, tui.SymbolSuccess+" you are running %s (commit %s)\n", latest, releaseShort)
+		green.Printf(tui.SymbolSuccess+" you are running %s (commit %s)\n", latest, releaseShort)
 		return nil
 	}
 
 	comparison, err := compareCommits(latest, currentCommit)
 	if err != nil {
 		green := color.New(color.FgGreen, color.Bold)
-		errutil.Printf(green, tui.SymbolSuccess+" update available: %s "+tui.SymbolArrowRight+" %s\n", currentCommit, latest)
-		errutil.Printf(faint, "  your commit: %s\n", currentCommit)
-		errutil.Printf(faint, "  release:     %s (%s)\n", releaseShort, latest)
+		green.Printf(tui.SymbolSuccess+" update available: %s "+tui.SymbolArrowRight+" %s\n", currentCommit, latest)
+		faint.Printf("  your commit: %s\n", currentCommit)
+		faint.Printf("  release:     %s (%s)\n", releaseShort, latest)
 		fmt.Println()
 		yellow := color.New(color.FgYellow)
-		errutil.Println(yellow, tui.SymbolWarning+" this is a nix installation")
-		errutil.Println(faint, "  nix store is immutable; use nix commands to upgrade")
+		yellow.Println(tui.SymbolWarning + " this is a nix installation")
+		faint.Println("  nix store is immutable; use nix commands to upgrade")
 		fmt.Println()
 		printNixUpgradeInstructions()
 		return nil
@@ -244,30 +243,30 @@ func handleNixUpgrade(current, latest string) error {
 
 	if comparison.AheadBy > 0 {
 		cyan := color.New(color.FgCyan)
-		errutil.Printf(cyan, tui.SymbolArrowUp+" you are %d commit(s) ahead of %s\n", comparison.AheadBy, latest)
-		errutil.Printf(faint, "  your commit: %s\n", currentCommit)
-		errutil.Printf(faint, "  release:     %s (%s)\n", releaseShort, latest)
+		cyan.Printf(tui.SymbolArrowUp+" you are %d commit(s) ahead of %s\n", comparison.AheadBy, latest)
+		faint.Printf("  your commit: %s\n", currentCommit)
+		faint.Printf("  release:     %s (%s)\n", releaseShort, latest)
 		fmt.Println()
-		errutil.Println(faint, "you are running a newer build than the latest release")
+		faint.Println("you are running a newer build than the latest release")
 		return nil
 	}
 
 	if comparison.BehindBy > 0 {
 		green := color.New(color.FgGreen, color.Bold)
-		errutil.Printf(green, tui.SymbolSuccess+" update available: %d commit(s) behind %s\n", comparison.BehindBy, latest)
-		errutil.Printf(faint, "  your commit: %s\n", currentCommit)
-		errutil.Printf(faint, "  release:     %s (%s)\n", releaseShort, latest)
+		green.Printf(tui.SymbolSuccess+" update available: %d commit(s) behind %s\n", comparison.BehindBy, latest)
+		faint.Printf("  your commit: %s\n", currentCommit)
+		faint.Printf("  release:     %s (%s)\n", releaseShort, latest)
 		fmt.Println()
 		yellow := color.New(color.FgYellow)
-		errutil.Println(yellow, tui.SymbolWarning+" this is a nix installation")
-		errutil.Println(faint, "  nix store is immutable; use nix commands to upgrade")
+		yellow.Println(tui.SymbolWarning + " this is a nix installation")
+		faint.Println("  nix store is immutable; use nix commands to upgrade")
 		fmt.Println()
 		printNixUpgradeInstructions()
 		return nil
 	}
 
 	green := color.New(color.FgGreen)
-	errutil.Printf(green, tui.SymbolSuccess+" you are running %s (commit %s)\n", latest, releaseShort)
+	green.Printf(tui.SymbolSuccess+" you are running %s (commit %s)\n", latest, releaseShort)
 	return nil
 }
 
@@ -279,22 +278,22 @@ func handleNixSpecificVersion(current, target string) error {
 	printVersionComparisonTarget(current, target)
 
 	yellow := color.New(color.FgYellow)
-	errutil.Println(yellow, tui.SymbolWarning+" this is a nix installation")
+	yellow.Println(tui.SymbolWarning + " this is a nix installation")
 	faint := color.New(color.Faint)
-	errutil.Println(faint, "  nix store is immutable; in-place upgrades are not supported")
+	faint.Println("  nix store is immutable; in-place upgrades are not supported")
 	fmt.Println()
 
 	bold := color.New(color.Bold)
 	cmd := color.New(color.FgCyan)
 
-	errutil.Println(bold, "to install a specific version with nix:")
+	bold.Println("to install a specific version with nix:")
 	fmt.Println()
 
-	errutil.Print(faint, "  specific ref    ")
-	errutil.Printf(cmd, "nix profile install github:%s/%s/%s\n", repoOwner, repoName, target)
+	faint.Print("  specific ref    ")
+	cmd.Printf("nix profile install github:%s/%s/%s\n", repoOwner, repoName, target)
 
-	errutil.Print(faint, "  latest          ")
-	errutil.Printf(cmd, "nix profile install github:%s/%s\n", repoOwner, repoName)
+	faint.Print("  latest          ")
+	cmd.Printf("nix profile install github:%s/%s\n", repoOwner, repoName)
 
 	return nil
 }
@@ -334,7 +333,7 @@ func fetchLatestVersion() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	defer errutil.Close(resp.Body)
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		return "", fmt.Errorf("github api returned status %d", resp.StatusCode)
@@ -356,10 +355,10 @@ func printVersionComparison(current, latest string) {
 	faint := color.New(color.Faint)
 	version := color.New(color.FgCyan)
 
-	errutil.Print(faint, "current  ")
-	errutil.Println(version, current)
-	errutil.Print(faint, "latest   ")
-	errutil.Println(version, latest)
+	faint.Print("current  ")
+	version.Println(current)
+	faint.Print("latest   ")
+	version.Println(latest)
 	fmt.Println()
 }
 
@@ -367,10 +366,10 @@ func printVersionComparisonTarget(current, target string) {
 	faint := color.New(color.Faint)
 	version := color.New(color.FgCyan)
 
-	errutil.Print(faint, "current  ")
-	errutil.Println(version, current)
-	errutil.Print(faint, "target   ")
-	errutil.Println(version, target)
+	faint.Print("current  ")
+	version.Println(current)
+	faint.Print("target   ")
+	version.Println(target)
 	fmt.Println()
 }
 
@@ -379,20 +378,20 @@ func printUpgradeInstructions() {
 	faint := color.New(color.Faint)
 	cmd := color.New(color.FgCyan)
 
-	errutil.Println(bold, "upgrade options:")
+	bold.Println("upgrade options:")
 	fmt.Println()
 
-	errutil.Print(faint, "  go install    ")
-	errutil.Printf(cmd, "go install github.com/%s/%s@latest\n", repoOwner, repoName)
+	faint.Print("  go install    ")
+	cmd.Printf("go install github.com/%s/%s@latest\n", repoOwner, repoName)
 
-	errutil.Print(faint, "  shell script  ")
-	errutil.Printf(cmd, "curl -sSL https://raw.githubusercontent.com/%s/%s/master/install.sh | sh\n", repoOwner, repoName)
+	faint.Print("  shell script  ")
+	cmd.Printf("curl -sSL https://raw.githubusercontent.com/%s/%s/master/install.sh | sh\n", repoOwner, repoName)
 
-	errutil.Print(faint, "  arch (aur)    ")
-	errutil.Println(cmd, "yay -S snitch-bin")
+	faint.Print("  arch (aur)    ")
+	cmd.Println("yay -S snitch-bin")
 
-	errutil.Print(faint, "  nix           ")
-	errutil.Printf(cmd, "nix profile upgrade --inputs-from github:%s/%s\n", repoOwner, repoName)
+	faint.Print("  nix           ")
+	cmd.Printf("nix profile upgrade --inputs-from github:%s/%s\n", repoOwner, repoName)
 }
 
 func performUpgrade(version string) error {
@@ -408,7 +407,7 @@ func performUpgrade(version string) error {
 
 	if strings.HasPrefix(execPath, "/nix/store/") {
 		yellow := color.New(color.FgYellow)
-		errutil.Println(yellow, tui.SymbolWarning+" cannot perform in-place upgrade for nix installation")
+		yellow.Println(tui.SymbolWarning + " cannot perform in-place upgrade for nix installation")
 		fmt.Println()
 		printNixUpgradeInstructions()
 		return nil
@@ -424,15 +423,15 @@ func performUpgrade(version string) error {
 
 	faint := color.New(color.Faint)
 	cyan := color.New(color.FgCyan)
-	errutil.Print(faint, tui.SymbolDownload+" downloading ")
-	errutil.Printf(cyan, "%s", archiveName)
-	errutil.Println(faint, "...")
+	faint.Print(tui.SymbolDownload + " downloading ")
+	cyan.Printf("%s", archiveName)
+	faint.Println("...")
 
 	resp, err := http.Get(downloadURL)
 	if err != nil {
 		return fmt.Errorf("failed to download: %w", err)
 	}
-	defer errutil.Close(resp.Body)
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("download failed with status %d", resp.StatusCode)
@@ -442,7 +441,7 @@ func performUpgrade(version string) error {
 	if err != nil {
 		return fmt.Errorf("failed to create temp directory: %w", err)
 	}
-	defer errutil.RemoveAll(tmpDir)
+	defer os.RemoveAll(tmpDir)
 
 	binaryPath, err := extractBinaryFromTarGz(resp.Body, tmpDir)
 	if err != nil {
@@ -459,14 +458,14 @@ func performUpgrade(version string) error {
 		yellow := color.New(color.FgYellow)
 		cmdStyle := color.New(color.FgCyan)
 
-		errutil.Printf(yellow, tui.SymbolWarning+" elevated permissions required to install to %s\n", targetDir)
+		yellow.Printf(tui.SymbolWarning+" elevated permissions required to install to %s\n", targetDir)
 		fmt.Println()
-		errutil.Println(faint, "run with sudo or install to a user-writable location:")
+		faint.Println("run with sudo or install to a user-writable location:")
 		fmt.Println()
-		errutil.Print(faint, "  sudo         ")
-		errutil.Println(cmdStyle, "sudo snitch upgrade --yes")
-		errutil.Print(faint, "  custom dir   ")
-		errutil.Printf(cmdStyle, "curl -sSL https://raw.githubusercontent.com/%s/%s/master/install.sh | INSTALL_DIR=~/.local/bin sh\n",
+		faint.Print("  sudo         ")
+		cmdStyle.Println("sudo snitch upgrade --yes")
+		faint.Print("  custom dir   ")
+		cmdStyle.Printf("curl -sSL https://raw.githubusercontent.com/%s/%s/master/install.sh | INSTALL_DIR=~/.local/bin sh\n",
 			repoOwner, repoName)
 		return nil
 	}
@@ -492,11 +491,11 @@ func performUpgrade(version string) error {
 	if err := os.Remove(backupPath); err != nil {
 		// non-fatal, just warn
 		yellow := color.New(color.FgYellow)
-		errutil.Fprintf(yellow, os.Stderr, tui.SymbolWarning+" warning: failed to remove backup file %s: %v\n", backupPath, err)
+		yellow.Fprintf(os.Stderr, tui.SymbolWarning + " warning: failed to remove backup file %s: %v\n", backupPath, err)
 	}
 
 	green := color.New(color.FgGreen, color.Bold)
-	errutil.Printf(green, tui.SymbolSuccess+" successfully upgraded to %s\n", version)
+	green.Printf(tui.SymbolSuccess + " successfully upgraded to %s\n", version)
 	return nil
 }
 
@@ -505,7 +504,7 @@ func extractBinaryFromTarGz(r io.Reader, destDir string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	defer errutil.Close(gzr)
+	defer gzr.Close()
 
 	tr := tar.NewReader(gzr)
 
@@ -535,10 +534,10 @@ func extractBinaryFromTarGz(r io.Reader, destDir string) (string, error) {
 		}
 
 		if _, err := io.Copy(outFile, tr); err != nil {
-			errutil.Close(outFile)
+			outFile.Close()
 			return "", err
 		}
-		errutil.Close(outFile)
+		outFile.Close()
 
 		return destPath, nil
 	}
@@ -552,8 +551,8 @@ func isWritable(path string) bool {
 	if err != nil {
 		return false
 	}
-	errutil.Close(f)
-	errutil.Remove(testFile)
+	f.Close()
+	os.Remove(testFile)
 	return true
 }
 
@@ -562,13 +561,13 @@ func copyFile(src, dst string) error {
 	if err != nil {
 		return err
 	}
-	defer errutil.Close(srcFile)
+	defer srcFile.Close()
 
 	dstFile, err := os.Create(dst)
 	if err != nil {
 		return err
 	}
-	defer errutil.Close(dstFile)
+	defer dstFile.Close()
 
 	if _, err := io.Copy(dstFile, srcFile); err != nil {
 		return err
@@ -581,7 +580,7 @@ func removeQuarantine(path string) {
 	cmd := exec.Command("xattr", "-d", "com.apple.quarantine", path)
 	if err := cmd.Run(); err == nil {
 		faint := color.New(color.Faint)
-		errutil.Println(faint, "  removed macOS quarantine attribute")
+		faint.Println("  removed macOS quarantine attribute")
 	}
 }
 
@@ -634,7 +633,7 @@ func fetchCommitForTag(tag string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	defer errutil.Close(resp.Body)
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		return "", fmt.Errorf("github api returned status %d", resp.StatusCode)
@@ -655,7 +654,7 @@ func compareCommits(base, head string) (*githubCompare, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer errutil.Close(resp.Body)
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("github api returned status %d", resp.StatusCode)
@@ -674,16 +673,16 @@ func printNixUpgradeInstructions() {
 	faint := color.New(color.Faint)
 	cmd := color.New(color.FgCyan)
 
-	errutil.Println(bold, "nix upgrade options:")
+	bold.Println("nix upgrade options:")
 	fmt.Println()
 
-	errutil.Print(faint, "  flake profile   ")
-	errutil.Printf(cmd, "nix profile install github:%s/%s\n", repoOwner, repoName)
+	faint.Print("  flake profile   ")
+	cmd.Printf("nix profile install github:%s/%s\n", repoOwner, repoName)
 
-	errutil.Print(faint, "  flake update    ")
-	errutil.Println(cmd, "nix flake update snitch  (in your system/home-manager config)")
+	faint.Print("  flake update    ")
+	cmd.Println("nix flake update snitch  (in your system/home-manager config)")
 
-	errutil.Print(faint, "  rebuild         ")
-	errutil.Println(cmd, "nixos-rebuild switch  or  home-manager switch")
+	faint.Print("  rebuild         ")
+	cmd.Println("nixos-rebuild switch  or  home-manager switch")
 }
 

cmd/version.go

@@ -6,8 +6,6 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-
-	"github.com/karol-broda/snitch/internal/errutil"
 )
 
 var (
@@ -24,20 +22,20 @@ var versionCmd = &cobra.Command{
 		cyan := color.New(color.FgCyan)
 		faint := color.New(color.Faint)
 
-		errutil.Print(bold, "snitch ")
-		errutil.Println(cyan, Version)
+		bold.Print("snitch ")
+		cyan.Println(Version)
 		fmt.Println()
 
-		errutil.Print(faint, "  commit  ")
+		faint.Print("  commit  ")
 		fmt.Println(Commit)
 
-		errutil.Print(faint, "  built   ")
+		faint.Print("  built   ")
 		fmt.Println(Date)
 
-		errutil.Print(faint, "  go      ")
+		faint.Print("  go      ")
 		fmt.Println(runtime.Version())
 
-		errutil.Print(faint, "  os      ")
+		faint.Print("  os      ")
 		fmt.Printf("%s/%s\n", runtime.GOOS, runtime.GOARCH)
 	},
 }

internal/collector/collector_linux.go

@@ -14,8 +14,6 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-
-	"github.com/karol-broda/snitch/internal/errutil"
 )
 
 // set SNITCH_DEBUG_TIMING=1 to enable timing diagnostics
@@ -140,7 +138,7 @@ func buildInodeToProcessMap() (map[int64]*processInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer errutil.Close(procDir)
+	defer procDir.Close()
 
 	entries, err := procDir.Readdir(-1)
 	if err != nil {
@@ -280,7 +278,7 @@ func getProcessInfo(pid int) (*processInfo, error) {
 	if err != nil {
 		return info, nil
 	}
-	defer errutil.Close(statusFile)
+	defer statusFile.Close()
 
 	scanner := bufio.NewScanner(statusFile)
 	for scanner.Scan() {
@@ -306,7 +304,7 @@ func parseProcNet(path, proto string, ipVersion int, inodeMap map[int64]*process
 	if err != nil {
 		return nil, err
 	}
-	defer errutil.Close(file)
+	defer file.Close()
 
 	var connections []Connection
 	scanner := bufio.NewScanner(file)
@@ -475,7 +473,7 @@ func GetUnixSockets() ([]Connection, error) {
 	if err != nil {
 		return connections, nil
 	}
-	defer errutil.Close(file)
+	defer file.Close()
 
 	scanner := bufio.NewScanner(file)
 	scanner.Scan()

internal/color/color_test.go

@@ -5,8 +5,6 @@ import (
 	"testing"
 
 	"github.com/fatih/color"
-
-	"github.com/karol-broda/snitch/internal/errutil"
 )
 
 func TestInit(t *testing.T) {
@@ -31,8 +29,8 @@ func TestInit(t *testing.T) {
 			origTerm := os.Getenv("TERM")
 
 			// Set test env vars
-			errutil.Setenv("NO_COLOR", tc.noColor)
-			errutil.Setenv("TERM", tc.term)
+			os.Setenv("NO_COLOR", tc.noColor)
+			os.Setenv("TERM", tc.term)
 
 			Init(tc.mode)
 
@@ -41,8 +39,8 @@ func TestInit(t *testing.T) {
 			}
 
 			// Restore original env vars
-			errutil.Setenv("NO_COLOR", origNoColor)
-			errutil.Setenv("TERM", origTerm)
+			os.Setenv("NO_COLOR", origNoColor)
+			os.Setenv("TERM", origTerm)
 		})
 	}
 }

internal/errutil/errutil.go

@@ -1,65 +0,0 @@
-package errutil
-
-import (
-	"io"
-	"os"
-
-	"github.com/fatih/color"
-)
-
-func Ignore[T any](val T, _ error) T {
-	return val
-}
-
-func IgnoreErr(_ error) {}
-
-func Close(c io.Closer) {
-	if c != nil {
-		_ = c.Close()
-	}
-}
-
-// color.Color wrappers - these discard the (int, error) return values
-
-func Print(c *color.Color, a ...any) {
-	_, _ = c.Print(a...)
-}
-
-func Println(c *color.Color, a ...any) {
-	_, _ = c.Println(a...)
-}
-
-func Printf(c *color.Color, format string, a ...any) {
-	_, _ = c.Printf(format, a...)
-}
-
-func Fprintf(c *color.Color, w io.Writer, format string, a ...any) {
-	_, _ = c.Fprintf(w, format, a...)
-}
-
-// os function wrappers for test cleanup where errors are non-critical
-
-func Setenv(key, value string) {
-	_ = os.Setenv(key, value)
-}
-
-func Unsetenv(key string) {
-	_ = os.Unsetenv(key)
-}
-
-func Remove(name string) {
-	_ = os.Remove(name)
-}
-
-func RemoveAll(path string) {
-	_ = os.RemoveAll(path)
-}
-
-// Flush calls Flush on a tabwriter and discards the error
-type Flusher interface {
-	Flush() error
-}
-
-func Flush(f Flusher) {
-	_ = f.Flush()
-}

internal/testutil/testutil.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/karol-broda/snitch/internal/collector"
-	"github.com/karol-broda/snitch/internal/errutil"
 )
 
 // TestCollector wraps MockCollector for use in tests
@@ -48,13 +47,13 @@ func SetupTestEnvironment(t *testing.T) (string, func()) {
 	oldConfig := os.Getenv("SNITCH_CONFIG")
 	oldNoColor := os.Getenv("SNITCH_NO_COLOR")
 	
-	errutil.Setenv("SNITCH_NO_COLOR", "1")
+	os.Setenv("SNITCH_NO_COLOR", "1") // Disable colors in tests
 	
 	// Cleanup function
 	cleanup := func() {
-		errutil.RemoveAll(tempDir)
-		errutil.Setenv("SNITCH_CONFIG", oldConfig)
-		errutil.Setenv("SNITCH_NO_COLOR", oldNoColor)
+		os.RemoveAll(tempDir)
+		os.Setenv("SNITCH_CONFIG", oldConfig)
+		os.Setenv("SNITCH_NO_COLOR", oldNoColor)
 	}
 	
 	return tempDir, cleanup
@@ -193,8 +192,8 @@ func (oc *OutputCapture) Stop() (string, string, error) {
 	os.Stderr = oc.oldStderr
 	
 	// Close files
-	errutil.Close(oc.stdout)
-	errutil.Close(oc.stderr)
+	oc.stdout.Close()
+	oc.stderr.Close()
 	
 	// Read captured content
 	stdoutContent, err := os.ReadFile(oc.stdoutFile)
@@ -208,9 +207,9 @@ func (oc *OutputCapture) Stop() (string, string, error) {
 	}
 	
 	// Cleanup
-	errutil.Remove(oc.stdoutFile)
-	errutil.Remove(oc.stderrFile)
-	errutil.Remove(filepath.Dir(oc.stdoutFile))
+	os.Remove(oc.stdoutFile)
+	os.Remove(oc.stderrFile)
+	os.Remove(filepath.Dir(oc.stdoutFile))
 	
 	return string(stdoutContent), string(stderrContent), nil
 }