diff --git a/GUIDELINES.md b/GUIDELINES.md index d58d9c1..e57fdd8 100644 --- a/GUIDELINES.md +++ b/GUIDELINES.md @@ -120,7 +120,7 @@ option. Default should be `false` unless the feature is universally required. - When in doubt, keep it in the host file and extract later if reuse emerges ### Package Placement -- Packages needed on all desktops → `modules/nixos/desktop/packages.nix` +- Packages needed on all desktops → `modules/nixos/desktop/default.nix` (non-slim mode) - Packages for one host only → `environment.systemPackages` in the host file - Custom/third-party packages not in nixpkgs → `pkgs//default.nix` with an overlay in `modules/core/default.nix` diff --git a/flake.lock b/flake.lock index c8c2ae7..ef8b2e2 100644 --- a/flake.lock +++ b/flake.lock @@ -611,10 +611,29 @@ "type": "github" } }, + "herdr": { + "inputs": { + "nixpkgs": "nixpkgs_5", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1788910531, + "narHash": "sha256-IfO2SVreHPRwWmRMR2mgd1ffuP67TxLsR7YrcC4z/EU=", + "owner": "herdrdev", + "repo": "herdr", + "rev": "b9ce96869e89937278d673d70ae4c135dd318469", + "type": "github" + }, + "original": { + "owner": "herdrdev", + "repo": "herdr", + "type": "github" + } + }, "hermes-agent": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "npm-lockfile-fix": "npm-lockfile-fix", "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", @@ -774,7 +793,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks": "pre-commit-hooks_2", "systems": "systems_3", "xdph": "xdph" @@ -963,7 +982,7 @@ "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", "hyprwire": "hyprwire_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "systems": "systems_4" }, "locked": { @@ -1311,7 +1330,7 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1786867632, @@ -1390,6 +1409,20 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1786711500, + "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=", + "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d", + "revCount": 1011966, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1011966%2Brev-02e08985a27c65ffd33d434eeb2e660a2e4dc84d/01a003f1-59bd-7782-b0ed-5cbf8697f61e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1784160687, @@ -1435,6 +1468,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1779911860, + "narHash": "sha256-ubcLAcKBDCZjhxw/kH5DL5GdBZQdzLqpkTe7HonvJVs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c0a89c379b4ac67c7b13b051ddbd4e0dbc9b0eaf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1785318670, "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=", @@ -1450,7 +1499,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1787736819, "narHash": "sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA=", @@ -1466,7 +1515,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1786247143, "narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=", @@ -1482,7 +1531,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1767892417, "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", @@ -1495,20 +1544,6 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1786711500, - "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=", - "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d", - "revCount": 1011966, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1011966%2Brev-02e08985a27c65ffd33d434eeb2e660a2e4dc84d/01a003f1-59bd-7782-b0ed-5cbf8697f61e/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -1678,6 +1713,7 @@ "dms": "dms", "flox": "flox", "git-hooks": "git-hooks", + "herdr": "herdr", "hermes-agent": "hermes-agent", "home-manager": "home-manager_2", "hyprland": "hyprland", @@ -1686,7 +1722,7 @@ "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "nixpkgs-unstable": "nixpkgs-unstable", "noctalia": "noctalia", "stylix": "stylix", @@ -1711,6 +1747,27 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "herdr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1783577481, + "narHash": "sha256-EWMxOWrJ031f8f/lrcEmhTRs4npw1/5N3Hcjin846c8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "4cdea398dc491b082dccdce0fad1ed0b75fa3394", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", diff --git a/flake.nix b/flake.nix index 5aad801..6560327 100644 --- a/flake.nix +++ b/flake.nix @@ -64,6 +64,7 @@ url = "github:zackb/tether"; inputs.nixpkgs.follows = "nixpkgs"; }; + herdr.url = "github:herdrdev/herdr"; }; outputs = { self @@ -85,8 +86,9 @@ , nix-index-database , agenix , hermes-agent - , claude-desktop , tether + , herdr + , claude-desktop }: let # Libs @@ -124,6 +126,7 @@ flox determinate tether + herdr ; }; } @@ -203,15 +206,10 @@ openwrt-glmain = (openwrt (import ./openwrt-routers/glmain.nix)).deployScript; openwrt-glmain-dry-run = (openwrt (import ./openwrt-routers/glmain.nix)).dryRunScript; grok-cli = lib.pkgs.${system}.grok-cli; - # 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 { }; - # Buzz Desktop AppImage (block/buzz) with NixOS FHS extras. buzz-desktop = lib.pkgs.${system}.buzz-desktop; - # CPU variant of colibrì (JustVugg/colibri); the ROCm variant - # (colibri-rocm) is overlay-only — see modules/core. colibri = lib.pkgs.${system}.colibri; + herdr = herdr.packages.${system}.default; } ); diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index f82ba2c..027ada6 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -3,8 +3,6 @@ , lib , user , unstablePkgs -, claude-desktop -, flox , ... }: let @@ -214,7 +212,7 @@ in orca-slicer devcontainer gpu-screen-recorder - flox.packages.${pkgs.stdenv.hostPlatform.system}.default + flox_dev # Run macos apps darling-dmg @@ -243,6 +241,7 @@ in claude-code buzz-desktop bubblewrap + herdr ]); diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index fbc0497..d098a70 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -1,7 +1,6 @@ { pkgs , config -, skygUtils -, lib +, unstablePkgs , ... }: let @@ -153,12 +152,13 @@ in # development zed-editor-fhs nix-prefetch + herdr # Steam mangohud # LLM Stuff - ollama-rocm + unstablePkgs.ollama-rocm grok-cli # stable-diffusion-cpp-rocm lmstudio diff --git a/hosts/hl-pi1.nix b/hosts/hl-pi1.nix index d9fc9ae..7eba7ed 100644 --- a/hosts/hl-pi1.nix +++ b/hosts/hl-pi1.nix @@ -1,12 +1,23 @@ -{ lib, pkgs, config, determinate, ... }: +{ lib +, pkgs +, config +, determinate +, ... +}: { skyg = { - user.enable = true; + user.enable = false; nixos = { - common.ssh-server.enable = true; - common.hardware = { - sound.enable = true; - pipewire.enable = true; + common = { + minimal = true; + fonts.minimal = true; + ssh-server.enable = true; + containers.enable = false; + networking.nfsServer.enable = false; + hardware = { + sound.enable = true; + pipewire.enable = true; + }; }; desktop = { enable = true; diff --git a/modules/core/ABOUTME.md b/modules/core/ABOUTME.md index 9d3c0a6..a6da3c7 100644 --- a/modules/core/ABOUTME.md +++ b/modules/core/ABOUTME.md @@ -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`. diff --git a/modules/core/default.nix b/modules/core/default.nix index 9559af0..385eaf8 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -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 ++ [ diff --git a/modules/nixos/common/ABOUTME.md b/modules/nixos/common/ABOUTME.md index cd47786..d6f16d7 100644 --- a/modules/nixos/common/ABOUTME.md +++ b/modules/nixos/common/ABOUTME.md @@ -9,10 +9,10 @@ Most leaf modules expose a `skyg.nixos.common.*` enable flag and stay inert unti ``` common/ ├── default.nix # Imports everything below + always-on env defaults -├── core.nix # System packages, nh, nix-ld, timezone (Toronto), locale, GC cron -├── networking.nix # skyg.core.hostName, NetworkManager, NFS server +├── core.nix # System packages, nh, nix-ld, timezone (Toronto), locale, GC cron; skyg.nixos.common.minimal +├── networking.nix # skyg.core.hostName, NetworkManager, NFS server (skyg.nixos.common.networking.nfsServer) ├── user.nix # skyg.user.createSystemUser — creates the system user/groups + zsh shell -├── fonts.nix # System font packages + fontconfig defaults (Fira Code, Noto, …) +├── fonts.nix # System font packages + fontconfig defaults (Fira Code, Noto, …); skyg.nixos.common.fonts.minimal ├── ssh-server.nix # skyg.nixos.common.ssh-server — hardened sshd + master pubkey ├── ssh-notify.nix # skyg.nixos.common.ssh-notify — forward notify-send from SSH sessions to a desktop client ├── qemu.nix # skyg.core.qemu — QEMU/quickemu + SPICE guest tooling @@ -43,7 +43,10 @@ skyg.core.qemu.* → qemu.nix skyg.nixos.common.ssh-server.* → ssh-server.nix skyg.nixos.common.ssh-notify.* → ssh-notify.nix skyg.nixos.common.cachePush.* → binary-cache.nix -skyg.nixos.common.containers.* → containers/ +skyg.nixos.common.minimal → core.nix (skip heavy always-on system packages) +skyg.nixos.common.fonts.minimal → fonts.nix (install only a minimal font set) +skyg.nixos.common.networking.nfsServer → networking.nix (enable/disable the NFS server) +skyg.nixos.common.containers.* → containers/ skyg.nixos.common.hardware.* → hardware/ skyg.nixos.common.pritunl.* → pritunl/ ``` diff --git a/modules/nixos/common/containers/ABOUTME.md b/modules/nixos/common/containers/ABOUTME.md index 81f31e7..8806123 100644 --- a/modules/nixos/common/containers/ABOUTME.md +++ b/modules/nixos/common/containers/ABOUTME.md @@ -37,6 +37,7 @@ consistently (compose tooling, user group membership, OCI backend, metrics). ### Option namespace ``` +skyg.nixos.common.containers.enable → false to disable the container runtime entirely skyg.nixos.common.containers.runtime → "docker" | "podman" skyg.nixos.common.containers.enableOnBoot skyg.nixos.common.containers.localDockerRegistries diff --git a/modules/nixos/common/containers/default.nix b/modules/nixos/common/containers/default.nix index 9bcb7f3..2c70514 100644 --- a/modules/nixos/common/containers/default.nix +++ b/modules/nixos/common/containers/default.nix @@ -8,6 +8,11 @@ ]; options = { skyg.nixos.common.containers = { + enable = lib.mkOption { + description = "Whether to enable the container runtime (docker/podman)."; + type = lib.types.bool; + default = true; + }; runtime = lib.mkOption { description = "Docker vs podman"; type = lib.types.str; diff --git a/modules/nixos/common/containers/docker.nix b/modules/nixos/common/containers/docker.nix index c0e02e6..bc715b7 100644 --- a/modules/nixos/common/containers/docker.nix +++ b/modules/nixos/common/containers/docker.nix @@ -4,7 +4,7 @@ let cfg = config.skyg.nixos.common.containers; in { - config = lib.mkIf (cfg.runtime == "docker") { + config = lib.mkIf (cfg.enable && cfg.runtime == "docker") { virtualisation.docker = { enable = true; autoPrune.enable = true; diff --git a/modules/nixos/common/containers/podman.nix b/modules/nixos/common/containers/podman.nix index b324940..2cc3ac0 100644 --- a/modules/nixos/common/containers/podman.nix +++ b/modules/nixos/common/containers/podman.nix @@ -3,7 +3,7 @@ let cfg = config.skyg.nixos.common.containers; in { - config = lib.mkIf (cfg.runtime == "podman") { + config = lib.mkIf (cfg.enable && cfg.runtime == "podman") { virtualisation.oci-containers.backend = "podman"; virtualisation = { podman = { diff --git a/modules/nixos/common/core.nix b/modules/nixos/common/core.nix index 20ae321..d5a591a 100644 --- a/modules/nixos/common/core.nix +++ b/modules/nixos/common/core.nix @@ -13,6 +13,11 @@ default = 7; }; }; + nixos.common.minimal = lib.mkOption { + type = lib.types.bool; + description = "Minimal common system: skip heavy always-on packages for lean hosts."; + default = false; + }; }; config = let skyg = config.skyg; in { @@ -29,35 +34,39 @@ enable = true; clean.enable = true; }; - environment.systemPackages = with pkgs; [ - # shell tools - git - usbutils + environment.systemPackages = + (with pkgs; [ + # shell tools + git + usbutils - # system utils - nfs-utils - lm_sensors - hwinfo - dig - iperf + # shell tools + wget + ]) + # On lean hosts, skip the heavy server/nix-dev extra tools. + ++ (lib.optionals (!config.skyg.nixos.common.minimal) (with pkgs; [ + # system utils + nfs-utils + lm_sensors + hwinfo + dig + iperf - # misc - glib-networking - glib - glibc + # misc + glib-networking + glib + glibc - # printer - system-config-printer + # printer + system-config-printer - # nix utils - nix-index - nil - cachix - nixpkgs-fmt - nvd - # shell tools - wget - ]; + # nix utils + nix-index + nil + cachix + nixpkgs-fmt + nvd + ])); services.xserver.excludePackages = with pkgs; [ xterm ]; diff --git a/modules/nixos/common/fonts.nix b/modules/nixos/common/fonts.nix index 421d76c..c595503 100644 --- a/modules/nixos/common/fonts.nix +++ b/modules/nixos/common/fonts.nix @@ -1,6 +1,6 @@ -{ pkgs, ... }: +{ config, pkgs, lib, ... }: let - fontPackages = with pkgs; [ + fullFontPackages = with pkgs; [ nerd-fonts.fira-code nerd-fonts.droid-sans-mono nerd-fonts.fira-mono @@ -14,20 +14,38 @@ let noto-fonts-cjk-sans noto-fonts-color-emoji ]; + minimalFontPackages = with pkgs; [ + fira-code + noto-fonts + noto-fonts-color-emoji + ]; in { - environment.systemPackages = fontPackages; - fonts = { - packages = fontPackages; - enableDefaultPackages = true; - fontDir.enable = true; - fontconfig = { - enable = true; - defaultFonts = { - serif = [ "Fira Code" "DroidSansMono" ]; - sansSerif = [ "Fira Code" "DroidSansMono" ]; - monospace = [ "Fira Code" ]; - }; + options.skyg.nixos.common.fonts = { + minimal = lib.mkOption { + type = lib.types.bool; + description = "Install only a minimal font set (for lean hosts)."; + default = false; }; }; + config = + let + fontPackages = if config.skyg.nixos.common.fonts.minimal then minimalFontPackages else fullFontPackages; + in + { + environment.systemPackages = fontPackages; + fonts = { + packages = fontPackages; + enableDefaultPackages = true; + fontDir.enable = true; + fontconfig = { + enable = true; + defaultFonts = { + serif = [ "Fira Code" "DroidSansMono" ]; + sansSerif = [ "Fira Code" "DroidSansMono" ]; + monospace = [ "Fira Code" ]; + }; + }; + }; + }; } diff --git a/modules/nixos/common/networking.nix b/modules/nixos/common/networking.nix index 0888b5f..25795b9 100644 --- a/modules/nixos/common/networking.nix +++ b/modules/nixos/common/networking.nix @@ -10,6 +10,13 @@ in type = lib.types.str; }; }; + skyg.nixos.common.networking = { + nfsServer.enable = lib.mkOption { + description = "Enable the NFS server (services.nfs.server)."; + type = lib.types.bool; + default = true; + }; + }; }; config = { # Define hostname. @@ -19,7 +26,7 @@ in networking.networkmanager.enable = true; # NFS Support - services.nfs.server.enable = true; + services.nfs.server.enable = config.skyg.nixos.common.networking.nfsServer.enable; # Disable the flaky nm service systemd.services.NetworkManager-wait-online.enable = false; diff --git a/modules/nixos/common/user.nix b/modules/nixos/common/user.nix index 4969491..e40aab6 100644 --- a/modules/nixos/common/user.nix +++ b/modules/nixos/common/user.nix @@ -11,6 +11,7 @@ in }; config = lib.mkIf (cfg.name != "" && cfg.createSystemUser) { + programs.zsh.enable = true; users.users.root = { shell = pkgs.zsh; }; diff --git a/modules/nixos/server/services/ABOUTME.md b/modules/nixos/server/services/ABOUTME.md index 55ec2f8..1631c42 100644 --- a/modules/nixos/server/services/ABOUTME.md +++ b/modules/nixos/server/services/ABOUTME.md @@ -10,7 +10,7 @@ independent `skyg.nixos.server.services..enable` flag. Most run as OCI con ``` services/ ├── default.nix # imports the services below -├── ai-services.nix # skyg.nixos.server.services.ai — ollama + Wyoming (whisper/piper/wake) +├── ai-services.nix # skyg.nixos.server.services.ai — Wyoming (whisper/piper/wake) ├── audiobookshelf.nix # skyg.nixos.server.services.audiobookshelf — audiobook/podcast server ├── ds4.nix # skyg.nixos.server.services.ds4 — ds4-server HTTP API (DwarfStar local inference) ├── jellyfin.nix # skyg.nixos.server.services.jellyfin — media server (uid/gid 7777) @@ -21,7 +21,7 @@ services/ ## Notable details -- **`ai-services.nix`** runs ollama (GPU-passthrough) and openwakeword as containers and +- **`ai-services.nix`** openwakeword as containers and enables NixOS-native Wyoming faster-whisper + piper. Opens 11434/10200/10300/10400. - **`ds4.nix`** runs `ds4-server` (the OpenAI/Anthropic-compatible HTTP API for DwarfStar DeepSeek V4 inference) as a native systemd service. `package` selects the backend diff --git a/modules/nixos/server/services/ai-services.nix b/modules/nixos/server/services/ai-services.nix index 8349d9d..e504519 100644 --- a/modules/nixos/server/services/ai-services.nix +++ b/modules/nixos/server/services/ai-services.nix @@ -24,13 +24,6 @@ in networking.firewall.allowedTCPPorts = openPorts; virtualisation.oci-containers = { containers = { - # ollama = { - # autoStart = true; - # image = "ollama/ollama"; - # extraOptions = [ "--device=nvidia.com/gpu=all" ]; - # ports = [ "11434:11434" ]; - # volumes = [ "ollama:/root/.ollama" ]; - # }; openwakeword = { autoStart = true; image = "rhasspy/wyoming-openwakeword"; diff --git a/pkgs/ABOUTME.md b/pkgs/ABOUTME.md index c001bda..3c5330b 100644 --- a/pkgs/ABOUTME.md +++ b/pkgs/ABOUTME.md @@ -11,9 +11,7 @@ Packages here are exposed via an overlay defined in `modules/core/default.nix`. | `ds4/` | DwarfStar (`antirez/ds4`) DeepSeek V4 local inference engine, built from source. Backend-parameterized (`backend = "cpu" \| "rocm" \| "cuda"`); tracks `main` and builds per-host. Exposed as `pkgs.ds4` (cpu, default), `pkgs.ds4-rocm` (Strix Halo / gfx1151), `pkgs.ds4-cuda`. Installs the `ds4`, `ds4-server`, `ds4-bench`, `ds4-eval`, `ds4-agent` binaries plus a `ds4-download-model` helper for fetching GGUF weights. Model weights are a runtime concern and not packaged. | | `colibri/` | colibrì (`JustVugg/colibri`) — GLM-5.2/OLMoE local inference engine, built from source, pinned to a tagged release. Backend-parameterized (`backend = "cpu" \| "rocm"`). Exposed as `pkgs.colibri` (cpu, default), `pkgs.colibri-rocm` (Strix Halo / gfx1151). Installs the `coli` CLI (wrapped with the Python env its converter/bench subcommands need) plus the bundled `colibri`/`olmoe` engine binaries. Model weights are a runtime concern and not packaged. | | `niri-touchscreen-gestures/` | Python daemon that reads multi-touch events from a touchscreen via `evdev`, detects 2/3/4-finger swipes (up/down/left/right), and dispatches configurable `niri msg action` commands. Configured via TOML; exposed as `pkgs.niri-touchscreen-gestures`. | -| `ollama/` | Ollama local LLM inference server, pinned ahead of nixpkgs (0.32.14 vs 0.32.7 in stable/unstable). Derived from nixpkgs master's 0.32.13 derivation (FetchContent-based llama.cpp, Vulkan/ROCm backends) bumped to 0.32.14. Exposed as `pkgs.ollama` (cpu), `pkgs.ollama-rocm` (Strix Halo / gfx1151), `pkgs.ollama-vulkan`. | | `buzz-desktop/` | Block Buzz desktop (Type-2 AppImage from `block/buzz`). Wrapped with `appimageTools.wrapType2` plus extra FHS libs (`elfutils`, `zstd`, WebKit/tray, GStreamer good/bad) so it runs on NixOS. Exposed as `pkgs.buzz-desktop` (`buzz-desktop` binary + desktop entry / icons). | -| `claude-desktop/` | Claude Desktop (Linux) — `.deb` fetched from `downloads.claude.ai`, unpacked and re-wrapped with `makeWrapper` (binary moved aside, `LD_LIBRARY_PATH` pointed at its bundled libs). Exposed as the `claude-desktop` flake output (via `pkgs.callPackage` in `flake.nix`, not the core overlay) and installed on `fwbook`. | ## Adding a New Package diff --git a/pkgs/ollama/default.nix b/pkgs/ollama/default.nix deleted file mode 100644 index 611350c..0000000 --- a/pkgs/ollama/default.nix +++ /dev/null @@ -1,339 +0,0 @@ -# ollama — local LLM inference server, version-pinned ahead of nixpkgs. -# -# Derived from nixpkgs master's ollama package.nix at the 0.32.13 commit -# (which introduced the FetchContent-based llama.cpp build, Vulkan/ROCm/CUDA -# backends, and spirv-headers). Updated to 0.32.14. -# -# UPDATING THIS PACKAGE -# ===================== -# 1. Set `version` to the new tag (without "v"). -# 2. Set `src.hash` to `lib.fakeHash` and attempt a build. -# Copy the "got: sha256-..." value from the Nix error output. -# 3. Set `vendorHash` to `lib.fakeHash` and attempt a build again. -# Copy the "got: sha256-..." value from the Nix error output. -# 4. Check whether LLAMA_CPP_VERSION changed in the new release tag. -# If so, also update `llamaCppVersion` and `llamaCppSrc.hash`. - -{ lib -, buildGoModule -, fetchFromGitHub -, buildEnv -, makeBinaryWrapper -, stdenv -, addDriverRunpath -, cmake -, gitMinimal -, clblast -, libdrm -, rocmPackages -, rocmGpuTargets ? rocmPackages.clr.localGpuTargets or (rocmPackages.clr.gpuTargets or [ ]) -, cudaPackages -, cudaArches ? cudaPackages.flags.realArches or [ ] -, autoAddDriverRunpath -, apple-sdk_15 -, vulkan-tools -, vulkan-headers -, vulkan-loader -, spirv-headers -, shaderc -, ccache -, versionCheckHook -, writableTmpDirAsHomeHook -, config -, # one of `[ null false "rocm" "cuda" "vulkan" ]` - acceleration ? null -, -}: - -assert builtins.elem acceleration [ - null - false - "rocm" - "cuda" - "vulkan" -]; - -let - validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) - (lib.concatStrings [ - "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, " - "but they are mutually exclusive; falling back to cpu" - ]) - (!(config.rocmSupport && config.cudaSupport)); - shouldEnable = - mode: fallback: (acceleration == mode) || (fallback && acceleration == null && validateFallback); - - rocmRequested = shouldEnable "rocm" config.rocmSupport; - cudaRequested = shouldEnable "cuda" config.cudaSupport; - vulkanRequested = acceleration == "vulkan"; - - enableRocm = rocmRequested && stdenv.hostPlatform.isLinux; - enableCuda = cudaRequested && stdenv.hostPlatform.isLinux; - enableVulkan = vulkanRequested && stdenv.hostPlatform.isLinux; - - rocmLibs = [ - rocmPackages.clr - rocmPackages.hipblas-common - rocmPackages.hipblas - rocmPackages.rocblas - rocmPackages.rocsolver - rocmPackages.rocsparse - rocmPackages.rocm-device-libs - rocmPackages.rocm-smi - ]; - rocmPath = buildEnv { - name = "rocm-path"; - paths = rocmLibs; - }; - - cudaLibs = [ - cudaPackages.cuda_cudart - cudaPackages.libcublas - cudaPackages.cccl - ]; - - vulkanLibs = [ - vulkan-headers - vulkan-loader - ]; - - cudaMajorVersion = lib.versions.major cudaPackages.cuda_cudart.version; - - cudaToolkit = buildEnv { - name = "cuda-merged-${cudaMajorVersion}"; - paths = map lib.getLib cudaLibs ++ [ - (lib.getOutput "static" cudaPackages.cuda_cudart) - (lib.getBin (cudaPackages.cuda_nvcc.__spliced.buildHost or cudaPackages.cuda_nvcc)) - ]; - ignoreCollisions = true; - }; - - cudaPath = lib.removeSuffix "-${cudaMajorVersion}" cudaToolkit; - - # Since v0.30, llama.cpp is consumed via CMake FetchContent rather than - # vendored in-tree. Pre-stage the pin so the FetchContent step uses our - # copy instead of trying to clone over the network in the sandbox. - # Check LLAMA_CPP_VERSION in the ollama source tree when bumping. - llamaCppVersion = "b10434"; - llamaCppSrc = fetchFromGitHub { - owner = "ggml-org"; - repo = "llama.cpp"; - tag = llamaCppVersion; - hash = "sha256-Sz0kW1q91YzdrKbZUqMbFJ0DLZrzARSGheUrtCKcoQo="; - }; - - wrapperOptions = [ - "--suffix LD_LIBRARY_PATH : '${addDriverRunpath.driverLink}/lib'" - ] - ++ lib.optionals enableRocm [ - "--suffix LD_LIBRARY_PATH : '${rocmPath}/lib'" - "--set-default HIP_PATH '${rocmPath}'" - ] - ++ lib.optionals enableCuda [ - "--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib cudaLibs)}'" - ] - ++ lib.optionals enableVulkan [ - "--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib vulkanLibs)}'" - "--set-default OLLAMA_VULKAN '1'" - ]; - wrapperArgs = builtins.concatStringsSep " " wrapperOptions; - - goBuild = - if enableCuda then - buildGoModule.override { stdenv = cudaPackages.backendStdenv; } - else if enableRocm then - buildGoModule.override { inherit (rocmPackages) stdenv; } - else if enableVulkan then - buildGoModule.override { inherit (vulkan-tools) stdenv; } - else - buildGoModule; - - inherit (lib) licenses platforms maintainers; -in -goBuild (finalAttrs: { - pname = "ollama"; - version = "0.32.14"; - - src = fetchFromGitHub { - owner = "ollama"; - repo = "ollama"; - tag = "v${finalAttrs.version}"; - hash = "sha256-wvEG7L61gYI63pfHZ9UnTVQh8QMG3wHMfxEBeshtIKQ="; - }; - - vendorHash = "sha256-HMwoaFBMbpoy8f0I+O+i7kIa9BslLu3FcVWeaIOkpvs="; - proxyVendor = true; - - env = - lib.optionalAttrs enableRocm - { - ROCM_PATH = rocmPath; - CLBlast_DIR = "${clblast}/lib/cmake/CLBlast"; - HIP_PATH = rocmPath; - CFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include"; - CXXFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include"; - } - // lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; } - // lib.optionalAttrs enableVulkan { VULKAN_SDK = shaderc.bin; }; - - nativeBuildInputs = [ - cmake - gitMinimal - ] - ++ lib.optionals enableRocm ( - rocmLibs - ++ [ - rocmPackages.llvm.bintools - ] - ) - ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ] - ++ lib.optionals (enableRocm || enableCuda) [ - makeBinaryWrapper - autoAddDriverRunpath - ] - ++ lib.optionals enableVulkan [ - ccache - spirv-headers - ]; - - buildInputs = - lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) - ++ lib.optionals enableCuda cudaLibs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ] - ++ lib.optionals enableVulkan vulkanLibs; - - postPatch = '' - substituteInPlace version/version.go \ - --replace-fail 0.0.0 '${finalAttrs.version}' - - rm cmd/launch/*_test.go - - rm -r app - - if [[ ${llamaCppVersion} != $(cat LLAMA_CPP_VERSION) ]]; then - echo "llama-cpp version mismatch, expected ${llamaCppVersion}, but found $(cat LLAMA_CPP_VERSION)" - exit 1 - fi - cp -r ${llamaCppSrc} $TMPDIR/llama-cpp-src - chmod -R +w $TMPDIR/llama-cpp-src - ( cd $TMPDIR/llama-cpp-src && \ - cmake -DPATCH_DIR=$NIX_BUILD_TOP/source/llama/compat \ - -P $NIX_BUILD_TOP/source/llama/compat/apply-patch.cmake ) - ''; - - overrideModAttrs = _: _: { - preBuild = ""; - }; - - preBuild = - let - removeSMPrefix = - str: - let - matched = builtins.match "sm_(.*)" str; - in - if matched == null then str else builtins.head matched; - - cudaArchitectures = builtins.concatStringsSep ";" (map removeSMPrefix cudaArches); - rocmTargets = builtins.concatStringsSep ";" rocmGpuTargets; - - rocmMajorVersion = lib.versions.major rocmPackages.clr.version; - rocmMinorVersion = lib.versions.minor rocmPackages.clr.version; - llamaBackend = - if enableCuda then - "cuda_v${cudaMajorVersion}" - else if enableRocm then - "rocm_v${rocmMajorVersion}_${rocmMinorVersion}" - else if enableVulkan then - "vulkan" - else - ""; - - cmakeFlagsCudaArchitectures = lib.optionalString enableCuda "-DCMAKE_CUDA_ARCHITECTURES='${cudaArchitectures}'"; - cmakeFlagsRocmTargets = lib.optionalString enableRocm "-DAMDGPU_TARGETS='${rocmTargets}'"; - cmakeFlagsBackend = lib.optionalString - ( - llamaBackend != "" - ) "-DOLLAMA_LLAMA_BACKENDS=${llamaBackend}"; - in - '' - ${lib.optionalString enableVulkan '' - export CMAKE_PREFIX_PATH="${spirv-headers}''${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}" - export NIX_CFLAGS_COMPILE="-isystem ${spirv-headers}/include $NIX_CFLAGS_COMPILE" - ''} - cmake -B build \ - -DCMAKE_SKIP_BUILD_RPATH=ON \ - -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ - -DFETCHCONTENT_SOURCE_DIR_LLAMA_CPP="$TMPDIR/llama-cpp-src" \ - -DOLLAMA_MLX_BACKENDS="" \ - $cmakeFlags \ - ${cmakeFlagsCudaArchitectures} \ - ${cmakeFlagsRocmTargets} \ - ${cmakeFlagsBackend} - - cmake --build build -j $NIX_BUILD_CORES - ''; - - preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - find $out/lib/ollama -type f \( -name '*.so' -o -name '*.so.*' \) \ - -exec patchelf --shrink-rpath --allowed-rpath-prefixes /nix/store {} + - ''; - - postInstall = '' - mkdir -p $out/lib - cp -r build/lib/ollama $out/lib/ - ''; - - postFixup = - lib.optionalString (enableRocm || enableCuda) '' - wrapProgram "$out/bin/ollama" ${wrapperArgs} - ''; - - ldflags = [ - "-X=github.com/ollama/ollama/version.Version=${finalAttrs.version}" - "-X=github.com/ollama/ollama/server.mode=release" - ]; - - __darwinAllowLocalNetworking = true; - - sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' - (allow file-read* (subpath "/System/Library/Extensions")) - (allow iokit-open (iokit-user-client-class "AGXDeviceUserClient")) - ''; - - checkFlags = - let - skippedTests = [ - "TestPushHandler/unauthorized_push" - "TestPiRun_InstallAndWebSearchLifecycle" - ]; - in - [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - - doInstallCheck = true; - nativeInstallCheckInputs = [ - versionCheckHook - writableTmpDirAsHomeHook - ]; - versionCheckKeepEnvironment = "HOME"; - - passthru = { - inherit llamaCppSrc llamaCppVersion; - }; - - meta = { - description = - "Get up and running with large language models locally" - + lib.optionalString rocmRequested ", using ROCm for AMD GPU acceleration" - + lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration" - + lib.optionalString vulkanRequested ", using Vulkan for generic GPU acceleration"; - homepage = "https://github.com/ollama/ollama"; - changelog = "https://github.com/ollama/ollama/releases/tag/v${finalAttrs.version}"; - license = licenses.mit; - platforms = - if (rocmRequested || cudaRequested || vulkanRequested) then platforms.linux else platforms.unix; - mainProgram = "ollama"; - maintainers = with maintainers; [ prusnak ]; - broken = stdenv.buildPlatform != stdenv.hostPlatform; - }; -}) diff --git a/secrets/glmain.json.age b/secrets/glmain.json.age index 5692b01..d772541 100644 Binary files a/secrets/glmain.json.age and b/secrets/glmain.json.age differ