latest container work

This commit is contained in:
ari committed 2026-07-17 20:27:21 -04:00
1 parent 29f6186c5c
commit 916799509c
5 files changed
+70 -50

No files matched your search

+1
View File
@@ -185,6 +185,7 @@
# CPU variant of DwarfStar (antirez/ds4); buildable on any system.
# GPU variants (ds4-rocm/ds4-cuda) are overlay-only — see modules/core.
ds4 = lib.pkgs.${system}.ds4;
claude-desktop = pkgs.callPackage ./pkgs/claude-desktop { };
}
);
+3 -2
View File
@@ -205,7 +205,7 @@ in
orca-slicer
devcontainer
gpu-screen-recorder
flox.packages.${system}.default
flox.packages.${pkgs.stdenv.hostPlatform.system}.default
# Run macos apps
darling-dmg
@@ -231,11 +231,12 @@ in
noctaliaPkg
# coding agents
claude-desktop
grok-cli
pi-coding-agent
hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.desktop
hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.default
claude-desktop.packages.x86_64-linux.default
# claude-desktop.packages.x86_64-linux.default
claude-code
# My Own
-31
View File
@@ -41,37 +41,6 @@
};
# Dockge container service group
skyg.nixos.common.container-services.dockge = {
enable = false;
services.dockge = {
image = "louislam/dockge:1";
ports = [ "5001:5001" ];
volumes = [
"/var/run/docker.sock:/var/run/docker.sock"
"dockge-data:/app/data"
"dockge-stacks:/opt/stacks"
];
environment.DOCKGE_STACKS_DIR = "/opt/stacks";
};
volumes = {
dockge-data = {
driver = "local";
driver_opts = {
type = "nfs";
o = "addr=terra1.lab.internal,rw,nfsvers=4.0,nolock,hard,noatime";
device = ":/mnt/Data/apps/bigbox/dockge/data";
};
};
dockge-stacks = {
driver = "local";
driver_opts = {
type = "nfs";
o = "addr=terra1.lab.internal,rw,nfsvers=4.0,nolock,hard,noatime";
device = ":/mnt/Data/apps/bigbox/dockge/stacks";
};
};
};
};
skyg.nixos.common.container-services.jellyfin = {
enable = true;
autoUpdate.enable = true;
@@ -10,11 +10,22 @@
{
description = "Container service group '${groupName}'";
wantedBy = [ "multi-user.target" ];
after = [ runtimeService "network-online.target" "agenix.service" ]
++ lib.optional hasFiles fileServiceDep;
wants = [ "network-online.target" "remote-fs.target" ];
after = [
runtimeService
"network-online.target"
"agenix.service"
"remote-fs.target"
]
++ lib.optional hasFiles fileServiceDep;
requires = [ runtimeService ]
++ lib.optional hasFiles fileServiceDep;
startLimitIntervalSec = 300; # 5 minutes window
startLimitBurst = 6; # allow 6 failures before giving up
serviceConfig = {
Restart = "on-failure";
RestartSec = "15s";
TimeoutStartSec = "120s";
Type = "oneshot";
RemainAfterExit = true;
TimeoutStopSec = grpCfg.timeoutStopSec;
+53 -15
View File
@@ -4,7 +4,6 @@
, dpkg
, autoPatchelfHook
, makeWrapper
, wrapGAppsHook3
, alsa-lib
, at-spi2-atk
, cairo
@@ -14,14 +13,22 @@
, gdk-pixbuf
, glib
, gtk3
, libcap_ng
, libdrm
, libseccomp
, libxkbcommon
, libx11
, libxcomposite
, libxdamage
, libxext
, libxfixes
, libxrandr
, libxcb
, mesa
, nspr
, nss
, pango
, systemd
, xorg
}:
stdenv.mkDerivation (finalAttrs: {
@@ -30,10 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://downloads.claude.ai/claude-desktop/apt/stable/pool/main/c/claude-desktop/claude-desktop_${finalAttrs.version}_amd64.deb";
hash = "6d18ae792c2bddad01edc97c2c3f4cf489004cefe8fed6760a696ed25c49bf61";
hash = "sha256:6d18ae792c2bddad01edc97c2c3f4cf489004cefe8fed6760a696ed25c49bf61";
};
nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper wrapGAppsHook3 ];
nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ];
buildInputs = [
alsa-lib
@@ -45,32 +52,63 @@ stdenv.mkDerivation (finalAttrs: {
gdk-pixbuf
glib
gtk3
libcap_ng
libdrm
libseccomp
libxkbcommon
libx11
libxcomposite
libxdamage
libxext
libxfixes
libxrandr
libxcb
mesa
nspr
nss
pango
systemd
xorg.libX11
xorg.libXcomposite
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXrandr
xorg.libxcb
];
unpackPhase = "dpkg-deb -x $src .";
unpackPhase = ''
mkdir -p work
cd work
ar x $src
tar -xf data.tar.xz --no-same-permissions || tar -xf data.tar.xz
cd ..
mv work/usr .
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r usr/* $out/
# Adjust to the real executable path revealed by: dpkg-deb -c the.deb
makeWrapper $out/lib/claude-desktop/claude-desktop $out/bin/claude-desktop \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ mesa ]}"
# Move the original binary and create a wrapper
mv $out/lib/claude-desktop/claude-desktop $out/lib/claude-desktop/.claude-desktop-wrapped
makeWrapper $out/lib/claude-desktop/.claude-desktop-wrapped $out/bin/claude-desktop \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
mesa
libxkbcommon
libx11
libxcomposite
libxdamage
libxext
libxfixes
libxrandr
libxcb
glib
nspr
nss
cairo
pango
gdk-pixbuf
at-spi2-atk
dbus
cups
systemd
alsa-lib
]}"
# Fix desktop-file Exec/Icon paths if present
if [ -d usr/share/applications ]; then