modules/nixos-modules/ollama.nix

@@ -7,8 +7,7 @@
     services.ollama.exposePort = lib.mkEnableOption "should we expose ollama on tailscale";
   };
 
-  config = lib.mkIf config.services.ollama.enable (
+  config = lib.mkMerge [
-    lib.mkMerge [
     {
       services.ollama = {
         # TODO: these should match whats set in the users file
@@ -16,17 +15,7 @@
         user = "ollama";
       };
     }
-      (lib.mkIf config.services.ollama.exposePort (let
+    (lib.mkIf config.host.impermanence.enable (lib.mkIf config.services.ollama.enable {
-        ports = [
-          config.services.ollama.port
-        ];
-      in {
-        networking.firewall.interfaces.${config.services.tailscale.interfaceName} = {
-          allowedTCPPorts = ports;
-          allowedUDPPorts = ports;
-        };
-      }))
-      (lib.mkIf config.host.impermanence.enable {
       environment.persistence."/persist/system/root" = {
         enable = true;
         hideMounts = true;
@@ -36,16 +25,17 @@
             user = config.services.ollama.user;
             group = config.services.ollama.group;
           }
-            {
-              directory = "/var/lib/private/ollama";
-              user = config.services.ollama.user;
-              group = config.services.ollama.group;
-              mode = "0700";
-              defaultPerms.mode = "0700";
-            }
         ];
       };
-      })
+      networking.firewall.interfaces.${config.services.tailscale.interfaceName} = let
-    ]
+        ports = [
-  );
+          config.services.ollama.port
+        ];
+      in
+        lib.mkIf config.services.ollama.exposePort {
+          allowedTCPPorts = ports;
+          allowedUDPPorts = ports;
+        };
+    }))
+  ];
 }