From cbc1402e44c2d348cf5ad40e9f0cf50b2fdf4129 Mon Sep 17 00:00:00 2001 From: John Ogle Date: Wed, 6 May 2026 19:20:53 -0700 Subject: [PATCH] major upgrade --- flake.lock | 66 ++++++++++++++++---------------- home/roles/emacs/default.nix | 4 +- home/wallpapers/default.nix | 2 +- packages/claude-code/default.nix | 10 ++--- packages/opencode/default.nix | 10 ++--- scripts/upgrade.sh | 18 ++++++--- 6 files changed, 58 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index a7bab20..c748df6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1774080407, - "narHash": "sha256-FYbalilgDFjIVwK+D6DjDos1IMmMGA20lRf8k6Ykm1Y=", + "lastModified": 1778017961, + "narHash": "sha256-+HR9w67PvNg25TJURz3GJDA81LER67tSJJKVubmeKEg=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "d8d75443d39d95f3c5256504eb838e0acc62ef44", + "rev": "a174a69259e082bcc743d472377a9a2035c79537", "type": "github" }, "original": { @@ -26,11 +26,11 @@ ] }, "locked": { - "lastModified": 1774256052, - "narHash": "sha256-7OLaUBQCOCt4XXbjHq9xqBopOJJpbV6Cl8mWdMLzazc=", + "lastModified": 1778062824, + "narHash": "sha256-lpEMrAykaMevuhTutXvKysBibhb3aEWIG5Skew9vcaE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c4b7915a9467aa611c7346d2322514cdf8c1ba45", + "rev": "12320c4f8cca562e2b032ff3f6d29372867c27c7", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1774274588, - "narHash": "sha256-dnHvv5EMUgTzGZmA+3diYjQU2O6BEpGLEOgJ1Qe9LaY=", + "lastModified": 1777851538, + "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=", "owner": "nix-community", "repo": "home-manager", - "rev": "cf9686ba26f5ef788226843bc31fda4cf72e373b", + "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1774292006, - "narHash": "sha256-RI5sjkDEwIiD2eZHd7iM6ZqPoPWZvn3KdBiMumA3IYI=", + "lastModified": 1778009629, + "narHash": "sha256-nUoQtf4Zq7DRYJrfv904hjrxjAlWVP6a1pNNFKx3FCg=", "owner": "nix-community", "repo": "home-manager", - "rev": "3cea83bf84abeb72581bdee380fa526d7fcd7e5b", + "rev": "00ed86e58bb6979a7921859fd1615d19382eac5c", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1774168156, - "narHash": "sha256-+pwZSARdlM2RQQ6V0q76+WMKW9aNIcxkSOIThcz/f0A=", + "lastModified": 1777963407, + "narHash": "sha256-54aKHEfOllEWvTs0HYR5Lb8HIPLxfHGY4GswlfUChtQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "939caad56508542d0f19cab963e2bc693f5f2831", + "rev": "ca0970551a092fd69fdbb31ef3ea2dfe15f96349", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1774265710, - "narHash": "sha256-ar8pFUSAxXhV7DpVRjNvgviWuqOqWPAImb4MM7lSh5Y=", + "lastModified": 1778063352, + "narHash": "sha256-BbZ/5spDn++PKnnQcCHtefJGzisRBf307OF7nl4eitg=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "f6022b9192e034a817373692ede18a9319cf9730", + "rev": "e36071aafae22e1784339be38bfa9a0f7f6527eb", "type": "github" }, "original": { @@ -188,11 +188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774244481, - "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=", + "lastModified": 1778003029, + "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4590696c8693fea477850fe379a01544293ca4e2", + "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", "type": "github" }, "original": { @@ -204,11 +204,11 @@ }, "nixpkgs-qt": { "locked": { - "lastModified": 1774244481, - "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=", + "lastModified": 1778003029, + "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4590696c8693fea477850fe379a01544293ca4e2", + "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1772361940, - "narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=", + "lastModified": 1775856943, + "narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "a4b33606111c9c5dcd10009042bb710307174f51", + "rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1772361940, - "narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=", + "lastModified": 1775856943, + "narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "a4b33606111c9c5dcd10009042bb710307174f51", + "rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5", "type": "github" }, "original": { diff --git a/home/roles/emacs/default.nix b/home/roles/emacs/default.nix index 3c65687..bd3132d 100644 --- a/home/roles/emacs/default.nix +++ b/home/roles/emacs/default.nix @@ -13,8 +13,8 @@ let doomEmacs = pkgs.fetchFromGitHub { owner = "doomemacs"; repo = "doomemacs"; - rev = "d23bbe87721c61f4d5a605f2914b32780bb89949"; - sha256 = "sha256-z+3c0AGkrMf1xZ+pq57aVp4Zo4KsqFMIjEVzSZinghc="; + rev = "a174a69259e082bcc743d472377a9a2035c79537"; + sha256 = "sha256-+HR9w67PvNg25TJURz3GJDA81LER67tSJJKVubmeKEg="; }; # Shared emacs packages diff --git a/home/wallpapers/default.nix b/home/wallpapers/default.nix index 6da7de3..b743ded 100644 --- a/home/wallpapers/default.nix +++ b/home/wallpapers/default.nix @@ -2,7 +2,7 @@ # The currentIndex is incremented by `nix run .#rotate-wallpaper` # and gets committed as part of `nix run .#upgrade` { - currentIndex = 2; # Index into wallpapers list + currentIndex = 3; # Index into wallpapers list wallpapers = [ { diff --git a/packages/claude-code/default.nix b/packages/claude-code/default.nix index 23242df..53952e6 100644 --- a/packages/claude-code/default.nix +++ b/packages/claude-code/default.nix @@ -6,24 +6,24 @@ }: let - version = "2.1.75"; + version = "2.1.119"; srcs = { aarch64-darwin = { url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/darwin-arm64/claude"; - sha256 = "8c541a5e924eda2070eaf1702a48047af671c4dff6a11a5e762076614a082675"; + sha256 = "31db3444309d5d0f8b85e8782e2dcd86f31f7e48c1a1e83d69b09268c7b4f9a2"; }; x86_64-darwin = { url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/darwin-x64/claude"; - sha256 = "82c90b91a0a18f60191f817b9b42304d8b17dbed75795b715c41f4fdfe4c782d"; + sha256 = "52b3b75cfe80c626982b2ffb3a6ce1c797824f257dc275cf0a3c32c202b6a3df"; }; x86_64-linux = { url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/linux-x64/claude"; - sha256 = "328b0a429c05a04f911157d886be5123cf1824a19ba8ca1f9d594c004eac32c9"; + sha256 = "cca43053f062949495596b11b6fd1b59cf79102adb13bacbe66997e6fae41e4a"; }; aarch64-linux = { url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/linux-arm64/claude"; - sha256 = "ec8f4f7f7bb50611dae70c109a76ee1da6a3ab45511c65f117df215848ecc905"; + sha256 = "382aa73ea4b07fd8d698e3159b5ef9e1b8739fae7505ba8ddd28b8a6a62819ce"; }; }; diff --git a/packages/opencode/default.nix b/packages/opencode/default.nix index e224f9a..e13cb11 100644 --- a/packages/opencode/default.nix +++ b/packages/opencode/default.nix @@ -7,24 +7,24 @@ }: let - version = "1.4.0"; + version = "1.14.39"; srcs = { aarch64-darwin = { url = "https://github.com/anomalyco/opencode/releases/download/v${version}/opencode-darwin-arm64.zip"; - sha256 = "0m97j2vln8yhhvnsjl92phx6dac24y7hgh75csmbkbhawkz9xm4l"; + sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; }; x86_64-darwin = { url = "https://github.com/anomalyco/opencode/releases/download/v${version}/opencode-darwin-x64.zip"; - sha256 = "17n04j06pdc2raxjm91y6p87gwpnra0liabpbjwdmyd1iqgqv0q8"; + sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; }; x86_64-linux = { url = "https://github.com/anomalyco/opencode/releases/download/v${version}/opencode-linux-x64.tar.gz"; - sha256 = "16117lwfj2lb8wjbq5cyf77vhi52ada5ys3212hjqw3qw3wrcc0r"; + sha256 = "1flvi0anw6irm83kh5kndqgs6nasbicharqc6pzxkxbsl37saarl"; }; aarch64-linux = { url = "https://github.com/anomalyco/opencode/releases/download/v${version}/opencode-linux-arm64.tar.gz"; - sha256 = "06lvm1qiji74xdd3psqn6lwxak65gqsbmkib1pjb4n65f9246jwm"; + sha256 = "1samhrmpvq5ar1lf1k5f8851qkl8z4b8rmq7gwbnp42ysaqj5ac8"; }; }; diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index 9b15c32..7e11986 100644 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -13,7 +13,8 @@ while [[ $# -gt 0 ]]; do echo " 1. Update all flake inputs (nix flake update)" echo " 2. Update Doom Emacs to the latest commit" echo " 3. Update Claude Code to the latest version" - echo " 4. Rotate to the next wallpaper" + echo " 4. Update OpenCode to the latest version" + echo " 5. Rotate to the next wallpaper" echo "" echo "After completion, review changes with 'git diff' and rebuild" echo "your system with 'sudo nixos-rebuild switch --flake .'" @@ -45,23 +46,28 @@ echo -e "${BLUE}========================================${NC}" echo "" # Step 1: Update flake inputs -echo -e "${GREEN}[1/4] Updating flake inputs...${NC}" +echo -e "${GREEN}[1/5] Updating flake inputs...${NC}" cd "$REPO_ROOT" nix flake update echo "" # Step 2: Update Doom Emacs -echo -e "${GREEN}[2/4] Updating Doom Emacs...${NC}" +echo -e "${GREEN}[2/5] Updating Doom Emacs...${NC}" "$REPO_ROOT/scripts/update-doomemacs.sh" echo "" # Step 3: Update Claude Code -echo -e "${GREEN}[3/4] Updating Claude Code...${NC}" +echo -e "${GREEN}[3/5] Updating Claude Code...${NC}" "$REPO_ROOT/packages/claude-code/update.sh" echo "" -# Step 4: Rotate wallpaper -echo -e "${GREEN}[4/4] Rotating wallpaper...${NC}" +# Step 4: Update OpenCode +echo -e "${GREEN}[4/5] Updating OpenCode...${NC}" +"$REPO_ROOT/packages/opencode/update.sh" +echo "" + +# Step 5: Rotate wallpaper +echo -e "${GREEN}[5/5] Rotating wallpaper...${NC}" "$REPO_ROOT/scripts/rotate-wallpaper.sh" echo ""