diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f81c914..c7372fc 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -48,6 +48,8 @@ jobs: custom-mcrcon-rbw custom-tea-rbw custom-rclone-torbox-setup + custom-opencode + custom-qmd custom-nextcloud-talk-desktop qt-pinned-jellyfin-media-player qt-pinned-stremio diff --git a/flake.nix b/flake.nix index 3636aa4..832a52a 100644 --- a/flake.nix +++ b/flake.nix @@ -235,6 +235,7 @@ # Steam Deck configuration (using unstable for better Jovian compatibility) nixosConfigurations.nix-deck = nixpkgs-unstable.lib.nixosSystem rec { system = "x86_64-linux"; + specialArgs = nixosSpecialArgs; modules = nixosModulesUnstable ++ [ ./machines/nix-deck/configuration.nix { diff --git a/machines/zix790prors/configuration.nix b/machines/zix790prors/configuration.nix index 6e16303..375b3d5 100644 --- a/machines/zix790prors/configuration.nix +++ b/machines/zix790prors/configuration.nix @@ -10,6 +10,7 @@ with lib; imports = [ ./hardware-configuration.nix #./virtual-surround.nix + ../../roles/local-inference ]; roles = { diff --git a/roles/default.nix b/roles/default.nix index a7937a5..d7bd2c2 100644 --- a/roles/default.nix +++ b/roles/default.nix @@ -1,4 +1,8 @@ -{ lib, pkgs, ... }: +{ + lib, + pkgs, + ... +}: with lib; @@ -11,7 +15,9 @@ with lib; ./desktop ./k3s-node ./kodi - ./local-inference + # local-inference is NOT imported here because its module-level + # disabledModules/imports conflict with nix-deck's unstable-based + # nixpkgs. Import it directly in machine configs that need it. ./nfs-mounts ./plasma-bigscreen ./nvidia diff --git a/roles/local-inference/default.nix b/roles/local-inference/default.nix index f5ecaba..1e4bb23 100644 --- a/roles/local-inference/default.nix +++ b/roles/local-inference/default.nix @@ -14,6 +14,9 @@ let llama-server = getExe' llama-cpp-cuda "llama-server"; in { + # Replace the stable nixpkgs llama-swap module with the unstable version, + # which may have newer features. For systems already built on unstable + # (e.g., nix-deck), this module is excluded from roles/default.nix instead. imports = [ "${nixpkgs-unstable}/nixos/modules/services/networking/llama-swap.nix" ]; disabledModules = [ "services/networking/llama-swap.nix" ];