From e9eb7868119ef8224405380d374d1c34f808d53b Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 16 Jul 2025 11:40:05 -0500 Subject: [PATCH] move opencode overlay into common for now --- common/flake.lock | 35 +++++++++++++++++++++++++++++++++++ common/flake.nix | 26 ++++++++++++++++++++++++++ common/programs/opencode.nix | 2 ++ flake.lock | 35 +++++++++++++++++++++++++++++++++++ flake.nix | 4 ++++ 5 files changed, 102 insertions(+) diff --git a/common/flake.lock b/common/flake.lock index 9133d18..2abc9e8 100644 --- a/common/flake.lock +++ b/common/flake.lock @@ -153,6 +153,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1741379970, @@ -169,6 +185,23 @@ "type": "github" } }, + "opencode": { + "flake": false, + "locked": { + "lastModified": 1752630643, + "narHash": "sha256-PRNRs0UsKNXFTwvtrrImd3UmrpNvFP9xc8BrIdx1Q9Q=", + "owner": "sst", + "repo": "opencode", + "rev": "0793c3f2a373436fb70eb936df16e21ce1243b19", + "type": "github" + }, + "original": { + "owner": "sst", + "ref": "v0.3.13", + "repo": "opencode", + "type": "github" + } + }, "ragenix": { "inputs": { "agenix": "agenix", @@ -195,6 +228,8 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", + "nixpkgs-unstable": "nixpkgs-unstable", + "opencode": "opencode", "ragenix": "ragenix" } }, diff --git a/common/flake.nix b/common/flake.nix index cf11ae7..4aa95c5 100644 --- a/common/flake.nix +++ b/common/flake.nix @@ -4,6 +4,11 @@ home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; + + # tmp + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + opencode.url = "github:sst/opencode/v0.3.13"; + opencode.flake = false; }; outputs = @@ -11,6 +16,8 @@ home-manager, ragenix, nix-flatpak, + opencode, + nixpkgs-unstable, ... }: { @@ -23,6 +30,25 @@ }: { imports = [ + ( + { ... }: + { + nixpkgs.overlays = [ + (final: prev: { + opencode = nixpkgs-unstable.legacyPackages.${prev.system}.opencode.overrideAttrs (old: rec { + version = "0.3.13"; + src = opencode; + node_modules = old.node_modules.overrideAttrs (nmOld: { + outputHash = "sha256-YqSGiikWLErq//RKC3Qcf0aGNFncs3Qx33E8sdKYJ5o="; + }); + tui = old.tui.overrideAttrs (tuiOld: { + vendorHash = "sha256-BVq3+CUMI3CeI9EZkqbnRCvwNc02LgLIvXUp4XQlAx4="; + }); + }); + }) + ]; + } + ) home-manager.nixosModules.home-manager ragenix.nixosModules.age nix-flatpak.nixosModules.nix-flatpak diff --git a/common/programs/opencode.nix b/common/programs/opencode.nix index 62397f7..4036410 100644 --- a/common/programs/opencode.nix +++ b/common/programs/opencode.nix @@ -21,6 +21,8 @@ in }; config = lib.mkIf cfg.enable ({ + + environment.systemPackages = with pkgs; [ opencode ]; diff --git a/flake.lock b/flake.lock index d60a1e2..5be5697 100644 --- a/flake.lock +++ b/flake.lock @@ -153,6 +153,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1751637120, @@ -185,6 +201,23 @@ "type": "github" } }, + "opencode": { + "flake": false, + "locked": { + "lastModified": 1752630643, + "narHash": "sha256-PRNRs0UsKNXFTwvtrrImd3UmrpNvFP9xc8BrIdx1Q9Q=", + "owner": "sst", + "repo": "opencode", + "rev": "0793c3f2a373436fb70eb936df16e21ce1243b19", + "type": "github" + }, + "original": { + "owner": "sst", + "ref": "v0.3.13", + "repo": "opencode", + "type": "github" + } + }, "ragenix": { "inputs": { "agenix": "agenix", @@ -212,6 +245,8 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", + "nixpkgs-unstable": "nixpkgs-unstable", + "opencode": "opencode", "ragenix": "ragenix" } }, diff --git a/flake.nix b/flake.nix index 8dab2ba..7e09a08 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ home-manager.url = "github:rycee/home-manager/release-25.05"; ragenix.url = "github:yaxitech/ragenix"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; + + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + opencode.url = "github:sst/opencode/v0.3.13"; + opencode.flake = false; # ====== };