merge north master

system-modules/ollama.nix

@@ -5,41 +5,6 @@ let p = pkgs-unstable; in
     ollama
   ];
   
-  # services.ollama.environmentVariables = {
-  #   OLLAMA_ORIGINS = "*"; 
-  # };
-
-  # systemd.services.ollama = {
-  #   environment.OLLAMA_ORIGINS = "*";
-  #   description = "Ollama Service";
-  #   after = [ "network-online.target" "ollama-doesnt-respect-xdg-data-home.service" ];
-  #   serviceConfig = {
-  #     Type = "simple";
-  #     # Environment = "\"XDG_DATA_HOME=/run/current-system/sw/share\"";
-  #     ExecStart = "${pkgs.ollama}/bin/ollama serve";
-  #     User = "ollama";
-  #     Group = "ollama";
-  #     Restart = "always";
-  #     RestartSec = "3";
-  #   };
-  #   wantedBy = [ "default.target" ];
-  # };
-
-  # users.users.ollama = {
-  #   isSystemUser = true;
-  #   home = "/usr/share/ollama";
-  #   shell = "/bin/false";
-  #   group = "ollama";
-  # };
-  # users.groups.ollama = {};
-
-  # systemd.services.ollama-doesnt-respect-xdg-data-home = {
-  #   wantedBy = ["multi-user.target"];
-  #   script = ''
-  #     mkdir -p /usr/share/ollama/.ollama
-  #     chown ollama:ollama -R /usr/share/ollama
-  #   '';
-  # };
   services.ollama = {
     package = p.ollama;
     enable = true;