mirror of
https://github.com/0x1d/nix.git
synced 2026-11-16 00:42:27 +01:00
feat: add claude/opencode desktop, bump claude-desktop to 4.23118.1
- Add claude-desktop and opencode-desktop flake inputs - Override claude-desktop to 4.23118.1 from Anthropic's apt repo (packaging flake's auto-update stalled at 2.9939.4); add pipewire - Override opencode-desktop to 2.2.6 for v2 DB schema compatibility - Add claude-code, zed-editor, gh, git-lfs, qemu/OVMF/virtiofsd Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
48
os/flake.lock
generated
48
os/flake.lock
generated
@@ -1,5 +1,25 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"claude-desktop": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1790632875,
|
||||||
|
"narHash": "sha256-ovY0ssXI4mfcLMa/bS5azndpke3qa0QOOxJgmj7sAXw=",
|
||||||
|
"owner": "poeck",
|
||||||
|
"repo": "claude-desktop-nix-flake",
|
||||||
|
"rev": "55ba585546fe222bf18f391a98c1ee60f79684d2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "poeck",
|
||||||
|
"repo": "claude-desktop-nix-flake",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -39,11 +59,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1788922888,
|
"lastModified": 1793977579,
|
||||||
"narHash": "sha256-QMX3uerxnW2R5dHcWpIQILHDltOZnon3x3Spq7EzBFI=",
|
"narHash": "sha256-WrSODdZFVIs/Hh2NzC0bY+ROByi0bATg8WfePX8dPj8=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a391f95d4557d685fd8e5dc0d4b1f9271aa2f342",
|
"rev": "4fe25e12eb9f4c744966dd3de5a05246cf098601",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -53,11 +73,33 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"opencode-desktop": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1793189451,
|
||||||
|
"narHash": "sha256-CMlMpd8uX2B0vC/0vapdLrc9Ug3WEMdnKc0dxtV4NEc=",
|
||||||
|
"owner": "tomsch",
|
||||||
|
"repo": "opencode-desktop-nix",
|
||||||
|
"rev": "c7efe1aabbaab9ef4ab9a0ac0b7e94392d2d3086",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tomsch",
|
||||||
|
"repo": "opencode-desktop-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"claude-desktop": "claude-desktop",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
|
"opencode-desktop": "opencode-desktop",
|
||||||
"xrlinuxdriver": "xrlinuxdriver"
|
"xrlinuxdriver": "xrlinuxdriver"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
12
os/flake.nix
12
os/flake.nix
@@ -9,9 +9,13 @@
|
|||||||
# XRLinuxDriver from https://github.com/wheaney/XRLinuxDriver/pull/80
|
# XRLinuxDriver from https://github.com/wheaney/XRLinuxDriver/pull/80
|
||||||
xrlinuxdriver.url = "path:/home/master/src/breezy-desktop-nix";
|
xrlinuxdriver.url = "path:/home/master/src/breezy-desktop-nix";
|
||||||
xrlinuxdriver.inputs.nixpkgs.follows = "nixpkgs";
|
xrlinuxdriver.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
claude-desktop.url = "github:poeck/claude-desktop-nix-flake";
|
||||||
|
claude-desktop.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
opencode-desktop.url = "github:tomsch/opencode-desktop-nix";
|
||||||
|
opencode-desktop.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, xrlinuxdriver }:
|
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, xrlinuxdriver, claude-desktop, opencode-desktop }:
|
||||||
let
|
let
|
||||||
breezyPkgs = system: xrlinuxdriver.packages.${system};
|
breezyPkgs = system: xrlinuxdriver.packages.${system};
|
||||||
breezyModule = { gnome ? false }:
|
breezyModule = { gnome ? false }:
|
||||||
@@ -43,7 +47,7 @@
|
|||||||
./users/master.nix
|
./users/master.nix
|
||||||
(breezyModule { gnome = true; })
|
(breezyModule { gnome = true; })
|
||||||
];
|
];
|
||||||
specialArgs = { inherit nixpkgs-unstable; };
|
specialArgs = { inherit nixpkgs-unstable claude-desktop opencode-desktop; };
|
||||||
};
|
};
|
||||||
kde = nixpkgs.lib.nixosSystem {
|
kde = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
@@ -58,7 +62,7 @@
|
|||||||
./users/master.nix
|
./users/master.nix
|
||||||
(breezyModule { })
|
(breezyModule { })
|
||||||
];
|
];
|
||||||
specialArgs = { inherit nixpkgs-unstable; };
|
specialArgs = { inherit nixpkgs-unstable claude-desktop opencode-desktop; };
|
||||||
};
|
};
|
||||||
hyprland = nixpkgs.lib.nixosSystem {
|
hyprland = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
@@ -73,7 +77,7 @@
|
|||||||
./users/master.nix
|
./users/master.nix
|
||||||
(breezyModule { })
|
(breezyModule { })
|
||||||
];
|
];
|
||||||
specialArgs = { inherit nixpkgs-unstable; };
|
specialArgs = { inherit nixpkgs-unstable claude-desktop opencode-desktop; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,9 +1,78 @@
|
|||||||
{ config, pkgs, nixpkgs-unstable, ... }:
|
{ config, pkgs, nixpkgs-unstable, claude-desktop, opencode-desktop, ... }:
|
||||||
let
|
let
|
||||||
unstable = import nixpkgs-unstable {
|
unstable = import nixpkgs-unstable {
|
||||||
system = pkgs.stdenv.hostPlatform.system;
|
system = pkgs.stdenv.hostPlatform.system;
|
||||||
config = config.nixpkgs.config;
|
config = config.nixpkgs.config;
|
||||||
};
|
};
|
||||||
|
# The packaging flake's auto-update stalled at 2.9939.4 (Sep 2026); pull the
|
||||||
|
# current .deb from Anthropic's apt repo directly. Drop once upstream catches up.
|
||||||
|
claudeDesktop = (claude-desktop.packages.${pkgs.system}.default).overrideAttrs (old: rec {
|
||||||
|
version = "4.23118.1";
|
||||||
|
src = pkgs.fetchurl {
|
||||||
|
url = "https://downloads.claude.ai/claude-desktop/apt/stable/pool/main/c/claude-desktop/claude-desktop_${version}_amd64.deb";
|
||||||
|
hash = "sha256-sJzN1ys4kWyWN9SFSNtw53xCXrLgm7RnRlQJ0v+dKHo=";
|
||||||
|
};
|
||||||
|
# 4.x's claude-native binding links against libpipewire.
|
||||||
|
buildInputs = old.buildInputs ++ [ pkgs.pipewire ];
|
||||||
|
});
|
||||||
|
|
||||||
|
# The packaging repo still pins desktop 1.19.5, whose bundled backend only
|
||||||
|
# understands the pre-v2 database schema. The installed CLI (2.2.x) already
|
||||||
|
# uses the v2 schema, so 1.19.5 fails with
|
||||||
|
# "Database is not empty and has no session table".
|
||||||
|
# Use the matching 2.2.6 desktop release instead.
|
||||||
|
opencodeDesktop = (opencode-desktop.packages.${pkgs.system}.default).overrideAttrs (old: {
|
||||||
|
version = "2.2.6";
|
||||||
|
src = pkgs.fetchurl {
|
||||||
|
url = "https://github.com/anomalyco/opencode/releases/download/v2.2.6/opencode-desktop-linux-amd64.deb";
|
||||||
|
hash = "sha256-h/ZlVfOj/sOQHvfhrIb14t61W5AATPQjludUfGsZVFk=";
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out/lib/opencode-desktop $out/bin $out/share
|
||||||
|
cp -r opt/OpenCode/* $out/lib/opencode-desktop/
|
||||||
|
|
||||||
|
# autoPatchelf corrupts the Bun standalone binary that ships as the v2
|
||||||
|
# sidecar. Keep an unmodified copy and restore it after fixup.
|
||||||
|
cp opt/OpenCode/resources/opencode-cli "$TMPDIR/opencode-cli.orig"
|
||||||
|
|
||||||
|
install -Dm644 usr/share/applications/ai.opencode.desktop.desktop \
|
||||||
|
$out/share/applications/opencode-desktop.desktop
|
||||||
|
substituteInPlace $out/share/applications/opencode-desktop.desktop \
|
||||||
|
--replace-fail 'Exec=/opt/OpenCode/ai.opencode %U' "Exec=$out/bin/opencode-desktop %U"
|
||||||
|
|
||||||
|
if [ -d usr/share/icons ]; then
|
||||||
|
cp -r usr/share/icons $out/share/
|
||||||
|
fi
|
||||||
|
|
||||||
|
makeWrapper $out/lib/opencode-desktop/ai.opencode $out/bin/opencode-desktop \
|
||||||
|
--prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath old.buildInputs}" \
|
||||||
|
--set-default OC_ALLOW_WAYLAND 1
|
||||||
|
|
||||||
|
cat > $out/bin/opencode-cli << 'EOF'
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
# Wrapper for opencode CLI - searches PATH and ~/.opencode/bin
|
||||||
|
if command -v opencode &>/dev/null; then
|
||||||
|
exec opencode "$@"
|
||||||
|
elif [ -x "$HOME/.opencode/bin/opencode" ]; then
|
||||||
|
exec "$HOME/.opencode/bin/opencode" "$@"
|
||||||
|
else
|
||||||
|
echo "Error: opencode CLI not found. Install via: curl -fsSL https://opencode.ai/install | bash" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
EOF
|
||||||
|
chmod +x $out/bin/opencode-cli
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
cp "$TMPDIR/opencode-cli.orig" $out/lib/opencode-desktop/resources/opencode-cli
|
||||||
|
chmod +x $out/lib/opencode-desktop/resources/opencode-cli
|
||||||
|
'';
|
||||||
|
});
|
||||||
in {
|
in {
|
||||||
|
|
||||||
nixpkgs.config = {
|
nixpkgs.config = {
|
||||||
@@ -33,6 +102,8 @@ in {
|
|||||||
ripgrep
|
ripgrep
|
||||||
jq
|
jq
|
||||||
git
|
git
|
||||||
|
git-lfs
|
||||||
|
gh
|
||||||
ranger
|
ranger
|
||||||
highlight
|
highlight
|
||||||
gnumake
|
gnumake
|
||||||
@@ -82,6 +153,14 @@ in {
|
|||||||
unstable.golangci-lint
|
unstable.golangci-lint
|
||||||
unstable.terraform
|
unstable.terraform
|
||||||
unstable.opencode
|
unstable.opencode
|
||||||
|
unstable.claude-code
|
||||||
|
unstable.zed-editor
|
||||||
|
claudeDesktop
|
||||||
|
opencodeDesktop
|
||||||
|
libsecret
|
||||||
|
qemu
|
||||||
|
OVMFFull
|
||||||
|
virtiofsd
|
||||||
];
|
];
|
||||||
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
|
|||||||
Reference in New Issue
Block a user