Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7670683b03 | ||
|
|
d88426eb68 | ||
|
|
cc996f7550 | ||
|
|
f5be95e5c3 | ||
|
|
a40695beaa |
@@ -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}";
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
{pkgs, ...}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
homebrew = {
|
||||
homebrew = {
|
||||
enable = true;
|
||||
global = {
|
||||
brewfile = true;
|
||||
};
|
||||
brews = [];
|
||||
brews = [ ];
|
||||
|
||||
onActivation = {
|
||||
cleanup = "uninstall";
|
||||
cleanup = "none";
|
||||
autoUpdate = true;
|
||||
upgrade = true;
|
||||
|
||||
@@ -36,11 +36,18 @@ homebrew = {
|
||||
"Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
|
||||
"LibreOffice" = 1630474372;
|
||||
"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)
|
||||
"Night Sky" = 475772902; # 475772902
|
||||
"Native SQLite Manager" = 1416282836; # (1.31.0)
|
||||
"Remarkable Desktop" = 1276493162; # (3.19.0)
|
||||
"Slack for Desktop" = 803453959; # (4.45.60)
|
||||
"WhatsApp Messenger" = 310633997; # (26.30.77)
|
||||
"WiFi Explorer: Scanner" = 494803304; # (3.5.6)
|
||||
"Windows App Installer" = 1295203466; # (1.0.16)
|
||||
"Wireguard" = 1451685025; # (1.0.16)
|
||||
@@ -69,7 +76,6 @@ homebrew = {
|
||||
"discord"
|
||||
"signal"
|
||||
"webex"
|
||||
"whatsapp"
|
||||
"zoom"
|
||||
|
||||
# Utility Tools
|
||||
@@ -85,6 +91,12 @@ homebrew = {
|
||||
"spamsieve"
|
||||
"syncthing-app"
|
||||
"synology-drive"
|
||||
"tigervnc"
|
||||
|
||||
#LLM
|
||||
"ollama-app"
|
||||
"hermes-desktop"
|
||||
"jan"
|
||||
|
||||
# Entertainment Tools
|
||||
"qobuz"
|
||||
@@ -106,13 +118,13 @@ homebrew = {
|
||||
"macdown-3000"
|
||||
"mailmate@beta"
|
||||
"orcaslicer"
|
||||
"remanager"
|
||||
# "remanager"
|
||||
"qmk-toolbox"
|
||||
"smartsheet"
|
||||
# "sqlitestudio" # Doesn't work without Rosetta
|
||||
|
||||
# "virtualbox" # build error?
|
||||
"copilot-cli"
|
||||
|
||||
|
||||
# Browsers
|
||||
"brave-browser"
|
||||
@@ -124,4 +136,4 @@ homebrew = {
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
emacsOverlaySha256 = "1923mymd50zpz0mq34jpcn6jgq6li92j8wvkarl0y594c01x52g9";
|
||||
emacsOverlaySha256 = "07i9zb4rw9zwip9a49fv0q60ak025vn92r48vk7ns61was1mzn9s";
|
||||
in
|
||||
{
|
||||
home-manager.backupFileExtension = "nix-backup";
|
||||
|
||||
@@ -62,6 +62,9 @@ in
|
||||
};
|
||||
stateVersion = "23.11";
|
||||
};
|
||||
|
||||
home.activation.ensureNpmCliTools = import ./npm.nix { inherit lib pkgs; };
|
||||
|
||||
catppuccin = {
|
||||
autoEnable = true;
|
||||
enable = true;
|
||||
@@ -184,6 +187,7 @@ in
|
||||
initContent =
|
||||
let
|
||||
zshConfigEarlyInit = lib.mkOrder 500 ''
|
||||
ulimit -n 524288
|
||||
if [[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]]; then
|
||||
. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
|
||||
. /nix/var/nix/profiles/default/etc/profile.d/nix.sh
|
||||
@@ -200,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
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ lib, pkgs }:
|
||||
|
||||
let
|
||||
npmPackages = [
|
||||
"@enact/cli"
|
||||
"@webos-tools/cli"
|
||||
"@anthropic-ai/claude-code"
|
||||
"patch-package"
|
||||
];
|
||||
in
|
||||
lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
# Ensure required npm CLI tools are installed in the user prefix.
|
||||
NPM_BIN="${pkgs.nodejs}/bin/npm"
|
||||
export NPM_CONFIG_PREFIX="$HOME/.npm-packages"
|
||||
export PATH="${pkgs.nodejs}/bin:$NPM_CONFIG_PREFIX/bin:$PATH"
|
||||
|
||||
if [[ ! -x "$NPM_BIN" ]]; then
|
||||
echo "npm not found; skipping npm CLI installation step"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
for pkg in ${lib.concatStringsSep " " (map lib.escapeShellArg npmPackages)}; do
|
||||
if "$NPM_BIN" list -g --depth=0 "$pkg" >/dev/null 2>&1; then
|
||||
echo "npm package already installed: $pkg"
|
||||
else
|
||||
echo "installing npm package: $pkg"
|
||||
"$NPM_BIN" install -g "$pkg"
|
||||
fi
|
||||
done
|
||||
''
|
||||
@@ -127,8 +127,7 @@ with pkgs;
|
||||
]
|
||||
))
|
||||
|
||||
# LLM
|
||||
ollama # Launchd definition in hosts/darwin/default.nix
|
||||
|
||||
|
||||
# Social
|
||||
pidgin
|
||||
|
||||
Reference in New Issue
Block a user