wip:

.gitignore

@@ -5,6 +5,5 @@
 man 
 
 # build artifacts
-builds
 envr
 result

CHANGELOG.md

@@ -1,13 +0,0 @@
-# Changelog
-
-## [0.1.1](https://github.com/sbrow/envr/compare/v0.1.0...v0.1.1) (2025-11-05)
-
-
-### Features
-
-* **sync:** Results are now displayed in a table. ([42796ec](https://github.com/sbrow/envr/commit/42796ec77b1817e1b9f09068d76a7b6e30da246b))
-
-
-### Bug Fixes
-
-* **sync:** Fixed an issue where deleted folders would be restored. ([9ab72a2](https://github.com/sbrow/envr/commit/9ab72a25faf1af0eedb2f4574166c6ee47450ebb))

Makefile

@@ -1,92 +0,0 @@
-# Makefile for envr - Environment file manager
-# Builds release artifacts for GitHub releases
-
-APP_NAME := envr
-VERSION := $(shell grep 'version = ' flake.nix | head -1 | sed 's/.*version = "\(.*\)";/\1/')
-BUILD_DIR := builds
-LDFLAGS := -X github.com/sbrow/envr/cmd.version=v$(VERSION) -s -w
-
-# Binary names
-LINUX_AMD64_BIN := $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-amd64
-LINUX_ARM64_BIN := $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-arm64
-DARWIN_ARM64_BIN := $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64
-
-.PHONY: all clean cleanall build-linux build-darwin compress release help
-
-# Default target
-all: release clean
-
-# Create build directory
-$(BUILD_DIR):
-	@mkdir -p $(BUILD_DIR)
-
-# Build Linux AMD64
-$(LINUX_AMD64_BIN): $(BUILD_DIR)
-	@echo "Building for Linux AMD64..."
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -o $(LINUX_AMD64_BIN) .
-	@echo "Built $(LINUX_AMD64_BIN)"
-
-# Build Linux ARM64
-$(LINUX_ARM64_BIN): $(BUILD_DIR)
-	@echo "Building for Linux ARM64..."
-	GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -o $(LINUX_ARM64_BIN) .
-	@echo "Built $(LINUX_ARM64_BIN)"
-
-# Build Darwin ARM64 (Mac)
-$(DARWIN_ARM64_BIN): $(BUILD_DIR)
-	@echo "Building for Darwin ARM64..."
-	GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -o $(DARWIN_ARM64_BIN) .
-	@echo "Built $(DARWIN_ARM64_BIN)"
-
-# Build all binaries
-build-linux: $(LINUX_AMD64_BIN) $(LINUX_ARM64_BIN)
-build-darwin: $(DARWIN_ARM64_BIN)
-
-# Compress Linux artifacts with gzip
-$(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-amd64.tar.gz: $(LINUX_AMD64_BIN)
-	@echo "Compressing Linux AMD64 artifact..."
-	cd $(BUILD_DIR) && tar -czf $(APP_NAME)-$(VERSION)-linux-amd64.tar.gz --transform 's|.*|$(APP_NAME)|' $(shell basename $(LINUX_AMD64_BIN))
-
-$(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-arm64.tar.gz: $(LINUX_ARM64_BIN)
-	@echo "Compressing Linux ARM64 artifact..."
-	cd $(BUILD_DIR) && tar -czf $(APP_NAME)-$(VERSION)-linux-arm64.tar.gz --transform 's|.*|$(APP_NAME)|' $(shell basename $(LINUX_ARM64_BIN))
-
-# Compress Darwin artifacts with zip
-$(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64.zip: $(DARWIN_ARM64_BIN)
-	@echo "Compressing Darwin ARM64 artifact..."
-	cd $(BUILD_DIR) && cp $(shell basename $(DARWIN_ARM64_BIN)) $(APP_NAME) && zip $(APP_NAME)-$(VERSION)-darwin-arm64.zip $(APP_NAME) && rm $(APP_NAME)
-
-# Compress all artifacts
-compress: $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-amd64.tar.gz \
-          $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-arm64.tar.gz \
-          $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64.zip
-
-# Build and compress all release artifacts
-release: build-linux build-darwin compress
-	@echo "Release artifacts created:"
-	@ls -la $(BUILD_DIR)/*.tar.gz $(BUILD_DIR)/*.zip 2>/dev/null || echo "No compressed artifacts found"
-
-# Clean binary files only
-clean:
-	@echo "Cleaning binary files..."
-	@rm -f $(LINUX_AMD64_BIN) $(LINUX_ARM64_BIN) $(DARWIN_ARM64_BIN)
-
-# Clean everything in build directory
-cleanall:
-	@echo "Cleaning build directory..."
-	@rm -rf $(BUILD_DIR)
-
-# Show available targets
-help:
-	@echo "Available targets:"
-	@echo "  all        - Build all release artifacts (default)"
-	@echo "  release    - Build and compress all release artifacts"
-	@echo "  build-linux - Build Linux binaries only"
-	@echo "  build-darwin - Build Darwin binaries only"
-	@echo "  compress   - Compress all built binaries"
-	@echo "  clean      - Remove binary files only"
-	@echo "  cleanall   - Remove entire build directory"
-	@echo "  help       - Show this help message"
-	@echo ""
-	@echo "Release artifacts will be created in $(BUILD_DIR)/"
-	@echo "Version: $(VERSION)"

app/config.go

@@ -24,11 +24,9 @@ type SshKeyPair struct {
 }
 
 type scanConfig struct {
-	// TODO: Support multiple matchers
 	Matcher string `json:"matcher"`
-	// TODO: Support multiple excludes
-	Exclude string   `json:"exclude"`
-	Include []string `json:"include"`
+	Exclude string `json:"exclude"`
+	Include string `json:"include"`
 }
 
 // Create a fresh config with sensible defaults.
@@ -50,7 +48,7 @@ func NewConfig(privateKeyPaths []string) Config {
 		ScanConfig: scanConfig{
 			Matcher: "\\.env",
 			Exclude: "*.envrc",
-			Include: []string{"~"},
+			Include: "~",
 		},
 	}
 }
@@ -112,77 +110,71 @@ func (c *Config) Save() error {
 
 // Use fd to find all ignored .env files that match the config's parameters
 func (c Config) scan() (paths []string, err error) {
-	searchPaths, err := c.searchPaths()
+	searchPath, err := c.searchPath()
 	if err != nil {
 		return []string{}, err
 	}
 
-	for _, searchPath := range searchPaths {
-		// Find all files (including ignored ones)
-		fmt.Printf("Searching for all files in \"%s\"...\n", searchPath)
-		allCmd := exec.Command("fd", "-a", c.ScanConfig.Matcher, "-E", c.ScanConfig.Exclude, "-HI", searchPath)
-		allOutput, err := allCmd.Output()
-		if err != nil {
-			return paths, err
-		}
-
-		allFiles := strings.Split(strings.TrimSpace(string(allOutput)), "\n")
-		if len(allFiles) == 1 && allFiles[0] == "" {
-			allFiles = []string{}
-		}
-
-		// Find unignored files
-		fmt.Printf("Search for unignored fies in \"%s\"...\n", searchPath)
-		unignoredCmd := exec.Command("fd", "-a", c.ScanConfig.Matcher, "-E", c.ScanConfig.Exclude, "-H", searchPath)
-		unignoredOutput, err := unignoredCmd.Output()
-		if err != nil {
-			return []string{}, err
-		}
-
-		unignoredFiles := strings.Split(strings.TrimSpace(string(unignoredOutput)), "\n")
-		if len(unignoredFiles) == 1 && unignoredFiles[0] == "" {
-			unignoredFiles = []string{}
-		}
-
-		// Create a map for faster lookup
-		unignoredMap := make(map[string]bool)
-		for _, file := range unignoredFiles {
-			unignoredMap[file] = true
-		}
-
-		// Filter to get only ignored files
-		var ignoredFiles []string
-		for _, file := range allFiles {
-			if !unignoredMap[file] {
-				ignoredFiles = append(ignoredFiles, file)
-			}
-		}
-
-		paths = append(paths, ignoredFiles...)
+	// Find all files (including ignored ones)
+	fmt.Printf("Searching for all files in \"%s\"...\n", searchPath)
+	allCmd := exec.Command("fd", "-a", c.ScanConfig.Matcher, "-E", c.ScanConfig.Exclude, "-HI", searchPath)
+	allOutput, err := allCmd.Output()
+	if err != nil {
+		return []string{}, err
 	}
 
-	return paths, nil
+	allFiles := strings.Split(strings.TrimSpace(string(allOutput)), "\n")
+	if len(allFiles) == 1 && allFiles[0] == "" {
+		allFiles = []string{}
+	}
+
+	// Find unignored files
+	fmt.Printf("Search for unignored fies in \"%s\"...\n", searchPath)
+	unignoredCmd := exec.Command("fd", "-a", c.ScanConfig.Matcher, "-E", c.ScanConfig.Exclude, "-H", searchPath)
+	unignoredOutput, err := unignoredCmd.Output()
+	if err != nil {
+		return []string{}, err
+	}
+
+	unignoredFiles := strings.Split(strings.TrimSpace(string(unignoredOutput)), "\n")
+	if len(unignoredFiles) == 1 && unignoredFiles[0] == "" {
+		unignoredFiles = []string{}
+	}
+
+	// Create a map for faster lookup
+	unignoredMap := make(map[string]bool)
+	for _, file := range unignoredFiles {
+		unignoredMap[file] = true
+	}
+
+	// Filter to get only ignored files
+	var ignoredFiles []string
+	for _, file := range allFiles {
+		if !unignoredMap[file] {
+			ignoredFiles = append(ignoredFiles, file)
+		}
+	}
+
+	return ignoredFiles, nil
 }
 
-func (c Config) searchPaths() (paths []string, err error) {
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		return paths, err
-	}
+func (c Config) searchPath() (path string, err error) {
+	include := c.ScanConfig.Include
 
-	includes := c.ScanConfig.Include
-
-	for _, include := range includes {
-		path := strings.Replace(include, "~", homeDir, 1)
-		absPath, err := filepath.Abs(path)
+	if include == "~" {
+		homeDir, err := os.UserHomeDir()
 		if err != nil {
-			return paths, err
+			return "", err
 		}
-
-		paths = append(paths, absPath)
+		return homeDir, nil
 	}
 
-	return paths, nil
+	absPath, err := filepath.Abs(include)
+	if err != nil {
+		return "", err
+	}
+
+	return absPath, nil
 }
 
 // TODO: Should this be private?

cmd/sync.go

@@ -1,11 +1,8 @@
 package cmd
 
 import (
-	"encoding/json"
-	"os"
+	"fmt"
 
-	"github.com/mattn/go-isatty"
-	"github.com/olekukonko/tablewriter"
 	"github.com/sbrow/envr/app"
 	"github.com/spf13/cobra"
 )
@@ -25,53 +22,33 @@ var syncCmd = &cobra.Command{
 			if err != nil {
 				return err
 			} else {
-				type syncResult struct {
-					Path   string `json:"path"`
-					Status string `json:"status"`
-				}
-				var results []syncResult
-
 				for _, file := range files {
+					fmt.Printf("%s\n", file.Path)
+
 					// Syncronize the filesystem with the database.
 					changed, err := file.Sync()
 
-					var status string
 					switch changed {
 					case app.Updated:
-						status = "Backed Up"
+						fmt.Printf("File updated - changes saved\n")
 						if err := db.Insert(file); err != nil {
 							return err
 						}
 					case app.Restored:
-						status = "Restored"
+						fmt.Printf("File missing - restored backup\n")
 					case app.Error:
 						if err == nil {
 							panic("err cannot be nil when Sync returns Error")
+						} else {
+							fmt.Printf("%s\n", err)
 						}
-						status = err.Error()
 					case app.Noop:
-						status = "OK"
+						fmt.Println("Nothing to do")
 					default:
 						panic("Unknown result")
 					}
 
-					results = append(results, syncResult{
-						Path:   file.Path,
-						Status: status,
-					})
-				}
-
-				if isatty.IsTerminal(os.Stdout.Fd()) {
-					table := tablewriter.NewWriter(os.Stdout)
-					table.Header([]string{"File", "Status"})
-
-					for _, result := range results {
-						table.Append([]string{result.Path, result.Status})
-					}
-					table.Render()
-				} else {
-					encoder := json.NewEncoder(os.Stdout)
-					return encoder.Encode(results)
+					fmt.Println("")
 				}
 
 				return nil

flake.nix

@@ -21,12 +21,7 @@
       imports = [
         inputs.treefmt-nix.flakeModule
       ];
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-
-        "aarch64-darwin"
-      ];
+      systems = [ "x86_64-linux" ];
 
       perSystem =
         { pkgs, system, inputs', ... }: {
@@ -61,7 +56,7 @@
 
           packages.default = pkgs.buildGoModule rec {
             pname = "envr";
-            version = "0.1.1";
+            version = "0.1.0";
             src = ./.;
             # If the build complains, uncomment this line
             # vendorHash = "sha256:0000000000000000000000000000000000000000000000000000";
@@ -97,9 +92,6 @@
                 gotools
                 cobra-cli
 
-                # Build tools
-                zip
-
                 # IDE
                 unstable.helix
                 typescript-language-server

main.go

@@ -2,7 +2,6 @@ package main
 
 import "github.com/sbrow/envr/cmd"
 
-// TODO: `envr check` command that looks in cwd and tells you if it's backed up or not.
 func main() {
 	cmd.Execute()
 }