2 Commits
7 changed files with 47 additions and 16 deletions
+1 -10
View File
@@ -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}";
+25
View File
@@ -0,0 +1,25 @@
{ 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";
};
};
}
+15 -3
View File
@@ -36,11 +36,18 @@
"Ice Cubes for Mastodon" = 6444915884; # (1.11.3) "Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
"LibreOffice" = 1630474372; "LibreOffice" = 1630474372;
"Monal - XMPP Chatting " = 1637078500; "Monal - XMPP Chatting " = 1637078500;
"Microsoft Copilot" = 6738511300; # (25.7.440804001)
"Microsoft Outlook" = 985367838; # (16.111.3)
"Microsoft Excel" = 462058435; # (16.111.3)
"Microsoft Word" = 462054704; # (16.111.3)
"Microsoft PowerPoint" = 462062816; # (16.111.3)
"OneDrive" = 823766827; # (26.134.0713)
"MQTT Explorer" = 1455214828; # (0.3.5) "MQTT Explorer" = 1455214828; # (0.3.5)
"Night Sky" = 475772902; # 475772902 "Night Sky" = 475772902; # 475772902
"Native SQLite Manager" = 1416282836; # (1.31.0) "Native SQLite Manager" = 1416282836; # (1.31.0)
"Remarkable Desktop" = 1276493162; # (3.19.0) "Remarkable Desktop" = 1276493162; # (3.19.0)
"Slack for Desktop" = 803453959; # (4.45.60) "Slack for Desktop" = 803453959; # (4.45.60)
"WhatsApp Messenger" = 310633997; # (26.30.77)
"WiFi Explorer: Scanner" = 494803304; # (3.5.6) "WiFi Explorer: Scanner" = 494803304; # (3.5.6)
"Windows App Installer" = 1295203466; # (1.0.16) "Windows App Installer" = 1295203466; # (1.0.16)
"Wireguard" = 1451685025; # (1.0.16) "Wireguard" = 1451685025; # (1.0.16)
@@ -69,7 +76,6 @@
"discord" "discord"
"signal" "signal"
"webex" "webex"
"whatsapp"
"zoom" "zoom"
# Utility Tools # Utility Tools
@@ -85,6 +91,12 @@
"spamsieve" "spamsieve"
"syncthing-app" "syncthing-app"
"synology-drive" "synology-drive"
"tigervnc"
#LLM
"ollama-app"
"hermes-desktop"
"jan"
# Entertainment Tools # Entertainment Tools
"qobuz" "qobuz"
@@ -106,13 +118,13 @@
"macdown-3000" "macdown-3000"
"mailmate@beta" "mailmate@beta"
"orcaslicer" "orcaslicer"
"remanager" # "remanager"
"qmk-toolbox" "qmk-toolbox"
"smartsheet" "smartsheet"
# "sqlitestudio" # Doesn't work without Rosetta # "sqlitestudio" # Doesn't work without Rosetta
# "virtualbox" # build error? # "virtualbox" # build error?
"copilot-cli"
# Browsers # Browsers
"brave-browser" "brave-browser"
+1 -1
View File
@@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
emacsOverlaySha256 = "1923mymd50zpz0mq34jpcn6jgq6li92j8wvkarl0y594c01x52g9"; emacsOverlaySha256 = "07i9zb4rw9zwip9a49fv0q60ak025vn92r48vk7ns61was1mzn9s";
in in
{ {
home-manager.backupFileExtension = "nix-backup"; home-manager.backupFileExtension = "nix-backup";
+3
View File
@@ -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
+1
View File
@@ -4,6 +4,7 @@ let
npmPackages = [ npmPackages = [
"@enact/cli" "@enact/cli"
"@webos-tools/cli" "@webos-tools/cli"
"@anthropic-ai/claude-code"
"patch-package" "patch-package"
]; ];
in in
+1 -2
View File
@@ -127,8 +127,7 @@ with pkgs;
] ]
)) ))
# LLM
ollama # Launchd definition in hosts/darwin/default.nix
# Social # Social
pidgin pidgin