From 190fb2d6d170d6d14fdd385c89bdcd1f9e3b4f3e Mon Sep 17 00:00:00 2001
From: m3tam3re <m@m3tam3re.com>
Date: Sun, 2 Feb 2025 15:41:21 +0100
Subject: [PATCH] flake update

---
 flake.lock                            | 30 +++++++++++++--------------
 hosts/common/extraServices/ollama.nix |  2 +-
 hosts/m3-ares/default.nix             |  6 ------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index b9d6401..b4c98d7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -94,11 +94,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737038063,
-        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
+        "lastModified": 1738148035,
+        "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
+        "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54",
         "type": "github"
       },
       "original": {
@@ -151,11 +151,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737968762,
-        "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=",
+        "lastModified": 1738448366,
+        "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e",
+        "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
         "type": "github"
       },
       "original": {
@@ -239,11 +239,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1738054107,
-        "narHash": "sha256-7c6saLnHl63aTrzMbxtdYpGH7Pj7rmnibTr2uVvuJC0=",
+        "lastModified": 1738506098,
+        "narHash": "sha256-Z3XDI7ok54VmNFYOtH9VfQSbW4i+hnGAF4jdQ0PD5HU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a8a8c516eb47ae0005baab36d7a75fe3bc21eeef",
+        "rev": "77110cd574a1555893e0b5db8eeffaf112455119",
         "type": "github"
       },
       "original": {
@@ -255,11 +255,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1737885640,
-        "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
+        "lastModified": 1738435198,
+        "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
+        "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1737885589,
-        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
+        "lastModified": 1738410390,
+        "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
+        "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
         "type": "github"
       },
       "original": {
diff --git a/hosts/common/extraServices/ollama.nix b/hosts/common/extraServices/ollama.nix
index 7c3c76a..32bfaad 100644
--- a/hosts/common/extraServices/ollama.nix
+++ b/hosts/common/extraServices/ollama.nix
@@ -15,7 +15,7 @@ in {
       package =
         if config.services.xserver.videoDrivers == ["amdgpu"] # rocblas-6.0.2 broken
         then pkgs.pinned.ollama
-        else null;
+        else pkgs.ollama;
       acceleration =
         if config.services.xserver.videoDrivers == ["amdgpu"]
         then "rocm"
diff --git a/hosts/m3-ares/default.nix b/hosts/m3-ares/default.nix
index 53ff859..36a9237 100644
--- a/hosts/m3-ares/default.nix
+++ b/hosts/m3-ares/default.nix
@@ -48,10 +48,4 @@
     podman.enable = true;
     virtualisation.enable = true;
   };
-  services.ollama = {
-    environmentVariables = {
-      HCC_AMDGPU_TARGET = "gfx1100";
-    };
-    rocmOverrideGfx = "11.0.0";
-  };
 }