From 2109532ae0678a50341c4dd775aebff1c711119a Mon Sep 17 00:00:00 2001 From: Jeff Triplett Date: Tue, 15 Oct 2024 08:10:08 -0500 Subject: [PATCH] :gear: :tractor: Updates recipes --- home/.justfiles/llm.justfile | 7 +++++-- home/.justfiles/macos.justfile | 7 +++++-- home/.justfiles/ollama.justfile | 9 ++++++--- home/.justfiles/virtualenv.justfile | 7 +++++-- home/.justfiles/virtualenvwrapper.justfile | 7 +++++-- home/justfile | 11 +++++------ 6 files changed, 31 insertions(+), 17 deletions(-) diff --git a/home/.justfiles/llm.justfile b/home/.justfiles/llm.justfile index c5bcdae..4f919c4 100644 --- a/home/.justfiles/llm.justfile +++ b/home/.justfiles/llm.justfile @@ -2,15 +2,18 @@ # llm recipes - https://virtualenv.pypa.io/en/latest/ # ---------------------------------------------------------------- +set dotenv-load := false +set export := true + justfile := justfile_directory() + "/.justfiles/llm.justfile" [private] @default: - just --list --justfile {{ justfile }} + just --justfile {{ justfile }} --list [private] @fmt: - just --fmt --justfile {{ justfile }} + just --justfile {{ justfile }} --fmt @install: llm install llm-claude diff --git a/home/.justfiles/macos.justfile b/home/.justfiles/macos.justfile index 79c6de2..956738d 100644 --- a/home/.justfiles/macos.justfile +++ b/home/.justfiles/macos.justfile @@ -2,15 +2,18 @@ # macOS recipes # ---------------------------------------------------------------- +set dotenv-load := false +set export := true + justfile := justfile_directory() + "/.justfiles/macos.justfile" [private] @default: - just --list --justfile {{ justfile }} + just --justfile {{ justfile }} --list [private] @fmt: - just --fmt --justfile {{ justfile }} + just --justfile {{ justfile }} --fmt # ---------------------------------------------------------------- # Time Machine recipes diff --git a/home/.justfiles/ollama.justfile b/home/.justfiles/ollama.justfile index 5469655..98829df 100644 --- a/home/.justfiles/ollama.justfile +++ b/home/.justfiles/ollama.justfile @@ -2,18 +2,21 @@ # Ollama recipes # ---------------------------------------------------------------- -justfile := justfile_directory() + "/.justfiles/ollama.justfile" +set dotenv-load := false +set export := true + export OLLAMA_HOST := "0.0.0.0:11434" export OLLAMA_KEEP_ALIVE := "30m" export OLLAMA_ORIGINS := "http://*" +justfile := justfile_directory() + "/.justfiles/ollama.justfile" [private] @default: - just --list --justfile {{ justfile }} + just --justfile {{ justfile }} --list [private] @fmt: - just --fmt --justfile {{ justfile }} + just --justfile {{ justfile }} --fmt @copy-plist: cp ~/.plists/homebrew.mxcl.ollama.plist /opt/homebrew/opt/ollama/homebrew.mxcl.ollama.plist diff --git a/home/.justfiles/virtualenv.justfile b/home/.justfiles/virtualenv.justfile index 3105314..9162df1 100644 --- a/home/.justfiles/virtualenv.justfile +++ b/home/.justfiles/virtualenv.justfile @@ -2,15 +2,18 @@ # virtualenv recipes - https://virtualenv.pypa.io/en/latest/ # ---------------------------------------------------------------- +set dotenv-load := false +set export := true + justfile := justfile_directory() + "/.justfiles/virtualenv.justfile" [private] @default: - just --list --justfile {{ justfile }} + just --justfile {{ justfile }} --list [private] @fmt: - just --fmt --justfile {{ justfile }} + just --justfile {{ justfile }} --fmt scan: #!/usr/bin/env python diff --git a/home/.justfiles/virtualenvwrapper.justfile b/home/.justfiles/virtualenvwrapper.justfile index 7ee72ec..4fd170e 100644 --- a/home/.justfiles/virtualenvwrapper.justfile +++ b/home/.justfiles/virtualenvwrapper.justfile @@ -2,15 +2,18 @@ # virtualenvwrapper recipes # ---------------------------------------------------------------- +set dotenv-load := false +set export := true + justfile := justfile_directory() + "/.justfiles/virtualenvwrapper.justfile" [private] @default: - just --list --justfile {{ justfile }} + just --justfile {{ justfile }} --list [private] @fmt: - just --fmt --justfile {{ justfile }} + just --justfile {{ justfile }} --fmt # ---------------------------------------------------------------- # virtualenvwrapper hooks diff --git a/home/justfile b/home/justfile index e8b8ea1..889893e 100644 --- a/home/justfile +++ b/home/justfile @@ -3,7 +3,11 @@ set export := true # set unstable := true +export HOMEBREW_NO_ENV_HINTS := "true" export JUST_UNSTABLE := "true" +export PIP_REQUIRE_VIRTUALENV := "false" + +# export HOMEBREW_NO_AUTO_UPDATE := "true" mod llm '.justfiles/llm.justfile' mod macos '.justfiles/macos.justfile' @@ -11,10 +15,6 @@ mod ollama '.justfiles/ollama.justfile' mod virtualenv '.justfiles/virtualenv.justfile' mod virtualenvwrapper '.justfiles/virtualenvwrapper.justfile' -# export HOMEBREW_NO_AUTO_UPDATE := "true" - -export HOMEBREW_NO_ENV_HINTS := "true" -export PIP_REQUIRE_VIRTUALENV := "false" HOST := `hostname -s` python_310 := `pyenv latest 3.10` python_311 := `pyenv latest 3.11` @@ -199,8 +199,8 @@ _homebrew-services-restart: @_pyenv-set-global: pyenv global \ - {{ python_311 }} \ {{ python_312 }} \ + {{ python_311 }} \ {{ python_310 }} \ {{ python_39 }} @@ -224,7 +224,6 @@ _homebrew-services-restart: # ---------------------------------------------------------------- @uv-python-install *ARGS: - -uv python install {{ ARGS }} 3.13 -uv python install {{ ARGS }} 3.12 -uv python install {{ ARGS }} 3.11 -uv python install {{ ARGS }} 3.10