chore: enable ollama for bismuth testing

jakehamilton · Oct 28, 2024 · 8bb72cb · 8bb72cb
1 parent 79ef443
commit 8bb72cb
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 21 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -67,7 +67,7 @@
 
     # Neovim
     neovim.url = "github:jakehamilton/neovim";
-    neovim.inputs.nixpkgs.follows = "unstable";
+    # neovim.inputs.nixpkgs.follows = "unstable";
 
     # Tmux
     tmux.url = "github:jakehamilton/tmux";

diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix
@@ -83,8 +83,8 @@ in
             ] ++ (mapAttrsToList (name: value: value.key) cfg.extra-substituters);
           }
           // (lib.optionalAttrs config.${namespace}.tools.direnv.enable {
-            keep-outputs = true;
-            keep-derivations = true;
+            # keep-outputs = true;
+            # keep-derivations = true;
           });
 
         gc = {

diff --git a/systems/x86_64-linux/bismuth/default.nix b/systems/x86_64-linux/bismuth/default.nix
@@ -10,13 +10,13 @@ with lib;
 with lib.${namespace};
 {
   imports = [
-		./hardware.nix
-		"${inputs.unstable}/nixos/modules/services/misc/ollama.nix"
-	];
+    ./hardware.nix
+    "${inputs.unstable}/nixos/modules/services/misc/ollama.nix"
+  ];
 
-	disabledModules = [
-		"${inputs.nixpkgs}/nixos/modules/services/misc/ollama.nix"
-	];
+  disabledModules = [
+    "${inputs.nixpkgs}/nixos/modules/services/misc/ollama.nix"
+  ];
 
   # Resolve an issue with Bismuth's wired connections failing sometimes due to weird
   # DHCP issues. I'm not quite sure why this is the case, but I have found that the
@@ -47,6 +47,11 @@ with lib.${namespace};
     rocmOverrideGfx = "10.1.0";
   };
 
+  systemd.services.ollama.environment = {
+    OLLAMA_NUM_THREADS = "8";
+    OLLAMA_MAX_LOADED = "1";
+  };
+
   environment.systemPackages = with pkgs; [
     chromium
     plusultra.kalidoface