From b99400b77dadfe3ac94c49ca68369cc73cb81f8d Mon Sep 17 00:00:00 2001 From: Christoph Schmatzler Date: Wed, 27 Aug 2025 06:30:46 +0000 Subject: [PATCH] up Signed-off-by: Christoph Schmatzler --- apps/aarch64-darwin/apply | 8 +++++++ apps/aarch64-darwin/build | 8 +++++++ apps/aarch64-darwin/build-switch | 17 +++++++++++++-- apps/x86_64-linux/apply | 8 +++++++ apps/x86_64-linux/build | 8 +++++++ apps/x86_64-linux/rollback | 2 +- flake.lock | 36 ++++++++++++++++---------------- modules/darwin/packages.nix | 3 ++- modules/home/opencode.nix | 5 +++++ 9 files changed, 73 insertions(+), 22 deletions(-) diff --git a/apps/aarch64-darwin/apply b/apps/aarch64-darwin/apply index 231912a..1cad43d 100755 --- a/apps/aarch64-darwin/apply +++ b/apps/aarch64-darwin/apply @@ -16,6 +16,14 @@ print_success() { echo -e "${GREEN}✅${NC} $1" } +print_error() { + echo -e "${RED}❌${NC} $1" +} + +print_warning() { + echo -e "${YELLOW}⚡${NC} $1" +} + HOSTNAME="${1:-$(scutil --get LocalHostName 2>/dev/null || hostname -s)}" print_info "Applying configuration for $HOSTNAME" diff --git a/apps/aarch64-darwin/build b/apps/aarch64-darwin/build index 8c5a4f2..24d0136 100755 --- a/apps/aarch64-darwin/build +++ b/apps/aarch64-darwin/build @@ -16,6 +16,14 @@ print_success() { echo -e "${GREEN}✅${NC} $1" } +print_error() { + echo -e "${RED}❌${NC} $1" +} + +print_warning() { + echo -e "${YELLOW}⚡${NC} $1" +} + HOSTNAME="${1:-$(scutil --get LocalHostName 2>/dev/null || hostname -s)}" print_info "Building configuration for $HOSTNAME" diff --git a/apps/aarch64-darwin/build-switch b/apps/aarch64-darwin/build-switch index 843837c..a0e6787 100755 --- a/apps/aarch64-darwin/build-switch +++ b/apps/aarch64-darwin/build-switch @@ -16,17 +16,30 @@ print_success() { echo -e "${GREEN}✅${NC} $1" } +print_error() { + echo -e "${RED}❌${NC} $1" +} + +print_warning() { + echo -e "${YELLOW}⚡${NC} $1" +} + HOSTNAME="${1:-$(scutil --get LocalHostName 2>/dev/null || hostname -s)}" print_info "Building and switching configuration for $HOSTNAME" # Build print_info "Building configuration..." -nix build ".#darwinConfigurations.$HOSTNAME.system" --show-trace "${@:2}" +if ! nix build ".#darwinConfigurations.$HOSTNAME.system" --show-trace "${@:2}"; then + print_error "Build failed" + exit 1 +fi + +print_success "Build completed" # Switch print_info "Switching to new configuration..." -./result/sw/bin/darwin-rebuild switch --flake ".#$HOSTNAME" "${@:2}" +sudo ./result/sw/bin/darwin-rebuild switch --flake ".#$HOSTNAME" "${@:2}" if [[ -L ./result ]]; then unlink ./result diff --git a/apps/x86_64-linux/apply b/apps/x86_64-linux/apply index 013d962..2924036 100755 --- a/apps/x86_64-linux/apply +++ b/apps/x86_64-linux/apply @@ -16,6 +16,14 @@ print_success() { echo -e "${GREEN}✅${NC} $1" } +print_error() { + echo -e "${RED}❌${NC} $1" +} + +print_warning() { + echo -e "${YELLOW}⚡${NC} $1" +} + HOSTNAME="${1:-tahani}" print_info "Applying configuration for $HOSTNAME" diff --git a/apps/x86_64-linux/build b/apps/x86_64-linux/build index 61058a4..a9c47a4 100755 --- a/apps/x86_64-linux/build +++ b/apps/x86_64-linux/build @@ -16,6 +16,14 @@ print_success() { echo -e "${GREEN}✅${NC} $1" } +print_error() { + echo -e "${RED}❌${NC} $1" +} + +print_warning() { + echo -e "${YELLOW}⚡${NC} $1" +} + HOSTNAME="${1:-tahani}" print_info "Building configuration for $HOSTNAME" diff --git a/apps/x86_64-linux/rollback b/apps/x86_64-linux/rollback index 6f3e5c0..ea55ef1 100644 --- a/apps/x86_64-linux/rollback +++ b/apps/x86_64-linux/rollback @@ -24,7 +24,7 @@ print_warning() { echo -e "${YELLOW}⚡${NC} $1" } -print_info "Available system generations:" +print_info "Available generations:" if [[ "$EUID" -ne 0 ]]; then sudo nix-env --profile /nix/var/nix/profiles/system --list-generations else diff --git a/flake.lock b/flake.lock index b4bc39f..0afc3d6 100644 --- a/flake.lock +++ b/flake.lock @@ -100,11 +100,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756022458, - "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", + "lastModified": 1756261190, + "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", "owner": "nix-community", "repo": "home-manager", - "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", + "rev": "77f348da3176dc68b20a73dab94852a417daf361", "type": "github" }, "original": { @@ -132,11 +132,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1756184666, - "narHash": "sha256-IRQg16fT5/+75ZKvoYAYNNrt6J7aaQD9DOVCUWv0b4g=", + "lastModified": 1756273278, + "narHash": "sha256-zOAL3vd1V7ubbqBtsX+yy9QuxVNzrgYUwZTlwz7NiqU=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "b88ff133c1b1fcca5a2682aef48d19d2a1f5039a", + "rev": "e8654680d2da2aed3e370a93c3a09a90b19c932c", "type": "github" }, "original": { @@ -148,11 +148,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1756184007, - "narHash": "sha256-YwgLYyQRudClScwI//kV1xPMP75fgq5WSUc3pNiEzxI=", + "lastModified": 1756274183, + "narHash": "sha256-2SE3iv6O7leGkQf09I6LI9pBqFLlC9LBi7ABtlQRtpE=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "0b4e2e71ea5b8085e5307fa3bb535ce481767e17", + "rev": "b83323dad1849149ebc425b22d95322b66e23360", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -240,11 +240,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756185468, - "narHash": "sha256-Rn2jLi4OiNpM7BXw6XIhu5fABXDSZr07U/YFbmTufYU=", + "lastModified": 1756273791, + "narHash": "sha256-d8hIKtjQCWzKrLRf0X3QUsOcBaQidrKl3SAId1QY8CU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7646fca44402bdfa80df9b993c2e233f54a06e2f", + "rev": "6024b4aa94589b07b38bca7c3013b44ce38a41dd", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1756148061, - "narHash": "sha256-9QlWBvwDlizUa7YwlBnrmdXvh5pjaVGLG7u1N68VX5k=", + "lastModified": 1756261579, + "narHash": "sha256-U9U1FPnbPP8D7HRbctDzSDtiPE3Ud91sfOy6TWhLOEw=", "owner": "nix-community", "repo": "nixvim", - "rev": "8e3ca3fc1f3ae23dee0e6d35dd4a70ea8ef7164c", + "rev": "6392a2f44f3a54e00c4095e8ba0dea378a52ca89", "type": "github" }, "original": { diff --git a/modules/darwin/packages.nix b/modules/darwin/packages.nix index de02fe3..2c4f01e 100644 --- a/modules/darwin/packages.nix +++ b/modules/darwin/packages.nix @@ -2,8 +2,9 @@ with pkgs; [ _1password-gui dockutil + xcodes mas raycast - whatsapp-for-mac + # whatsapp-for-mac (callPackage ../bin/open-project.nix {}) ] diff --git a/modules/home/opencode.nix b/modules/home/opencode.nix index 94de25a..77a0685 100644 --- a/modules/home/opencode.nix +++ b/modules/home/opencode.nix @@ -3,6 +3,11 @@ enable = true; settings = { theme = "system"; + instructions = [ + "CLAUDE.md" + "AGENT.md" + "AGENTS.md" + ]; formatter = { mix = { disabled = true;