From 7b6344b41972d6165606d23ce84b5f783f6272ad Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sat, 24 May 2025 22:17:19 -0500
Subject: [PATCH] added ollama to defiant

---
 .../home-manager/leyla/vscode/user-words.nix  |  2 ++
 .../nixos/defiant/configuration.nix           | 19 +++++++++++++++++--
 modules/nixos-modules/ollama.nix              | 13 +++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/configurations/home-manager/leyla/vscode/user-words.nix b/configurations/home-manager/leyla/vscode/user-words.nix
index 4444c30..b581118 100644
--- a/configurations/home-manager/leyla/vscode/user-words.nix
+++ b/configurations/home-manager/leyla/vscode/user-words.nix
@@ -1,4 +1,6 @@
 [
   "leyla"
   "webdav"
+  "ollama"
+  "optimise"
 ]
diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index 8e1eab8..59ad2c9 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -201,13 +201,28 @@
     };
 
     ollama = {
-      enable = false;
+      enable = true;
+      exposePort = true;
 
       loadModels = [
-        "deepseek-coder:6.7b"
+        # conversation models
+        "llama3.1:8b"
         "deepseek-r1:8b"
         "deepseek-r1:32b"
         "deepseek-r1:70b"
+
+        # auto complete models
+        "qwen2.5-coder:1.5b-base"
+        "qwen2.5-coder:7b"
+        "deepseek-coder:6.7b"
+        "deepseek-coder:33b"
+
+        # agent models
+        "qwen3:8b"
+        "qwen3:32b"
+
+        # embedding models
+        "nomic-embed-text:latest"
       ];
     };
     tailscale = {
diff --git a/modules/nixos-modules/ollama.nix b/modules/nixos-modules/ollama.nix
index 5cdc041..6b1d5bb 100644
--- a/modules/nixos-modules/ollama.nix
+++ b/modules/nixos-modules/ollama.nix
@@ -3,6 +3,10 @@
   lib,
   ...
 }: {
+  options = {
+    services.ollama.exposePort = lib.mkEnableOption "should we expose ollama on tailscale";
+  };
+
   config = lib.mkMerge [
     {
       services.ollama = {
@@ -22,6 +26,15 @@
           }
         ];
       };
+      networking.firewall.interfaces.${config.services.tailscale.interfaceName} = let
+        ports = [
+          config.services.ollama.port
+        ];
+      in
+        lib.mkIf config.services.ollama.exposePort {
+          allowedTCPPorts = ports;
+          allowedUDPPorts = ports;
+        };
     }))
   ];
 }