diff --git a/flake.nix b/flake.nix index 57fad7b..68f1a49 100644 --- a/flake.nix +++ b/flake.nix @@ -17,8 +17,7 @@ determinate.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0"; nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1"; - # DwarfStar ds4 (package + nixos services.ds4 module) from the asosnovsky/nixpkgs - # fork, branch ds4-init (the implementation proposed for upstream). + # my fork of nixpkgs my-nixpkgs.url = "github:asosnovsky/nixpkgs/ds4-init"; flox.url = "github:flox/flox/latest"; # nix-index database (for nix-index and comma) diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index 117565f..71c75da 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -1,7 +1,6 @@ { pkgs -, config , unstablePkgs -, ds4Pkgs +, myPkgs , my-nixpkgs , ... }: @@ -97,11 +96,8 @@ in services.ds4 = { enable = true; # Strix Halo == gfx1151. Pin explicitly: the fork package's auto-detected - # default can pick the wrong arch on non-GPU eval hosts (see fix on - # asosnovsky/nixpkgs ds4-init), and this host must always build gfx1151. - package = (ds4Pkgs.ds4-rocm.override { rocmArch = "gfx1151"; }); - # Run as the existing ari account (the old skyg module default), so the - # ari-owned /var/lib/ds4 model + kv cache keep their current ownership. + package = (myPkgs.ds4-rocm.override { rocmArch = "gfx1151"; }); + user = "ari"; group = "users"; model = "/var/lib/ds4/ds4flash.gguf"; @@ -192,8 +188,7 @@ in blueman ]) - # DwarfStar (antirez/ds4) — ROCm build for Strix Halo (gfx1151), from the fork. - ++ [ ds4Pkgs.ds4-rocm ]; + ++ [ myPkgs.ds4-rocm ]; services.usbmuxd.enable = true; # Steam programs.steam = { diff --git a/modules/core/default.nix b/modules/core/default.nix index be90674..6050a6c 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -14,10 +14,7 @@ config = { nixpkgs.overlays = [ (final: _prev: { - # xAI Grok CLI — prebuilt binary, see pkgs/grok-cli. - grok-cli = final.callPackage ../../pkgs/grok-cli { }; # colibrì (JustVugg/colibri) — GLM-5.2/OLMoE local inference, see pkgs/colibri. - # Backend-parameterized: cpu (default), rocm (Strix Halo). colibri = final.callPackage ../../pkgs/colibri { }; colibri-rocm = final.callPackage ../../pkgs/colibri { backend = "rocm"; }; # Touchscreen gesture bridge for niri, see pkgs/niri-touchscreen-gestures. diff --git a/modules/lib.nix b/modules/lib.nix index 5b84bb7..a4044c7 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -102,8 +102,7 @@ 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}; + myPkgs = specialArgs.my-nixpkgs.legacyPackages.${system}; }; inherit system; modules = osModules ++ [