Moving Hermes and Ollama out of the managed configuration in to brew, Hermes is installed manually.
This commit is contained in:
@@ -24,6 +24,7 @@ in
|
|||||||
imports = [
|
imports = [
|
||||||
../../modules/darwin/default.nix
|
../../modules/darwin/default.nix
|
||||||
../../modules/darwin/home-manager.nix
|
../../modules/darwin/home-manager.nix
|
||||||
|
# ../../modules/darwin/ai.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Setup user, packages, programs
|
# Setup user, packages, programs
|
||||||
@@ -131,16 +132,6 @@ in
|
|||||||
StandardOutPath = "/tmp/emacs.out.log";
|
StandardOutPath = "/tmp/emacs.out.log";
|
||||||
};
|
};
|
||||||
|
|
||||||
launchd.user.agents.ollama = {
|
|
||||||
command = "${pkgs.ollama}/bin/ollama serve";
|
|
||||||
serviceConfig = {
|
|
||||||
KeepAlive = true;
|
|
||||||
RunAtLoad = true;
|
|
||||||
StandardOutPath = "/tmp/ollama.out.log";
|
|
||||||
StandardErrorPath = "/tmp/ollama.err.log";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
system = {
|
system = {
|
||||||
stateVersion = 4;
|
stateVersion = 4;
|
||||||
primaryUser = "${user}";
|
primaryUser = "${user}";
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
{ pkgs, llm-agents, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
environment.systemPackages = [
|
||||||
|
|
||||||
|
ollama
|
||||||
|
|
||||||
|
# CLI coding agent from llm-agents.nix input
|
||||||
|
llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.hermes-agent
|
||||||
|
|
||||||
|
# Hermes desktop GUI
|
||||||
|
llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.hermes-desktop
|
||||||
|
];
|
||||||
|
|
||||||
|
launchd.user.agents.ollama = {
|
||||||
|
command = "${pkgs.ollama}/bin/ollama serve";
|
||||||
|
serviceConfig = {
|
||||||
|
KeepAlive = true;
|
||||||
|
RunAtLoad = true;
|
||||||
|
StandardOutPath = "/tmp/ollama.out.log";
|
||||||
|
StandardErrorPath = "/tmp/ollama.err.log";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -85,6 +85,11 @@
|
|||||||
"spamsieve"
|
"spamsieve"
|
||||||
"syncthing-app"
|
"syncthing-app"
|
||||||
"synology-drive"
|
"synology-drive"
|
||||||
|
"tigervnc"
|
||||||
|
|
||||||
|
#LLM
|
||||||
|
"ollama"
|
||||||
|
"hermes-desktop"
|
||||||
|
|
||||||
# Entertainment Tools
|
# Entertainment Tools
|
||||||
"qobuz"
|
"qobuz"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
emacsOverlaySha256 = "1923mymd50zpz0mq34jpcn6jgq6li92j8wvkarl0y594c01x52g9";
|
emacsOverlaySha256 = "05mzc9a7g3ha7j2wjlbbsnm16yaj1j6nhv24x2jy0iv0r8cgmigc";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home-manager.backupFileExtension = "nix-backup";
|
home-manager.backupFileExtension = "nix-backup";
|
||||||
|
|||||||
@@ -204,6 +204,9 @@ in
|
|||||||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
||||||
|
|
||||||
# Define variables for directories
|
# Define variables for directories
|
||||||
|
|
||||||
|
export PATH=$HOME/.local/bin:$PATH
|
||||||
|
|
||||||
export PATH=$HOME/.pnpm-packages/bin:$HOME/.pnpm-packages:$PATH
|
export PATH=$HOME/.pnpm-packages/bin:$HOME/.pnpm-packages:$PATH
|
||||||
export PATH=$HOME/.npm-packages/bin:$HOME/bin:$PATH
|
export PATH=$HOME/.npm-packages/bin:$HOME/bin:$PATH
|
||||||
export PATH=$HOME/.local/share/bin:$PATH
|
export PATH=$HOME/.local/share/bin:$PATH
|
||||||
|
|||||||
@@ -127,8 +127,7 @@ with pkgs;
|
|||||||
]
|
]
|
||||||
))
|
))
|
||||||
|
|
||||||
# LLM
|
|
||||||
ollama # Launchd definition in hosts/darwin/default.nix
|
|
||||||
|
|
||||||
# Social
|
# Social
|
||||||
pidgin
|
pidgin
|
||||||
|
|||||||
Reference in New Issue
Block a user