Skip to content

Commit 748fb2a

Browse files
committed
feat(t3code): reduce closure reusing package inputs
Upstream package uses nixpkgs based closures but I have several coming from out of tree. Reuse my packages as the inputs to the wrapper.
1 parent 1982850 commit 748fb2a

3 files changed

Lines changed: 40 additions & 22 deletions

File tree

modules/home/programs/terminal/tools/t3code/default.nix

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
config,
3+
getPkgsMaster,
34
lib,
45
osConfig ? { },
56
pkgs,
@@ -21,9 +22,26 @@ in
2122

2223
githubRoot = "${config.home.homeDirectory}/${lib.optionalString pkgs.stdenv.hostPlatform.isLinux "Documents/"}github";
2324

25+
t3codePackage =
26+
let
27+
# TODO: move to regular package after hits channel
28+
# otherwise migrate to llm-agents.nix if provided
29+
pkgsMaster = getPkgsMaster pkgs.stdenv.hostPlatform.system { inherit (pkgs) config; };
30+
in
31+
pkgsMaster.t3code.override {
32+
inherit (pkgs) gh;
33+
inherit (pkgs) git;
34+
35+
enableClaude = false;
36+
enableCodex = false;
37+
enableGit = true;
38+
enableGitHub = true;
39+
enableJujutsu = false;
40+
enableOpencode = false;
41+
};
42+
2443
remoteCommand =
2544
let
26-
t3codePackage = config.programs.t3code.package;
2745
claudeCodePackage = config.programs.claude-code.package or null;
2846
in
2947
pkgs.writeShellApplication {
@@ -92,11 +110,24 @@ in
92110

93111
programs.t3code = {
94112
enable = true;
113+
package = t3codePackage;
95114

96115
userSettings = {
97116
addProjectBaseDirectory = githubRoot;
98117

99-
providers.claudeAgent.customModels = [ "claude-opus-4-8[1m]" ];
118+
providers =
119+
lib.optionalAttrs (config.programs.codex.enable or false) {
120+
codex.binaryPath = lib.getExe config.programs.codex.package;
121+
}
122+
// lib.optionalAttrs (config.programs.claude-code.enable or false) {
123+
claudeAgent = {
124+
binaryPath = lib.getExe config.programs.claude-code.package;
125+
customModels = [ "claude-opus-4-8[1m]" ];
126+
};
127+
}
128+
// lib.optionalAttrs (config.programs.opencode.enable or false) {
129+
opencode.binaryPath = lib.getExe config.programs.opencode.package;
130+
};
100131
};
101132

102133
keybindings = [

overlays/input-packages/default.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ final: prev:
33
let
44
inherit (final.stdenv.hostPlatform) system;
55

6-
master = import inputs.nixpkgs-master {
7-
inherit system;
8-
inherit (prev) config;
9-
};
6+
# master = import inputs.nixpkgs-master {
7+
# inherit system;
8+
# inherit (prev) config;
9+
# };
1010
in
1111
{
1212
# ╭──────────────────────────────────────────────────────────╮
@@ -34,11 +34,9 @@ in
3434
# ╭──────────────────────────────────────────────────────────╮
3535
# │ From nixpkgs-master (fast updating / want latest always) │
3636
# ╰──────────────────────────────────────────────────────────╯
37-
inherit (master)
38-
# TODO: remove after hitting channel
39-
sketchybar
40-
yabai
41-
;
37+
# inherit (master)
38+
# # TODO: remove after hitting channel
39+
# ;
4240
# ╭──────────────────────────────────────────────────────────╮
4341
# │ Python package overrides │
4442
# ╰──────────────────────────────────────────────────────────╯

overlays/t3code/default.nix

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)