diff --git a/modules/config/devices/default.nix b/modules/config/devices/default.nix index 78640ad..698b00c 100755 --- a/modules/config/devices/default.nix +++ b/modules/config/devices/default.nix @@ -42,7 +42,7 @@ let marsIP = "192.168.50.196"; phoneIP = "192.168.50.243"; phobosIP = "192.168.50.180"; - synologyIP = "192.168.50.209"; + synologyIP = "192.168.50.210"; venusIP = "192.168.58.104"; brotherIP = "192.168.50.195"; }; diff --git a/modules/home/cli/utilities/radeonTop/default.nix b/modules/home/cli/utilities/radeonTop/default.nix new file mode 100755 index 0000000..b3570a2 --- /dev/null +++ b/modules/home/cli/utilities/radeonTop/default.nix @@ -0,0 +1,11 @@ +{ + pkgs, + ... +}: +{ + home.packages = builtins.attrValues { + inherit (pkgs) + radeontop + ; + }; +} diff --git a/modules/nixos/services/ollama/default.nix b/modules/nixos/services/ollama/default.nix index 8616bcb..b9b4f91 100755 --- a/modules/nixos/services/ollama/default.nix +++ b/modules/nixos/services/ollama/default.nix @@ -14,10 +14,12 @@ let web ; service = ollama; - localhost = web.localhost.address0; + localhost1 = web.localhost.address0; + localhost2 = web.localhost.address1; hostname = config.networking.hostName; host = "${service.subdomain}.${web.domains.url0}"; + localhostLogic = if hostname == mars.name then localhost2 else localhost1; caddyLogic = if hostname == ceres.name then { @@ -25,7 +27,7 @@ let virtualHosts = { ${host} = { extraConfig = '' - reverse_proxy ${localhost}:${toString service.ports.port0} + reverse_proxy ${localhostLogic}:${toString service.ports.port0} tls ${service.ssl.cert} ${service.ssl.key} ''; @@ -59,7 +61,7 @@ in { enable = true; group = service.name; - host = "http://${localhost}"; + host = "http://${localhostLogic}"; user = service.name; } // ( @@ -67,12 +69,9 @@ in { # models = service.paths.path1; acceleration = "rocm"; - package = pkgs.ollama.override { - config = { - rocmSupport = true; - cudaSupport = false; - }; - }; + # package = pkgs.ollama.override { + # acceleration = "rocm"; + # }; } else { @@ -83,14 +82,14 @@ in ); open-webui = { enable = true; - host = localhost; + host = localhostLogic; port = service.ports.port0; environment = { ENABLE_OLLAMA_API = "True"; ANONYMIZED_TELEMETRY = "False"; DO_NOT_TRACK = "True"; SCARF_NO_ANALYTICS = "True"; - OLLAMA_BASE_URL = "http://${localhost}:${toString service.ports.port1}"; + OLLAMA_BASE_URL = "http://${localhostLogic}:${toString service.ports.port1}"; WEBUI_AUTH = "True"; }; };