ollama

Author: functora

nix/configuration.nix

@@ -355,23 +355,27 @@ in {
     #
     # GPU
     #
-    systemd.tmpfiles.rules = [
-      "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages_5.clr}"
+    systemd.tmpfiles.rules = let
+      rocmEnv = pkgs.symlinkJoin {
+        name = "rocm-combined";
+        paths = with pkgs.rocmPackages; [
+          rocblas
+          hipblas
+          clr
+        ];
+      };
+    in [
+      "L+    /opt/rocm   -    -    -     -    ${rocmEnv}"
     ];
     hardware.opengl = {
       enable = true;
       driSupport32Bit = true;
       extraPackages = with pkgs; [
         amdvlk
-        rocmPackages_5.clr.icd
-        rocmPackages_5.clr
-        rocmPackages_5.rocminfo
-        rocmPackages_5.rocm-runtime
-        # vulkan-validation-layers
-        # intel-media-driver # LIBVA_DRIVER_NAME=iHD
-        # vaapiIntel # LIBVA_DRIVER_NAME=i965
-        # vaapiVdpau
-        # libvdpau-va-gl
+        rocmPackages.clr.icd
+        rocmPackages.clr
+        rocmPackages.rocminfo
+        rocmPackages.rocm-runtime
       ];
       extraPackages32 = with pkgs; [
         driversi686Linux.amdvlk
@@ -1246,8 +1250,10 @@ in {
       lib.mkMerge
       (map mkLocalBorg config.services.functora.localBorg);
     #
-    # Tabby
+    # AI
     #
+    services.ollama.enable = true;
+    services.ollama.acceleration = "rocm";
     # services.tabby-server.enable = true;
     # services.tabby-socket.enable = true;
   };

nix/doom.nix

@@ -1,5 +1,6 @@
 let
   pkgs = import ./nixpkgs.nix;
+  unst = import ./nixpkgs-unstable.nix;
   fj = import ./firejail.nix;
 in
   pkgs.lib.optionalAttrs (builtins.pathExists ../bak/doom)
@@ -8,7 +9,7 @@ in
       pkg = "doom-64";
       dir = "doom";
       exe = ''
-        ${pkgs.gzdoom}/bin/gzdoom \
+        ${unst.gzdoom}/bin/gzdoom \
           -iwad ${../bak/doom/freedoom-0.13.0/freedoom2.wad} \
           -file ${../bak/doom/BD64-VoH_game_v1.4.2.pk3} \
           -file ${../bak/doom/BD64-VoH_maps_v1.4.2.pk3} \
@@ -21,7 +22,7 @@ in
       pkg = "doom-ashes1";
       dir = "doom";
       exe = ''
-        ${pkgs.gzdoom}/bin/gzdoom \
+        ${unst.gzdoom}/bin/gzdoom \
           -iwad ${../bak/doom/freedoom-0.13.0/freedoom2.wad} \
           -file ${../bak/doom/AshesStandalone_V1_51/Resources/AshesSAMenu.pk3} \
           -file ${../bak/doom/AshesStandalone_V1_51/Resources/lightmodepatch.pk3} \
@@ -33,6 +34,9 @@ in
           -file ${../bak/doom/AshesVoxelPickups-Ep1.pk3} \
           -file ${../bak/doom/ashes-wpn-tracers.pk3} \
           -file ${../bak/doom/relite_0.7.3b.pk3} \
+          -file ${../bak/doom/nashgore.pk3} \
+          -file ${../bak/doom/MaterialsNashgoreNext.pk3} \
+          -file ${../bak/doom/purple.pk3} \
           -file ${../bak/doom/SimpleSlots.1.1.pk7}
       '';
     }

nix/sources.json

@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3a05eebede89661660945da1f151959900903b6a",
-        "sha256": "0n56l6v5k3lmrr4vjnp6xk1s46shkwdkvai05dzcbcabpl29yb9g",
+        "rev": "8c441601c43232976179eac52dde704c8bdf81ed",
+        "sha256": "16r7z12kmznnbw7w1fq39f3n0g8a6mqnny2y73m7qivjxilfcqxb",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/3a05eebede89661660945da1f151959900903b6a.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/8c441601c43232976179eac52dde704c8bdf81ed.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

pub/bfx/src/Bfx/Class/ToRequestParam.hs

@@ -7,7 +7,6 @@ module Bfx.Class.ToRequestParam
   )
 where
 
-import Bfx.Data.Web
 import qualified Data.ByteString as BS
 import qualified Data.Text as T
 import Functora.Money

pub/bfx/src/Bfx/Data/Web.hs

@@ -7,7 +7,6 @@ module Bfx.Data.Web
     BaseUrl (..),
     withNonce,
     parseJsonBs,
-    utcTimeToMicros,
   )
 where
 
@@ -16,7 +15,6 @@ import qualified Data.Aeson.Types as A
 import qualified Data.ByteString as BS
 import Functora.Cfg
 import Functora.Prelude
-import qualified Prelude
 
 newtype PrvKey = PrvKey
   { unPrvKey :: Text

pub/functora/src/prelude/Functora/Prelude.hs

@@ -126,6 +126,7 @@ module Functora.Prelude
     NonceGen,
     newNonceGen,
     withNonce,
+    utcTimeToMicros,
 
     -- * FixedPoint
     -- $fixedPoint