From 7f6e643cc79bf8f00be135fd4a76736114c8385b Mon Sep 17 00:00:00 2001 From: oqyude Date: Thu, 31 Jul 2025 14:05:12 +0300 Subject: [PATCH] end up --- devices/hardware/mini-pc.nix | 11 ++++++--- devices/server.nix | 1 + home/modules/packages.nix | 4 ++- modules/server/ai.nix | 23 +++++++++++------- modules/software/ai.nix | 47 +++++++++--------------------------- modules/vds/cloudflared.nix | 3 +++ 6 files changed, 40 insertions(+), 49 deletions(-) diff --git a/devices/hardware/mini-pc.nix b/devices/hardware/mini-pc.nix index f2ba8b9..d3e242e 100755 --- a/devices/hardware/mini-pc.nix +++ b/devices/hardware/mini-pc.nix @@ -10,11 +10,14 @@ }: { - nix.settings.extra-sandbox-paths = [ - "/dev/kfd" - "/sys/devices/virtual/kfd" - "/dev/dri/renderD128" + nixpkgs.config.permittedInsecurePackages = [ + "libsoup-2.74.3" # temp ]; + # nix.settings.extra-sandbox-paths = [ + # "/dev/kfd" + # "/sys/devices/virtual/kfd" + # "/dev/dri/renderD128" + # ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") diff --git a/devices/server.nix b/devices/server.nix index 7204d6e..c7297fe 100755 --- a/devices/server.nix +++ b/devices/server.nix @@ -17,6 +17,7 @@ let self.nixosModules.default self.nixosModules.server.immich + self.nixosModules.server.ai self.nixosModules.server.nextcloud self.nixosModules.server.nginx self.nixosModules.software.beets diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 9a81ea0..77d49fd 100755 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -79,9 +79,11 @@ in prismlauncher lutris + # AI + lmstudio + # Libs #libsecret - ]; }; } diff --git a/modules/server/ai.nix b/modules/server/ai.nix index c52d081..d8422cd 100755 --- a/modules/server/ai.nix +++ b/modules/server/ai.nix @@ -6,15 +6,20 @@ ... }: { - services.open-webui = { - enable = true; - environment = { - ANONYMIZED_TELEMETRY = "False"; - DO_NOT_TRACK = "True"; - SCARF_NO_ANALYTICS = "True"; - OLLAMA_API_BASE_URL = "http://127.0.0.1:1234"; - # Disable authentication - WEBUI_AUTH = "False"; + services = { + open-webui = { + enable = true; + host = "0.0.0.0"; + port = 11111; + openFirewall = true; + environment = { + ANONYMIZED_TELEMETRY = "False"; + DO_NOT_TRACK = "True"; + SCARF_NO_ANALYTICS = "True"; + OPENAI_API_BASE_URL = "http://127.0.0.1:1234"; + #OLLAMA_API_BASE_URL = "http://127.0.0.1:1234"; + #WEBUI_AUTH = "False"; # Disable authentication + }; }; }; } diff --git a/modules/software/ai.nix b/modules/software/ai.nix index 12eee8b..eafdbf7 100755 --- a/modules/software/ai.nix +++ b/modules/software/ai.nix @@ -6,42 +6,19 @@ ... }: { - services = { - nextjs-ollama-llm-ui.enable = false; - open-webui = { - enable = true; - environment = { - ANONYMIZED_TELEMETRY = "False"; - DO_NOT_TRACK = "True"; - SCARF_NO_ANALYTICS = "True"; - OLLAMA_API_BASE_URL = "http://127.0.0.1:1234"; - WEBUI_AUTH = "False"; # Disable authentication - }; - }; - ollama = { - enable = false; - package = pkgs.ollama-rocm; - environmentVariables = { - HSA_OVERRIDE_GFX_VERSION = "11.5.0"; - HCC_AMDGPU_TARGET = "gfx1150"; # used to be necessary, but doesn't seem to anymore - }; - user = "ollama"; # "${inputs.zeroq.devices.admin}"; - group = "ollama"; - # home = "/home/${inputs.zeroq.devices.admin}/.ollama"; - # models = "${inputs.zeroq.dirs.vetymae-drive}/AI/Ollama/models"; - acceleration = "rocm"; - rocmOverrideGfx = "11.5.0"; - }; - }; - - nixpkgs.config.permittedInsecurePackages = [ - "libsoup-2.74.3" - ]; - # users = { + # services = { + # nextjs-ollama-llm-ui.enable = false; # ollama = { - # ollama.isSystemUser = true; + # enable = false; + # package = pkgs.ollama-rocm; + # environmentVariables = { + # HSA_OVERRIDE_GFX_VERSION = "11.5.0"; + # HCC_AMDGPU_TARGET = "gfx1150"; # used to be necessary, but doesn't seem to anymore + # }; + # user = "ollama"; # "${inputs.zeroq.devices.admin}"; + # group = "ollama"; + # acceleration = "rocm"; + # rocmOverrideGfx = "11.5.0"; # }; # }; - - environment.systemPackages = with pkgs; [ lmstudio ]; } diff --git a/modules/vds/cloudflared.nix b/modules/vds/cloudflared.nix index d3a534f..5225195 100755 --- a/modules/vds/cloudflared.nix +++ b/modules/vds/cloudflared.nix @@ -21,6 +21,9 @@ "nextcloud.zeroq.ru" = { service = "http://sapphira.latxa-platy.ts.net:10000"; }; + "llm.zeroq.ru" = { + service = "http://sapphira.latxa-platy.ts.net:11111"; + }; }; default = "http_status:404"; };