diff --git a/hosts/darwin/default.nix b/hosts/darwin/default.nix index c4c2f5c..3e96921 100644 --- a/hosts/darwin/default.nix +++ b/hosts/darwin/default.nix @@ -24,6 +24,7 @@ in imports = [ ../../modules/darwin/default.nix ../../modules/darwin/home-manager.nix + # ../../modules/darwin/ai.nix ]; # Setup user, packages, programs @@ -131,16 +132,6 @@ in 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 = { stateVersion = 4; primaryUser = "${user}"; diff --git a/modules/darwin/ai.nix b/modules/darwin/ai.nix new file mode 100644 index 0000000..cfb45a0 --- /dev/null +++ b/modules/darwin/ai.nix @@ -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"; + }; + }; +} diff --git a/modules/darwin/brewery.nix b/modules/darwin/brewery.nix index e1918d8..b984bc0 100644 --- a/modules/darwin/brewery.nix +++ b/modules/darwin/brewery.nix @@ -85,6 +85,11 @@ "spamsieve" "syncthing-app" "synology-drive" + "tigervnc" + + #LLM + "ollama" + "hermes-desktop" # Entertainment Tools "qobuz" diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index 611a4c0..2a6747f 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: let - emacsOverlaySha256 = "1923mymd50zpz0mq34jpcn6jgq6li92j8wvkarl0y594c01x52g9"; + emacsOverlaySha256 = "05mzc9a7g3ha7j2wjlbbsnm16yaj1j6nhv24x2jy0iv0r8cgmigc"; in { home-manager.backupFileExtension = "nix-backup"; diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix index 0710e4a..28cc7a1 100644 --- a/modules/darwin/home-manager.nix +++ b/modules/darwin/home-manager.nix @@ -204,6 +204,9 @@ in export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) # Define variables for directories + + export PATH=$HOME/.local/bin:$PATH + export PATH=$HOME/.pnpm-packages/bin:$HOME/.pnpm-packages:$PATH export PATH=$HOME/.npm-packages/bin:$HOME/bin:$PATH export PATH=$HOME/.local/share/bin:$PATH diff --git a/modules/darwin/packages.nix b/modules/darwin/packages.nix index cbab579..504f8ef 100644 --- a/modules/darwin/packages.nix +++ b/modules/darwin/packages.nix @@ -127,8 +127,7 @@ with pkgs; ] )) - # LLM - ollama # Launchd definition in hosts/darwin/default.nix + # Social pidgin