clean up & consoldiation of custom pkgs from flakes & herdr
This commit is contained in:
1 parent
6229440107
commit
bdfcb9e814
22 files changed
+207
-446
No files matched your search
@@ -18,8 +18,7 @@ core/
|
||||
|
||||
- **Overlays** (`default.nix`): exposes the `pkgs/` packages — `grok-cli`, `ds4`
|
||||
(+`ds4-rocm`/`ds4-cuda`), `colibri` (+`colibri-rocm`), `niri-touchscreen-gestures`,
|
||||
`buzz-desktop`, `ollama` (+`ollama-rocm`/`ollama-vulkan`) — and patches
|
||||
`python3Packages.pipx` to skip its flaky install check on nixpkgs 26.05.
|
||||
`buzz-desktop`, — and patches `python3Packages.pipx` to skip its flaky install check on nixpkgs 26.05.
|
||||
- **Distributed builds** (`default.nix`): registers `bigbox1.lab.internal` and
|
||||
`fwdesk.lab.internal` as remote `x86_64-linux` build machines and enables
|
||||
`builders-use-substitutes`.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, ... }:
|
||||
{ lib, herdr, flox, claude-desktop, ... }:
|
||||
{
|
||||
imports = [
|
||||
./user.nix
|
||||
@@ -29,11 +29,12 @@
|
||||
niri-touchscreen-gestures = final.callPackage ../../pkgs/niri-touchscreen-gestures { };
|
||||
# Buzz Desktop AppImage wrapper, see pkgs/buzz-desktop.
|
||||
buzz-desktop = final.callPackage ../../pkgs/buzz-desktop { };
|
||||
# ollama pinned ahead of nixpkgs (0.32.14 vs the 0.32.7 in stable/unstable).
|
||||
# See pkgs/ollama for hashing instructions.
|
||||
ollama = final.callPackage ../../pkgs/ollama { };
|
||||
ollama-rocm = final.callPackage ../../pkgs/ollama { acceleration = "rocm"; };
|
||||
ollama-vulkan = final.callPackage ../../pkgs/ollama { acceleration = "vulkan"; };
|
||||
# Claude Desktop (Linux), see pkgs/claude-desktop.
|
||||
claude-desktop = claude-desktop.packages.${final.system}.default;
|
||||
# herdr (herdrdev/herdr) — see flake.nix input.
|
||||
herdr = herdr.packages.${final.system}.default;
|
||||
# flox (flox/flox) — see flake.nix input.
|
||||
flox_dev = flox.packages.${final.system}.default;
|
||||
})
|
||||
(final: prev: {
|
||||
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
||||
|
||||
Reference in new issue
Block a user