Merge branch 'master' of github.com:mrjones2014/dotfiles

mrjones2014 · Mar 11, 2024 · d64b359 · d64b359
2 parents 3c0b17e + d75a513
commit d64b359
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 21 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix
@@ -110,6 +110,10 @@ in {
         onEvent = "fish_postexec";
         body = "tput cup $LINES";
       };
+      clone = {
+        description = "Clone a git repository, then cd into it.";
+        body = "cd $HOME/git && git clone $argv && cd $(basename $argv .git)";
+      };
       nix-clean = ''
         nix-env --delete-generations old
         nix-store --gc

diff --git a/nixos-modules/allowed-unfree.nix b/nixos-modules/allowed-unfree.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ lib, ... }: {
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [
       "obsidian"
@@ -17,6 +17,10 @@
       # however VS Code should NOT be installed on this system!
       # Use VS Codium instead: https://github.com/VSCodium/vscodium
       "vscode"
+
+      # CUDA support (e.g. for Ollama)
+      "cudatoolkit"
+      "cuda_cudart"
     ];
 }
 
diff --git a/nixos-modules/ollama.nix b/nixos-modules/ollama.nix
@@ -1,6 +1,8 @@
 { pkgs, ... }: {
   imports = [ ./open-webui.nix ];
-  services.ollama.enable = true;
+  services.ollama = {
+    enable = true;
+    acceleration = "cuda";
+  };
   environment.systemPackages = [ pkgs.oterm ];
 }
-