Compare commits
10 Commits
be0953c816
...
9cdf8a8e91
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9cdf8a8e91 | ||
| c75b754ace | |||
| de45a27860 | |||
| 3557b88d7c | |||
| 67e4dc15e7 | |||
| 291a15d0c5 | |||
| 7034b651f8 | |||
| 9c5aaca961 | |||
| c0d6a20780 | |||
| e8228616fb |
24
flake.lock
generated
24
flake.lock
generated
@@ -76,11 +76,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1774238582,
|
"lastModified": 1774325014,
|
||||||
"narHash": "sha256-Ki8cqI4709KnKyR5EbMMbtsc4k3vSP7KeCTAhBRZ640=",
|
"narHash": "sha256-UTORxF4+9IVjJ7BWFb2eKDxtyXPnwo/h1mMBWoKUB30=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "1b4ad32c889411e7df7e9c88246e39c9407eae1f",
|
"rev": "f166b8919f5bd1c43e78c700d7eb26e132a2ff83",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -242,11 +242,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774210133,
|
"lastModified": 1774293042,
|
||||||
"narHash": "sha256-yeiWCY9aAUUJ3ebMVjs0UZXRnT5x90MCtpbpOWiXrvM=",
|
"narHash": "sha256-OEBV+Y5I4Ldu98k0KvGXRfJYh+jjE8ocCSL/dxTGs1s=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "c6fe2944ad9f2444b2d767c4a5edee7c166e8a95",
|
"rev": "bc357c75e3142a31b849ba49c5299fb52c61cf59",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -596,11 +596,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774235565,
|
"lastModified": 1774321696,
|
||||||
"narHash": "sha256-D8OOwvq3zDDCtIhMcNueb9tGSZaZUanKpWDleRgQ80U=",
|
"narHash": "sha256-g18xMjMNla/nsF5XyQCNyWmtb2UlZpkY0XE8KinIXAA=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "dc00324a2438762582b49954373112b8eab29cab",
|
"rev": "49a67e6894d4cb782842ee6faa466aa90c92812d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -616,11 +616,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774154798,
|
"lastModified": 1774303811,
|
||||||
"narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=",
|
"narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170",
|
"rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -93,10 +93,11 @@ in
|
|||||||
CF_FILENAME_MATCHER = "1.11.2";
|
CF_FILENAME_MATCHER = "1.11.2";
|
||||||
USE_AIKAR_FLAGS = "false";
|
USE_AIKAR_FLAGS = "false";
|
||||||
USE_MEOWICE_FLAGS = "true";
|
USE_MEOWICE_FLAGS = "true";
|
||||||
DIFFICULTY = "hard";
|
DIFFICULTY = "peaceful";
|
||||||
ENABLE_COMMAND_BLOCK = "true";
|
ENABLE_COMMAND_BLOCK = "true";
|
||||||
INIT_MEMORY = "4G";
|
INIT_MEMORY = "4G";
|
||||||
MAX_MEMORY = "16G";
|
MAX_MEMORY = "16G";
|
||||||
|
SEED = "-7146406535839057559";
|
||||||
};
|
};
|
||||||
extraOptions = defaultOptions;
|
extraOptions = defaultOptions;
|
||||||
log-driver = "local";
|
log-driver = "local";
|
||||||
|
|||||||
@@ -12,39 +12,46 @@ in
|
|||||||
package = pkgs.ollama;
|
package = pkgs.ollama;
|
||||||
syncModels = true;
|
syncModels = true;
|
||||||
loadModels = [
|
loadModels = [
|
||||||
"gemma3"
|
|
||||||
"deepseek-r1:latest"
|
|
||||||
"deepseek-r1:1.5b"
|
"deepseek-r1:1.5b"
|
||||||
|
"deepseek-r1:32b"
|
||||||
|
"deepseek-r1:70b"
|
||||||
"qwen3"
|
"qwen3"
|
||||||
#"qwen3-coder-next"
|
#"qwen3-coder-next"
|
||||||
"qwen3-coder"
|
"qwen3-coder-next"
|
||||||
"lennyerik/zeta"
|
"lennyerik/zeta"
|
||||||
"llama3.1:8b"
|
"qwen2.5-coder:14b"
|
||||||
"qwen2.5-coder:1.5b-base"
|
"qwen2.5-coder:32b"
|
||||||
"nomic-embed-text:latest"
|
"nomic-embed-text:latest"
|
||||||
|
"llama4:scout"
|
||||||
|
"mistral:7b"
|
||||||
|
"minimax-m2.7:cloud"
|
||||||
|
"lfm2:24b"
|
||||||
|
"glm-4.7-flash"
|
||||||
];
|
];
|
||||||
models = vars.primary_ollama;
|
models = vars.primary_ollama;
|
||||||
environmentVariables = {
|
environmentVariables = {
|
||||||
FLASH_ATTENTION = "1";
|
FLASH_ATTENTION = "1";
|
||||||
OLLAMA_KV_CACHE_TYPE = "q8_0";
|
OLLAMA_KV_CACHE_TYPE = "q8_0";
|
||||||
# Ollama memory configuration
|
# Ollama memory configuration
|
||||||
OLLAMA_MAX_LOADED_MODELS = "2";
|
OLLAMA_MAX_LOADED_MODELS = "3";
|
||||||
OLLAMA_MAX_QUEUE = "4";
|
OLLAMA_MAX_QUEUE = "512";
|
||||||
OLLAMA_NUM_PARALLEL = "2";
|
OLLAMA_NUM_PARALLEL = "3";
|
||||||
|
|
||||||
# ROCm memory optimization
|
# ROCm memory optimization
|
||||||
#HIP_VISIBLE_DEVICES = "0";
|
#HIP_VISIBLE_DEVICES = "0";
|
||||||
#ROCR_VISIBLE_DEVICES = "0";
|
#ROCR_VISIBLE_DEVICES = "0";
|
||||||
|
|
||||||
# context length for agents
|
# context length for agents
|
||||||
OLLAMA_CONTEXT_LENGTH = "64000";
|
OLLAMA_CONTEXT_LENGTH = "128000";
|
||||||
};
|
};
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
|
host = "0.0.0.0"; # don't want to make this available via load-balancer yet, so making it available on the local network
|
||||||
};
|
};
|
||||||
open-webui = {
|
open-webui = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 21212;
|
port = 21212;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
|
host = "0.0.0.0"; # don't want to make this available via load-balancer yet, so making it available on the local network
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
users.users.ollama = {
|
users.users.ollama = {
|
||||||
|
|||||||
Reference in New Issue
Block a user