new ds4 from custom fork

This commit is contained in:
ari committed 2026-09-18 21:10:19 -04:00
1 parent a781b759f4
commit 2563492fa4
6 files changed
+79 -35

No files matched your search

-5
View File
@@ -16,11 +16,6 @@
(final: _prev: {
# xAI Grok CLI — prebuilt binary, see pkgs/grok-cli.
grok-cli = final.callPackage ../../pkgs/grok-cli { };
# DwarfStar (antirez/ds4) inference engine, see pkgs/ds4.
# Backend-parameterized: cpu (default), rocm (Strix Halo), cuda.
ds4 = final.callPackage ../../pkgs/ds4 { };
ds4-rocm = final.callPackage ../../pkgs/ds4 { backend = "rocm"; };
ds4-cuda = final.callPackage ../../pkgs/ds4 { backend = "cuda"; };
# colibrì (JustVugg/colibri) — GLM-5.2/OLMoE local inference, see pkgs/colibri.
# Backend-parameterized: cpu (default), rocm (Strix Halo).
colibri = final.callPackage ../../pkgs/colibri { };
+2 -3
View File
@@ -28,9 +28,6 @@ let
overlays = [
(final: _prev: {
grok-cli = final.callPackage ../pkgs/grok-cli { };
# CPU variant only here (buildable on any system); the GPU variants
# need their toolchains and are wired in modules/core/default.nix.
ds4 = final.callPackage ../pkgs/ds4 { };
colibri = final.callPackage ../pkgs/colibri { };
niri-touchscreen-gestures = final.callPackage ../pkgs/niri-touchscreen-gestures { };
buzz-desktop = final.callPackage ../pkgs/buzz-desktop { };
@@ -105,6 +102,8 @@ in
specialArgs = specialArgs // {
inherit system skygUtils user;
unstablePkgs = allUnstablePkgs.${system};
# DwarfStar ds4 from asosnovsky/nixpkgs (ds4-init fork branch), see flake.nix.
ds4Pkgs = specialArgs.my-nixpkgs.legacyPackages.${system};
};
inherit system;
modules = osModules ++ [
+13 -1
View File
@@ -46,7 +46,10 @@ in
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.ssh-notify ];
# hiPrio: desktop hosts (e.g. hl-fwdesk) also pull in the real libnotify
# via the tiler module's "always-on plumbing" packages, and both provide
# bin/notify-send. Force ours to win that collision unconditionally.
environment.systemPackages = [ (lib.hiPrio pkgs.ssh-notify) ];
# Client: ask SSH to forward this connection's notification socket back
# to the shared local listener, and tell the server-side wrapper (via
@@ -61,6 +64,15 @@ in
# above (SSH only passes through an allow-listed set by default).
services.openssh.settings.AcceptEnv = lib.mkIf isServer [ "SSH_NOTIFY_SOCK" ];
# %C is a deterministic hash of (local host, remote user, remote host,
# remote port) -- the same value every time you connect to this host
# from this client, not a per-connection nonce. Without this, a socket
# left behind by an abnormally-ended session (network drop, kill) blocks
# every subsequent connection to the same host with "remote port
# forwarding failed for listen path ...". Tell sshd to unlink and rebind
# instead of refusing.
services.openssh.settings.StreamLocalBindUnlink = lib.mkIf isServer true;
# Client listener: one persistent socket, forked per connection, that
# turns each incoming JSON payload into a real local notification.
systemd.user.services.ssh-notify-listener = lib.mkIf isClient {