From c592e0f1ab27f3beeb0ac0e26e7755a785f97843 Mon Sep 17 00:00:00 2001
From: Myned <dev@bjork.tech>
Date: Fri, 14 Mar 2025 16:48:08 -0500
Subject: [PATCH] custom: add ollama service
Signed-off-by: Myned <dev@bjork.tech>
---
machines/mynix/default.nix | 4 +++
machines/myork/default.nix | 28 ++++++++++++++++++---
options/custom/menus/walker/search.sh | 6 +++++
options/custom/programs/chromium.nix | 6 +++++
options/custom/programs/firefox/.common.nix | 6 +++++
options/custom/services/default.nix | 1 +
options/custom/services/ollama.nix | 27 ++++++++++++++++++++
options/custom/settings/hardware.nix | 20 +++++++++++----
options/custom/settings/packages.nix | 1 +
9 files changed, 90 insertions(+), 9 deletions(-)
create mode 100644 options/custom/services/ollama.nix
diff --git a/machines/mynix/default.nix b/machines/mynix/default.nix
index 2d7f640..b9b2c2f 100644
--- a/machines/mynix/default.nix
+++ b/machines/mynix/default.nix
@@ -27,6 +27,10 @@
abiotic-factor = true;
};
+ hardware = {
+ gpu = "amd";
+ };
+
storage.mnt = [
"gayme"
"gaymer"
diff --git a/machines/myork/default.nix b/machines/myork/default.nix
index 941f6d2..90b06ca 100644
--- a/machines/myork/default.nix
+++ b/machines/myork/default.nix
@@ -15,14 +15,34 @@
width = 2256;
height = 1504;
scale = 1.5;
- desktops.niri.output.connectors = ["eDP-1"];
+
+ desktops = {
+ niri.output.connectors = ["eDP-1"];
+ };
# BUG: Phoenix support not currently functional
# https://github.com/Cryolitia/ryzen_smu/issues/1
- #// programs.ryzenadj.enable = true;
+ programs = {
+ #// ryzenadj.enable = true;
+ };
- services.fw-fanctrl.enable = true;
- #// settings.storage.mnt = ["myve"];
+ services = {
+ fw-fanctrl.enable = true;
+
+ # https://github.com/ollama/ollama/blob/main/docs/gpu.md#overrides
+ #?? nix run nixpkgs#rocmPackages.rocminfo | grep gfx
+ ollama.rocmOverrideGfx = "10.3.0"; # 10.3.1
+ };
+
+ settings = {
+ hardware = {
+ gpu = "amd";
+ };
+
+ storage = {
+ mnt = ["myve"];
+ };
+ };
};
services.keyd.keyboards.default.settings.main.rightcontrol = "layer(altgr)"; # No Ctrl_R
diff --git a/options/custom/menus/walker/search.sh b/options/custom/menus/walker/search.sh
index de05a97..d24a3e3 100644
--- a/options/custom/menus/walker/search.sh
+++ b/options/custom/menus/walker/search.sh
@@ -182,6 +182,12 @@ case "$1" in
url="https://wiki.nixos.org/w/index.php?search="
query="${1:3}"
;;
+ 'o '*)
+ label="Ollama"
+ icon="ollama"
+ url="https://ollama.com/search?q="
+ query="${1:2}"
+ ;;
'p '*)
label="Piped"
icon="youtube"
diff --git a/options/custom/programs/chromium.nix b/options/custom/programs/chromium.nix
index 0ff330f..e17faae 100644
--- a/options/custom/programs/chromium.nix
+++ b/options/custom/programs/chromium.nix
@@ -244,6 +244,12 @@ in {
url = "https://wiki.nixos.org/w/index.php?search={searchTerms}";
}
+ {
+ name = "Ollama";
+ shortcut = "o";
+ url = "https://ollama.com/search?q={searchTerms}";
+ }
+
{
name = "Piped";
shortcut = "p";
diff --git a/options/custom/programs/firefox/.common.nix b/options/custom/programs/firefox/.common.nix
index 35a7123..8e916de 100644
--- a/options/custom/programs/firefox/.common.nix
+++ b/options/custom/programs/firefox/.common.nix
@@ -479,6 +479,12 @@ with lib; {
urls = [{template = "https://wiki.nixos.org/w/index.php?search={searchTerms}";}];
};
+ "Ollama" = {
+ definedAliases = ["o"];
+ iconUpdateURL = "https://ollama.com/public/icon-64x64.png";
+ urls = [{template = "https://ollama.com/search?q={searchTerms}";}];
+ };
+
"Piped" = {
definedAliases = ["p"];
iconUpdateURL = "https://piped.${config.custom.domain}/favicon.ico";
diff --git a/options/custom/services/default.nix b/options/custom/services/default.nix
index eb22a8f..dc29e54 100644
--- a/options/custom/services/default.nix
+++ b/options/custom/services/default.nix
@@ -45,6 +45,7 @@ with lib; {
keyd.enable = true;
#// mako.enable = true;
#// network-manager-applet.enable = true;
+ ollama.enable = true;
power-profiles-daemon.enable = true;
samba.enable = true;
#// swayidle.enable = true;
diff --git a/options/custom/services/ollama.nix b/options/custom/services/ollama.nix
new file mode 100644
index 0000000..9f19402
--- /dev/null
+++ b/options/custom/services/ollama.nix
@@ -0,0 +1,27 @@
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
+with lib; let
+ cfg = config.custom.services.ollama;
+in {
+ options.custom.services.ollama = {
+ enable = mkOption {default = false;};
+ };
+
+ config = mkIf cfg.enable {
+ # https://ollama.com/
+ # https://wiki.nixos.org/wiki/Ollama
+ services.ollama = {
+ enable = true;
+ openFirewall = true;
+ package = pkgs.ollama-rocm;
+
+ loadModels = [
+ "deepseek-r1" # https://github.com/deepseek-ai/DeepSeek-R1
+ ];
+ };
+ };
+}
diff --git a/options/custom/settings/hardware.nix b/options/custom/settings/hardware.nix
index 4969a81..d341b83 100644
--- a/options/custom/settings/hardware.nix
+++ b/options/custom/settings/hardware.nix
@@ -6,12 +6,22 @@
with lib; let
cfg = config.custom.settings.hardware;
in {
- options.custom.settings.hardware.enable = mkOption {default = false;};
+ options.custom.settings.hardware = {
+ enable = mkOption {default = false;};
+ gpu = mkOption {default = null;};
+ };
- config.hardware = mkIf cfg.enable {
- enableAllFirmware = config.custom.default; # Non-free firmware
+ config = mkIf cfg.enable {
+ hardware = {
+ enableAllFirmware = config.custom.default; # Non-free firmware
- # https://wiki.nixos.org/wiki/Bluetooth
- bluetooth.enable = config.custom.minimal;
+ # https://wiki.nixos.org/wiki/Bluetooth
+ bluetooth.enable = config.custom.minimal;
+ };
+
+ nixpkgs.config = {
+ cudaSupport = mkIf (cfg.gpu == "nvidia") true;
+ rocmSupport = mkIf (cfg.gpu == "amd") true;
+ };
};
}
diff --git a/options/custom/settings/packages.nix b/options/custom/settings/packages.nix
index af0c698..11f3917 100644
--- a/options/custom/settings/packages.nix
+++ b/options/custom/settings/packages.nix
@@ -74,6 +74,7 @@ in {
]
++ optionals config.custom.full [
### GUI applications
+ alpaca # AI client
amberol # Audio player
apostrophe # Markdown editor
baobab # Disk usage analyzer