From 3bb96418b50c1e72c4e78dca69504a10fb0fdac5 Mon Sep 17 00:00:00 2001 From: Jeff Triplett Date: Tue, 17 Sep 2024 08:27:32 -0500 Subject: [PATCH] :tractor: Refactors fmt and private recipes --- home/.justfiles/llm.justfile | 8 +++++--- home/.justfiles/macos.justfile | 8 +++++--- home/.justfiles/ollama.justfile | 9 +++++---- home/.justfiles/virtualenv.justfile | 8 +++++--- home/.justfiles/virtualenvwrapper.justfile | 8 +++++--- home/justfile | 8 +++++++- 6 files changed, 32 insertions(+), 17 deletions(-) diff --git a/home/.justfiles/llm.justfile b/home/.justfiles/llm.justfile index 89b7f05..c5bcdae 100644 --- a/home/.justfiles/llm.justfile +++ b/home/.justfiles/llm.justfile @@ -4,10 +4,12 @@ justfile := justfile_directory() + "/.justfiles/llm.justfile" -@_default: - just --list +[private] +@default: + just --list --justfile {{ justfile }} -@_fmt: +[private] +@fmt: just --fmt --justfile {{ justfile }} @install: diff --git a/home/.justfiles/macos.justfile b/home/.justfiles/macos.justfile index a27bd56..79c6de2 100644 --- a/home/.justfiles/macos.justfile +++ b/home/.justfiles/macos.justfile @@ -4,10 +4,12 @@ justfile := justfile_directory() + "/.justfiles/macos.justfile" -@_default: - just --list +[private] +@default: + just --list --justfile {{ justfile }} -@_fmt: +[private] +@fmt: just --fmt --justfile {{ justfile }} # ---------------------------------------------------------------- diff --git a/home/.justfiles/ollama.justfile b/home/.justfiles/ollama.justfile index f9cc5e2..5469655 100644 --- a/home/.justfiles/ollama.justfile +++ b/home/.justfiles/ollama.justfile @@ -3,15 +3,16 @@ # ---------------------------------------------------------------- justfile := justfile_directory() + "/.justfiles/ollama.justfile" - export OLLAMA_HOST := "0.0.0.0:11434" export OLLAMA_KEEP_ALIVE := "30m" export OLLAMA_ORIGINS := "http://*" -@_default: - just --list +[private] +@default: + just --list --justfile {{ justfile }} -@_fmt: +[private] +@fmt: just --fmt --justfile {{ justfile }} @copy-plist: diff --git a/home/.justfiles/virtualenv.justfile b/home/.justfiles/virtualenv.justfile index ed7ddcb..3105314 100644 --- a/home/.justfiles/virtualenv.justfile +++ b/home/.justfiles/virtualenv.justfile @@ -4,10 +4,12 @@ justfile := justfile_directory() + "/.justfiles/virtualenv.justfile" -@_default: - just --list +[private] +@default: + just --list --justfile {{ justfile }} -@_fmt: +[private] +@fmt: just --fmt --justfile {{ justfile }} scan: diff --git a/home/.justfiles/virtualenvwrapper.justfile b/home/.justfiles/virtualenvwrapper.justfile index 2a3dfab..7ee72ec 100644 --- a/home/.justfiles/virtualenvwrapper.justfile +++ b/home/.justfiles/virtualenvwrapper.justfile @@ -4,10 +4,12 @@ justfile := justfile_directory() + "/.justfiles/virtualenvwrapper.justfile" -@_default: - just --list +[private] +@default: + just --list --justfile {{ justfile }} -@_fmt: +[private] +@fmt: just --fmt --justfile {{ justfile }} # ---------------------------------------------------------------- diff --git a/home/justfile b/home/justfile index 1f8dc52..e547511 100644 --- a/home/justfile +++ b/home/justfile @@ -28,7 +28,8 @@ alias lock := freeze # In the spirit of "Scripts to rule them all" # ---------------------------------------------------------------- -@_default: +[private] +@default: just --list # installs/updates all dependencies @@ -48,6 +49,11 @@ alias lock := freeze # format and overwrite justfile @fmt: just --fmt --unstable + just llm fmt + just macos fmt + just ollama fmt + just virtualenv fmt + just virtualenvwrapper fmt # Updates our lockfiles without installing dependencies @freeze: