From 58ecb31a4bb49c64b1b3238b144023256ed78cc9 Mon Sep 17 00:00:00 2001
From: Buliway <me@buliway.ru>
Date: Thu, 30 Apr 2026 23:38:16 +0300
Subject: [PATCH] update ollama

---
 flake.lock                            |  6 +-
 modules/home-manager/terminal/zsh.nix |  4 +-
 modules/nixos/network.nix             | 10 +--
 nixos/packages.nix                    | 91 +++++++++++++++------------
 4 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/flake.lock b/flake.lock
index a073a30..225bc0d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -194,11 +194,11 @@
     },
     "nixpkgs2": {
       "locked": {
-        "lastModified": 1775036866,
-        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
+        "lastModified": 1777268161,
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
         "type": "github"
       },
       "original": {
diff --git a/modules/home-manager/terminal/zsh.nix b/modules/home-manager/terminal/zsh.nix
index 75f2aa6..1277014 100644
--- a/modules/home-manager/terminal/zsh.nix
+++ b/modules/home-manager/terminal/zsh.nix
@@ -34,7 +34,7 @@
       vim = "nvim";
       vi = "nvim";
       v = "nvim";
-      
+
       k = "kubectl";
       t = "timer";
       r = "ranger --choosedir=/tmp/choosedir && cd \"$(cat /tmp/choosedir)\"";
@@ -42,7 +42,7 @@
       f = "fastfetch";
       b = "bat --color=always -p --pager='-r'"; # Веди себя как cat, но с цветами
 
-      yt = "yt-dlp --cookies /home/buliway/backups/Media/yt-dlp/cookies.firefox-private.txt";
+      yt = "yt-dlp --cookies /mnt/backups/Media/yt-dlp/cookies.firefox-private.txt";
       yt-dir = "cd /mnt/backups/Media/yt-dlp";
       yt-music = "yt-dlp --config-locations music.conf | sed '/has already been recorded in the archive/d'";
       yt-video = "yt-dlp --config-locations video.conf | sed '/has already been recorded in the archive/d'";
diff --git a/modules/nixos/network.nix b/modules/nixos/network.nix
index b087832..86e49ea 100644
--- a/modules/nixos/network.nix
+++ b/modules/nixos/network.nix
@@ -14,13 +14,13 @@
     firewall.enable = false;
   };
 
-  services.v2raya = {
-    enable = true;
-    cliPackage = pkgs2.xray;
-  };
+  # services.v2raya = {
+  #   enable = true;
+  #   cliPackage = pkgs2.xray;
+  # };
 
   programs = {
-    amnezia-vpn.enable = true;
+    # amnezia-vpn.enable = true;
     throne = {
       enable = true;
       tunMode = {
diff --git a/nixos/packages.nix b/nixos/packages.nix
index 5c91c71..7ddf486 100644
--- a/nixos/packages.nix
+++ b/nixos/packages.nix
@@ -46,20 +46,29 @@
       # flatpak install flathub com.github.tchx84.Flatseal
       enable = true; 
     };
-    # ollama = { # Настройки для amd видеокарт серии rx6000
-    #   enable = true;
-    #   # acceleration = "rocm"; # Не работает на новых версиях nixos
-    #   host = "0.0.0.0";
-    #   port = 11434;
-    #   openFirewall = true;
-    #   package = pkgs2.ollama;
-    #   rocmOverrideGfx = "10.3.0";
-    # };
+    ollama = { # Настройки для amd видеокарт серии rx6000
+      enable = true;
+      package = pkgs2.ollama-vulkan;
+      # models = "/mnt/backups/AI/ollama/models";
+      host = "0.0.0.0";
+      port = 11434;
+      openFirewall = true;
+      rocmOverrideGfx = "10.3.0";
+    };
     # open-webui = { # WebUI для ollama
     #   enable = true;
     #   package = pkgs2.open-webui;
+    #   # stateDir = "/mnt/backups/AI/open-webui";
     #   port = 11435; # default 8080
+    #   host = "0.0.0.0";
     #   openFirewall = true;
+    #   environment = {
+    #     ANONYMIZED_TELEMETRY = "False";
+    #     DO_NOT_TRACK = "True";
+    #     SCARF_NO_ANALYTICS = "True";
+    #     OLLAMA_API_BASE_URL = "http://127.0.0.1:11434";
+    #     WEBUI_AUTH = "False";
+    #   };
     # };
   };
 
@@ -69,38 +78,38 @@
       libraries = with pkgs2; [
         stdenv.cc.cc
         # Nekoray (Throne)
-        kdePackages.qtbase
-        kdePackages.qttools
-        kdePackages.qtwayland
-        kdePackages.qtsvg
-        kdePackages.qtimageformats
-        util-linux
-        zlib
-        zstd
-        mesa
-        libGL
-        libglvnd
-        libxkbcommon
-        freetype
-        fontconfig
-        libx11
-        libxext
-        libxrandr
-        libxrender
-        libxcursor
-        libxxf86vm
-        libxi
-        libxcb
-        libxfixes
-        libxcb-util
-        libxcb-keysyms
-        libxcb-wm
-        libxcb-image
-        libxcb-render-util
-        xcb-util-cursor
-        glib
-        dbus
-        krb5
+        # kdePackages.qtbase
+        # kdePackages.qttools
+        # kdePackages.qtwayland
+        # kdePackages.qtsvg
+        # kdePackages.qtimageformats
+        # util-linux
+        # zlib
+        # zstd
+        # mesa
+        # libGL
+        # libglvnd
+        # libxkbcommon
+        # freetype
+        # fontconfig
+        # libx11
+        # libxext
+        # libxrandr
+        # libxrender
+        # libxcursor
+        # libxxf86vm
+        # libxi
+        # libxcb
+        # libxfixes
+        # libxcb-util
+        # libxcb-keysyms
+        # libxcb-wm
+        # libxcb-image
+        # libxcb-render-util
+        # xcb-util-cursor
+        # glib
+        # dbus
+        # krb5
       ];
     };
     zsh.enable = true;