diff --git a/systems/jeeves/scripts/zfs.sh b/systems/jeeves/scripts/zfs.sh index be09be1..0a53200 100644 --- a/systems/jeeves/scripts/zfs.sh +++ b/systems/jeeves/scripts/zfs.sh @@ -27,6 +27,7 @@ sudo zfs create -o recordsize=16k -o primarycache=metadata -o mountpoint=/zfs/me # scratch datasets sudo zfs create -o recordsize=16k -o sync=disabled scratch/qbitvpn sudo zfs create -o recordsize=16k -o sync=disabled scratch/transmission +sudo zfs create -o recordsize=1M scratch/kafka # storage datasets sudo zfs create -o recordsize=1M -o compression=zstd-19 storage/archive @@ -38,3 +39,4 @@ sudo zfs create -o compression=zstd-19 storage/syncthing sudo zfs create -o recordsize=1M -o compression=zstd-9 -o exec=off -o sync=disabled storage/qbitvpn sudo zfs create -o recordsize=1M -o compression=zstd-9 -o exec=off -o sync=disabled storage/transmission sudo zfs create -o recordsize=1M -o compression=zstd-19 storage/library +sudo zfs create -o recordsize=1M -o compression=zstd-19 -o sync=disabled storage/ollama diff --git a/systems/jeeves/services/kafka.nix b/systems/jeeves/services/kafka.nix index ddd7c93..a1b292b 100644 --- a/systems/jeeves/services/kafka.nix +++ b/systems/jeeves/services/kafka.nix @@ -1,3 +1,12 @@ +let + vars = import ../vars.nix; +in { - services.apache-kafka.enable = true; + services.apache-kafka = { + enable = true; + settings = { + listeners = [ "PLAINTEXT://localhost:9092" ]; + "log.dirs" = [ vars.kafka ]; + }; + }; } diff --git a/systems/jeeves/services/llms.nix b/systems/jeeves/services/llms.nix index 96ff362..ae9eed0 100644 --- a/systems/jeeves/services/llms.nix +++ b/systems/jeeves/services/llms.nix @@ -1,3 +1,6 @@ +let + vars = import ../vars.nix; +in { services = { ollama = { @@ -5,18 +8,18 @@ enable = true; host = "0.0.0.0"; loadModels = [ - "qwen3:14b" - "qwen3:30b" - "gemma3:12b" - "gemma3:27b" - "gpt-oss:20b" - "gpt-oss:120b" "codellama:7b" - "deepseek-r1:8b" "deepseek-r1:14b" "deepseek-r1:32b" + "deepseek-r1:8b" + "gemma3:12b" + "gemma3:27b" + "gpt-oss:120b" + "gpt-oss:20b" + "qwen3:14b" + "qwen3:30b" ]; - models = "/zfs/storage/models"; + models = vars.ollama; openFirewall = true; }; }; diff --git a/systems/jeeves/vars.nix b/systems/jeeves/vars.nix index 5ea8d09..c0d30a5 100644 --- a/systems/jeeves/vars.nix +++ b/systems/jeeves/vars.nix @@ -17,5 +17,7 @@ in share = "${zfs_media}/share"; syncthing = "${zfs_storage}/syncthing"; transmission = "${zfs_storage}/transmission"; + ollama = "${zfs_storage}/ollama"; transmission_scratch = "${zfs_scratch}/transmission"; + kafka = "${zfs_scratch}/kafka"; }