voronind/nix
0
0
Fork 0
Code Issues 38 Pull requests Packages Projects Releases Wiki Activity

Ollama: Fix and re-enable for desktop && work.

Browse source
This commit is contained in:
Dmitry Voronin 2025-01-04 07:38:04 +03:00
parent 9e5ed18644
commit f260f5b6a2
Signed by: voronind
SSH key fingerprint: SHA256:3kBb4iV2ahufEBNq+vFbUe4QYfHt98DHQjN7QaptY9k
3 changed files with 38 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
config/Ollama.nix
View file

@ -1,4 +1,3 @@
# SRC: https://github.com/ollama/ollama
{ {
pkgsUnstable, pkgsUnstable,
lib, lib,
@ -11,45 +10,39 @@ in
{ {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Specify default model. # Specify default model.
# environment.variables.OLLAMA_MODEL = cfg.primaryModel; environment.variables.OLLAMA_MODEL = cfg.primaryModel;
#
# systemd.services = { systemd.services = {
# # Enable Ollama server. # Enable Ollama server.
# ollama = { ollama = {
# description = "Ollama LLM server"; description = "Ollama LLM server";
# serviceConfig = { wantedBy = [ "multi-user.target" ];
# Type = "simple"; serviceConfig = {
# }; Type = "simple";
# wantedBy = [ };
# "multi-user.target" script = ''
# ]; HOME=/root ${lib.getExe pkgsUnstable.ollama} serve
# script = '' '';
# HOME=/root ${lib.getExe pkgsUnstable.ollama} serve };
# '';
# }; # Download Ollama models.
# ollama-pull = {
# # Download Ollama models. description = "Ollama LLM model";
# ollama-pull = { wantedBy = [ "multi-user.target" ];
# description = "Ollama LLM model"; serviceConfig.Type = "simple";
# after = [ after = [
# "NetworkManager-wait-online.service" "NetworkManager-wait-online.service"
# "ollama.service" "ollama.service"
# ]; ];
# wantedBy = [ wants = [
# "multi-user.target" "NetworkManager-wait-online.service"
# ]; "ollama.service"
# wants = [ ];
# "NetworkManager-wait-online.service" script = ''
# "ollama.service" sleep 5
# ]; HOME=/root ${lib.getExe pkgsUnstable.ollama} pull ${lib.concatStringsSep " " cfg.models}
# serviceConfig = { '';
# Type = "simple"; };
# }; };
# script = ''
# sleep 5
# ${lib.getExe pkgsUnstable.ollama} pull ${lib.concatStringsSep " " cfg.models}
# '';
# };
# };
}; };
} }

1
config/Purpose.nix
View file

@ -131,7 +131,6 @@ in
(lib.mkIf cfg.work { (lib.mkIf cfg.work {
module = { module = {
distrobox.enable = true; distrobox.enable = true;
ollama.enable = true;
package.dev = true; package.dev = true;
virtmanager.enable = true; virtmanager.enable = true;
docker = { docker = {

6
option/Ollama.nix
View file

@ -1,16 +1,18 @@
# SRC: https://github.com/ollama/ollama
{ config, lib, ... }: { config, lib, ... }:
let let
cfg = config.module.ollama; cfg = config.module.ollama;
purpose = config.module.purpose;
in in
{ {
options.module.ollama = { options.module.ollama = {
enable = lib.mkEnableOption "the local LLM server."; enable = lib.mkEnableOption "the local LLM server." // { default = purpose.work && purpose.desktop; };
models = lib.mkOption { models = lib.mkOption {
default = [ cfg.primaryModel ]; default = [ cfg.primaryModel ];
type = with lib.types; listOf str; type = with lib.types; listOf str;
}; };
primaryModel = lib.mkOption { primaryModel = lib.mkOption {
default = "llama3.2"; default = "llama3.3";
type = lib.types.str; type = lib.types.str;
}; };
}; };