From d74346a7fcf4bb65e0f7b75222be578b4b4a0fb7 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 5 Apr 2025 13:18:56 +0200 Subject: [PATCH] ollama --- flake.lock | 34 ++++++++++++++--------------- home/profiles/base/default.nix | 3 +++ hosts/asuka/soryu/configuration.nix | 13 ++++++----- hosts/asuka/soryu/ollama.nix | 18 +++++++++++++++ 4 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 hosts/asuka/soryu/ollama.nix diff --git a/flake.lock b/flake.lock index 97e61d1..06f239d 100644 --- a/flake.lock +++ b/flake.lock @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1743387206, - "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", + "lastModified": 1743808813, + "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", "owner": "nix-community", "repo": "home-manager", - "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", + "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", "type": "github" }, "original": { @@ -453,11 +453,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743501102, - "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=", + "lastModified": 1743703532, + "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4", + "rev": "bdb91860de2f719b57eef819b5617762f7120c70", "type": "github" }, "original": { @@ -531,11 +531,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743448293, - "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { @@ -548,8 +548,8 @@ "nixpkgs_3": { "locked": { "lastModified": 0, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", - "path": "/nix/store/sr3gj4wcx3kwy0q5gcxl49ja733bqm7b-source", + "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=", + "path": "/nix/store/yl6bc4g0axk5z4v0lsz8fzpxkc3yv1jl-source", "type": "path" }, "original": { @@ -564,11 +564,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743584017, - "narHash": "sha256-pS+Uuq7yjEnBHWB/fI3ySBFJ6HUnUZTdwhN0ecZz1kc=", + "lastModified": 1743848787, + "narHash": "sha256-LyE0Sr3mTb/ElWjueF+Lp6bL2FtJcltREd/qvBM0C04=", "owner": "nix-community", "repo": "NUR", - "rev": "892b71bae4d42bc8066ecc9f76ccc91b587c6fbf", + "rev": "5ec7bc0851c41c90f2b62f976fcbf2a0f6f4a88c", "type": "github" }, "original": { @@ -691,11 +691,11 @@ }, "unstable": { "locked": { - "lastModified": 1743568003, - "narHash": "sha256-ZID5T65E8ruHqWRcdvZLsczWDOAWIE7om+vQOREwiX0=", + "lastModified": 1743689281, + "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b7ba7f9f45c5cd0d8625e9e217c28f8eb6a19a76", + "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", "type": "github" }, "original": { diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix index a9bcf35..cd0a0e0 100644 --- a/home/profiles/base/default.nix +++ b/home/profiles/base/default.nix @@ -83,6 +83,8 @@ in gregctl # wack +# + unstable.ollama ] ++ lib.optionals cfg.plus [ ffmpeg-full ] ++ lib.optionals config.profiles.gui.enable [ @@ -335,6 +337,7 @@ in home.sessionVariables = { EDITOR = "hx"; GRZEGORZ_DEFAULT_API_BASE = "https://georg.pvv.ntnu.no/api"; + OLLAMA_HOST="100.64.0.19"; }; xdg.mimeApps = { diff --git a/hosts/asuka/soryu/configuration.nix b/hosts/asuka/soryu/configuration.nix index 3654eff..4f01cc0 100644 --- a/hosts/asuka/soryu/configuration.nix +++ b/hosts/asuka/soryu/configuration.nix @@ -9,9 +9,14 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix # ./wack.nix + ./ollama.nix ../../common/builder.nix ]; + nixpkgs.config = { + allowUnfree = true; + rocmSupport = true; + }; # Use the systemd-boot EFI boot loader. boot.loader.efi.canTouchEfiVariables = true; @@ -65,12 +70,8 @@ programs.steam = { enable = true; - remotePlay.openFirewall = false; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = false; # Open ports in the firewall for Source Dedicated Server - }; - - nixpkgs.config = { - allowUnfree = true; + remotePlay.openFirewall = false; + dedicatedServer.openFirewall = false; }; services.tailscale.enable = true; diff --git a/hosts/asuka/soryu/ollama.nix b/hosts/asuka/soryu/ollama.nix new file mode 100644 index 0000000..9a8f91f --- /dev/null +++ b/hosts/asuka/soryu/ollama.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, inputs, ... }: + +{ + services.ollama = { + enable = true; + package = inputs.unstable.legacyPackages.x86_64-linux.ollama-rocm; + host = "100.64.0.19"; + loadModels = [ + "gemma3:4b" + "gemma3:12b" + "gemma3:27b" + "deepseek-r1:7b" + "deepseek-r1:14b" + "qwq:32b" + "codestral:22b" + ]; + }; +}