From 67c2cedfb4dee1af9ff66357651e88e925533f19 Mon Sep 17 00:00:00 2001 From: shivaraj-bh Date: Sun, 23 Feb 2025 19:26:48 +0530 Subject: [PATCH] feat: Add process-compose `defaults` module --- example/llm/flake.nix | 4 ---- flake.nix | 2 +- nix/process-compose/default.nix | 6 ++++++ nix/process-compose/defaults.nix | 8 ++++++++ test/flake.nix | 2 ++ 5 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 nix/process-compose/default.nix create mode 100644 nix/process-compose/defaults.nix diff --git a/example/llm/flake.nix b/example/llm/flake.nix index 8e52c3fe..c7ce5582 100644 --- a/example/llm/flake.nix +++ b/example/llm/flake.nix @@ -19,10 +19,6 @@ imports = [ inputs.services-flake.processComposeModules.default ]; - cli = { - # Disable the process-compose HTTP server - options.no-server = true; - }; services = let dataDirBase = "$HOME/.services-flake/llm"; in { # Backend service to perform inference on LLM models ollama."ollama1" = { diff --git a/flake.nix b/flake.nix index 6705e455..09e12b8e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "declarative, composable, and reproducible services for Nix development environment"; outputs = _: { - processComposeModules.default = ./nix/services; + processComposeModules.default = ./nix/process-compose; templates.default = { description = "Example flake using process-compose-flake"; diff --git a/nix/process-compose/default.nix b/nix/process-compose/default.nix new file mode 100644 index 00000000..451fc541 --- /dev/null +++ b/nix/process-compose/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ../services + ./defaults.nix + ]; +} diff --git a/nix/process-compose/defaults.nix b/nix/process-compose/defaults.nix new file mode 100644 index 00000000..aade11a1 --- /dev/null +++ b/nix/process-compose/defaults.nix @@ -0,0 +1,8 @@ +# Default process-compose cli settings +{ pkgs, lib, ... }: +{ + cli = { + # Disable the process-compose HTTP server + options.no-server = lib.mkDefault true; + }; +} diff --git a/test/flake.nix b/test/flake.nix index 8355fb9f..decad729 100644 --- a/test/flake.nix +++ b/test/flake.nix @@ -32,6 +32,8 @@ ]; cli = { options = { + # HTTP server disabled by default but we need it here for tests + no-server = false; use-uds = true; unix-socket = "pc-${name}.sock"; };