From 737f2b09e4a528943d948a8574d086ae8ed41b20 Mon Sep 17 00:00:00 2001 From: mayor Date: Tue, 20 Jan 2026 10:33:32 -0800 Subject: [PATCH] chore(flake): update gastown to gitea fork with timeout fix Point gastown input to local Gitea fork which includes: - Increased ClaudeStartTimeout from 60s to 120s - Fixes intermittent refinery/polecat startup timeouts Co-Authored-By: Claude Opus 4.5 --- flake.lock | 92 +++++++++++++++++++++++++++--------------------------- flake.nix | 26 +++++++-------- 2 files changed, 58 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index ce414e1..9479518 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1768789550, - "narHash": "sha256-+n8EEzPR+WIe5UHaySkWp4pYYYoCipx9LOT8RSLuu8Y=", + "lastModified": 1768509852, + "narHash": "sha256-4oZXrqBjK9V8qKHoxlfil20qcJdOU8HXJA4627nX1nQ=", "owner": "steveyegge", "repo": "beads", - "rev": "4bc0b698a8b222cb6f97d37291812dec0675e872", + "rev": "d3db8253ff09e0f139ffbb6f839afe13acbf7bdb", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1768723979, - "narHash": "sha256-0TeBjChS9AbcO7pHp/sSoIncNnJ7LJlZUqvHXVTRmjE=", + "lastModified": 1767773143, + "narHash": "sha256-QL/t9v2kFNxBDyNJb/s411o3mxujan+QX5IZglTdpTk=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "d9711a90941c0063ab68747fd7b18c70ae6c10ae", + "rev": "3e15fb36d7f94f0a218bda977be4d3f5da983a71", "type": "github" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1768703823, - "narHash": "sha256-oonTamz3/eaJ9QqJWUWKpIXI3PtxP3j5rTGqSKscREo=", + "lastModified": 1768011937, + "narHash": "sha256-SnU2XTo34vwVaijs+4VwcXTNwMWO4nwzzs08N39UagA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "42822bddba89071d6a3f0c17644ada71de09fbbd", + "rev": "79abf71d9897cf3b5189f7175cda1b1102abc65c", "type": "github" }, "original": { @@ -81,17 +81,17 @@ "gastown": { "flake": false, "locked": { - "lastModified": 1768806422, - "narHash": "sha256-rdSUDeX2yHDnfODH4+2zb+iHcGbkl8xiZC0LNxfxb4A=", + "lastModified": 1768933952, + "narHash": "sha256-2ZlMrmR2TDhX/OI/OKWknyeAfBvwhGRKCWT/G31QjIc=", "ref": "refs/heads/main", - "rev": "34c77e883d1cdd668875f709d388c09c1c4cf341", - "revCount": 2851, + "rev": "87e2a6a634764d38453a5b97cd57482f9d2d0649", + "revCount": 2857, "type": "git", - "url": "https://git.johnogle.info/johno/gastown.git" + "url": "ssh://git@git.johnogle.info:2222/johno/gastown.git" }, "original": { "type": "git", - "url": "https://git.johnogle.info/johno/gastown.git" + "url": "ssh://git@git.johnogle.info:2222/johno/gastown.git" } }, "google-cookie-retrieval": { @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1768803918, - "narHash": "sha256-clLouXo1D3knLuWI5jq3j6U80hbGbdP25VPGDTmrfoE=", + "lastModified": 1761423376, + "narHash": "sha256-pMy3cnUFfue4vz/y0jx71BfcPGxZf+hk/DtnzWvfU0c=", "ref": "refs/heads/main", - "rev": "d53e54c1ac8096a6aabacb7117911ab9d5309675", - "revCount": 13, + "rev": "a1f695665771841a988afc965526cbf99160cd77", + "revCount": 11, "type": "git", "url": "https://git.johnogle.info/johno/google-cookie-retrieval.git" }, @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1768603898, - "narHash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo=", + "lastModified": 1767514898, + "narHash": "sha256-ONYqnKrPzfKEEPChoJ9qPcfvBqW9ZgieDKD7UezWPg4=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c", + "rev": "7a06e8a2f844e128d3b210a000a62716b6040b7f", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1768798936, - "narHash": "sha256-eHld4id3TeD9Sxx5vgv58BnTl1fz+ewIKspz/kEoAE8=", + "lastModified": 1767556355, + "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=", "owner": "nix-community", "repo": "home-manager", - "rev": "2954aa29441a1a98901362e4d35515875761ad65", + "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1768646298, - "narHash": "sha256-+76oVL4ut4piR677yp9vsJ7UdQM4IjR1K3eX9q3kn6E=", + "lastModified": 1767082077, + "narHash": "sha256-2tL1mRb9uFJThUNfuDm/ehrnPvImL/QDtCxfn71IEz4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6e911aeee2ab046584fffe67b64d730c7c0df921", + "rev": "efd4b22e6fdc6d7fb4e186ae333a4b74e03da440", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1767634391, - "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=", + "lastModified": 1765066094, + "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2", + "rev": "688427b1aab9afb478ca07989dc754fa543e03d5", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1768725834, - "narHash": "sha256-vFUhyN59kaTpReWiGny9cL15/raXU5UVVVWRXWUNvBM=", + "lastModified": 1768034604, + "narHash": "sha256-62pIZMvGHhYJmMiiBsxHqZt/dFyENPcFHlJq5NJF3Sw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "d3611fbfae9e8c066493da7c490a4a2d6d640897", + "rev": "9b3b8044fe4ccdcbb2d6f733d7dbe4d5feea18bc", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768621446, - "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=", + "lastModified": 1767480499, + "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", "owner": "nixos", "repo": "nixpkgs", - "rev": "72ac591e737060deab2b86d6952babd1f896d7c5", + "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -283,11 +283,11 @@ ] }, "locked": { - "lastModified": 1767662275, - "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=", + "lastModified": 1763909441, + "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e", + "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1767662275, - "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=", + "lastModified": 1763909441, + "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e", + "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 48e03fc..b32305f 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,7 @@ }; gastown = { - url = "git+https://git.johnogle.info/johno/gastown.git"; + url = "git+ssh://git@git.johnogle.info:2222/johno/gastown.git"; flake = false; # No flake.nix upstream yet }; @@ -60,12 +60,6 @@ }; outputs = { self, nixpkgs, nixpkgs-unstable, ... } @ inputs: let - # Overlay to use our custom claude-code package from GCS - # (needed for corporate networks that block npm registry) - claudeCodeOverlay = ufinal: uprev: { - claude-code = uprev.callPackage ./packages/claude-code {}; - }; - # Shared overlay function to reduce duplication across module sets # Parameters: # unstableOverlays: Additional overlays to apply when importing nixpkgs-unstable @@ -99,9 +93,7 @@ ./roles inputs.home-manager.nixosModules.home-manager { - nixpkgs.overlays = [ - (mkBaseOverlay { unstableOverlays = [ claudeCodeOverlay ]; }) - ]; + nixpkgs.overlays = [ (mkBaseOverlay {}) ]; } (mkHomeManagerConfig { sharedModules = [ inputs.plasma-manager.homeModules.plasma-manager ]; @@ -114,9 +106,7 @@ inputs.home-manager-unstable.nixosModules.home-manager inputs.jovian.nixosModules.jovian { - nixpkgs.overlays = [ - (mkBaseOverlay { unstableOverlays = [ claudeCodeOverlay ]; }) - ]; + nixpkgs.overlays = [ (mkBaseOverlay {}) ]; } (mkHomeManagerConfig { sharedModules = [ inputs.plasma-manager-unstable.homeModules.plasma-manager ]; @@ -128,7 +118,15 @@ inputs.home-manager.darwinModules.home-manager { nixpkgs.overlays = [ - (mkBaseOverlay { unstableOverlays = [ claudeCodeOverlay ]; }) + (mkBaseOverlay { + # Override claude-code in unstable to use our custom GCS-based build + # (needed for corporate networks that block npm registry) + unstableOverlays = [ + (ufinal: uprev: { + claude-code = uprev.callPackage ./packages/claude-code {}; + }) + ]; + }) ]; } (mkHomeManagerConfig { sharedModules = []; })