From bdfcb9e8147fcc342f62c78fb052a282cc033f61 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 9 Sep 2026 11:46:46 -0400 Subject: [PATCH] clean up & consoldiation of custom pkgs from flakes & herdr --- GUIDELINES.md | 2 +- flake.lock | 101 ++++-- flake.nix | 12 +- hosts/fwbook.nix | 5 +- hosts/hl-fwdesk.nix | 6 +- hosts/hl-pi1.nix | 23 +- modules/core/ABOUTME.md | 3 +- modules/core/default.nix | 13 +- modules/nixos/common/ABOUTME.md | 11 +- modules/nixos/common/containers/ABOUTME.md | 1 + modules/nixos/common/containers/default.nix | 5 + modules/nixos/common/containers/docker.nix | 2 +- modules/nixos/common/containers/podman.nix | 2 +- modules/nixos/common/core.nix | 59 +-- modules/nixos/common/fonts.nix | 46 ++- modules/nixos/common/networking.nix | 9 +- modules/nixos/common/user.nix | 1 + modules/nixos/server/services/ABOUTME.md | 4 +- modules/nixos/server/services/ai-services.nix | 7 - pkgs/ABOUTME.md | 2 - pkgs/ollama/default.nix | 339 ------------------ secrets/glmain.json.age | Bin 6110 -> 6112 bytes 22 files changed, 207 insertions(+), 446 deletions(-) delete mode 100644 pkgs/ollama/default.nix 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 5692b01b1b6aab71715b589232b445e78d80fb9c..d772541976efea4b58b097d9f3bf3dedf3b8ff80 100644 GIT binary patch literal 6112 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 literal 6110 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