diff --git a/.config/just/justfile b/.config/just/justfile
index 6059690..87ee757 100644
--- a/.config/just/justfile
+++ b/.config/just/justfile
@@ -7,25 +7,23 @@ n_cpu   := "$(($(grep -c ^processor /proc/cpuinfo)-2))"
 apt +package:
     #!/usr/bin/bash
     for p in {{package}}; do
-        PKG_OK=$(dpkg-query -W --showformat='${Status}\n' {{package}}|grep "install ok installed")
+        PKG_OK=$(dpkg-query -W --showformat='${Status}\n' $p |grep "install ok installed")
         if [ "" = "$PKG_OK" ]; then
-            echo "No {{package}}. Setting up {{package}}."
-            sudo apt-get -qy install {{package}}
+            echo "No $p . Setting up $p ."
+            sudo apt-get -qy install $p 
         fi
     done
 
+cargo_update: (rust) (cargo "cargo-update")
+    cargo install-update -a
+
 # Install a package using cargo
 cargo +package: (rust)
     #!/usr/bin/bash
-    # if [ "update" == {{package}} ]; then
-    #     just cargo cargo-update
-    #     cargo install-update -a
-    #     exit 0
-    # fi
     for p in {{package}}; do
-        echo $RESULT
+        RESULT=$(command -v $p)
         if [ "" = "$RESULT" ]; then
-            cargo binstall {{package}} -y
+            cargo binstall $p -y
         fi
     done
 
@@ -45,6 +43,10 @@ zsh: (apt "zsh fzf build-essential") (duf) (lazygit) (cargo "eza zoxide bat fd-f
     chsh -s $(which zsh)
     antidote load
 
+zsh_local:
+    sh -c "$(curl -fsSL https://raw.githubusercontent.com/romkatv/zsh-bin/master/install)"
+
+
 cloudflared: (apt "gdebi")
     wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb
     sudo gdebi -n cloudflared-linux-amd64.deb
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 78007d8..4d9f3f2 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -7,7 +7,7 @@
   "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
   "gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" },
   "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
-  "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
+  "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
   "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
   "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" },
   "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 412f3da..119c033 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -15,6 +15,7 @@ alias ts="tmux new-session -A -s"
 alias tl="tmux ls"
 
 alias lyadm="lazygit --work-tree ~ --git-dir ~/.local/share/yadm/repo.git"
+alias jyadm="just -g"
 
 # Completions
 fpath=($HOME/.zsh/completions $fpath)
@@ -30,41 +31,49 @@ if type rg &> /dev/null; then
   export FZF_DEFAULT_COMMAND='rg --files'
   export FZF_DEFAULT_OPTS='-m --height 50% --border'
 fi
-source /usr/share/doc/fzf/examples/completion.zsh
-source /usr/share/doc/fzf/examples/key-bindings.zsh
+if [ -d /usr/share/doc/fzf ]; then
+  source /usr/share/doc/fzf/examples/completion.zsh
+  source /usr/share/doc/fzf/examples/key-bindings.zsh
+fi
 
 # ----------------- Replacement for standard tools ----------------- #
 # ls -> eza aliases
 # https://gist.github.com/AppleBoiy/04a249b6f64fd0fe1744aff759a0563b
 # TODO: https://denisrasulev.medium.com/eza-the-best-ls-command-replacement-9621252323e
-alias ls='eza'
-alias l='eza -lbF --git'
-alias ll='eza -lbGF --git'
-alias llm='eza -lbGd --git --sort=modified'
-alias la='eza -lbhHigUmuSa --time-style=long-iso --git --color-scale'
-alias lx='eza -lbhHigUmuSa@ --time-style=long-iso --git --color-scale'
-# specialty views
-alias lS='eza -1'
-alias lt='eza --tree --level=2'
-alias l.="eza -a | grep -E '^\.'"
+if [ "$(command -v eza)" != "" ]; then
+  alias ls='eza'
+  alias l='eza -lbF --git'
+  alias ll='eza -lbGF --git'
+  alias llm='eza -lbGd --git --sort=modified'
+  alias la='eza -lbhHigUmuSa --time-style=long-iso --git --color-scale'
+  alias lx='eza -lbhHigUmuSa@ --time-style=long-iso --git --color-scale'
+  # specialty views
+  alias lS='eza -1'
+  alias lt='eza --tree --level=2'
+  alias l.="eza -a | grep -E '^\.'"
+fi
 
 # cd -> zoxide
-eval "$(zoxide init zsh)"
-alias cd="z"
-alias cdi="zi"
+if [ "$(command -v zoxide)" != "" ]; then
+  eval "$(zoxide init zsh)"
+  alias cd="z"
+  alias cdi="zi"
+fi
 
 # man -> tldr
 # No alias
 
 # cat -> bat
-export BAT_THEME="base16"
-export BAT_STYLE="numbers,changes,header"
-alias cat="bat"
-alias -g -- -h='-h 2>&1 | bat --language=help --style=plain'
-alias -g -- --help='--help 2>&1 | bat --language=help --style=plain'
-
+if [ "$(command -v bat)" != "" ]; then
+  export BAT_THEME="base16"
+  export BAT_STYLE="numbers,changes,header"
+  alias cat="bat"
+  alias -g -- -h='-h 2>&1 | bat --language=help --style=plain'
+fi
 # direnv hook
-eval "$(direnv hook zsh)"
+if [ "$(command -v direnv)" != "" ]; then
+  eval "$(direnv hook zsh)"
+fi
 
 # To customize prompt, run `p10k configure` or edit ~/.zsh/.p10k.zsh.
 [[ ! -f "$ZDOTDIR/.p10k.zsh" ]] || source $ZDOTDIR/.p10k.zsh