fix: nix-deck infinite recursion + add custom-qmd to CI
- Add specialArgs to nix-deck (was missing nixpkgs-unstable, causing infinite recursion when roles/local-inference evaluated it) - Move local-inference import out of roles/default.nix: its module-level disabledModules/imports conflict with nix-deck's unstable-based nixpkgs - Import local-inference directly in zix790prors (the only machine that enables it) - Add custom-qmd and custom-opencode to CI build-and-cache packages
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -10,6 +10,7 @@ with lib;
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
#./virtual-surround.nix
|
||||
../../roles/local-inference
|
||||
];
|
||||
|
||||
roles = {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user