diff --git a/common/.profile b/common/.profile index d9c298a..a161e42 100644 --- a/common/.profile +++ b/common/.profile @@ -59,14 +59,14 @@ export LESSHISTFILE="${XDG_STATE_HOME}/shell/lesshst" export TLDR_CACHE_DIR="${XDG_CACHE_HOME}/tldr" export OLLAMA_HOME="${XDG_CONFIG_HOME}/ollama" export OLLAMA_MODELS="${DEV_CACHE_PATH}"/ollama -export PATH="$PATH:/home/pratik/.lmstudio/bin" +[ ! -f "$HOME/.lmstudio/bin" ] || export PATH="$PATH:$HOME/.lmstudio/bin" export DEV_CACHE_PATH="/media/${USER}/Projects/DevSetUps" export AWS_CONFIG_FILE="${XDG_CONFIG_HOME}/aws/config" export AWS_SHARED_CREDENTIALS_FILE="${XDG_CONFIG_HOME}/aws/credentials" export FZF_DEFAULT_COMMAND='rg --files --hidden' -export FZF_DEFAULT_OPTS='--layout=reverse --cycle --inline-info --height=~80% --border' +export FZF_DEFAULT_OPTS='--layout=reverse --cycle' export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker" [ ! -f "${XDG_CONFIG_HOME}/templates/.gitignore" ] || export GITIGNORE_TEMPLATE="${XDG_CONFIG_HOME}/templates/.gitignore" @@ -106,9 +106,6 @@ export PSQL_HISTORY="${XDG_STATE_HOME}/psql_history" # Go export GOPATH="${DEV_CACHE_PATH}"/gopath/ -# FIX: BELOW DID NOT WORK: added to /etc/profile, need to recheck on reboot -# alias code="code --extensions-dir ${XDG_DATA_HOME}/vscode" - # Java export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="${XDG_CONFIG_HOME}/java" @@ -118,3 +115,7 @@ export NODE_REPL_HISTORY="${XDG_CONFIG_HOME}/node/node_repl_history" export N_PREFIX="${XDG_DATA_HOME}/n_node" export PATH="$N_PREFIX/bin:$PATH" command -v npm >/dev/null 2>&1 && PATH="$(npm config get prefix)/bin:$PATH" + +# Podman's Docker-compatible socket (rootless) +# Make lazydocker work +export DOCKER_HOST="unix:///run/user/$(id -u)/podman/podman.sock" diff --git a/common/.zshrc b/common/.zshrc index b4a440e..83ce287 100644 --- a/common/.zshrc +++ b/common/.zshrc @@ -45,7 +45,7 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] fi # Zinit: ZSH Plugin Manager # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -ZINIT_HOME="${XDG_DATA_HOME}/shell/zinit/zinit.git" +ZINIT_HOME="${XDG_DATA_HOME}/zinit/zinit.git" if [[ ! -d "$ZINIT_HOME" ]]; then mkdir -p "$(dirname $ZINIT_HOME)" git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME" @@ -61,12 +61,12 @@ HISTORY_BASE="$ZSH_STATE_HOME/per-directory-history" # Zinit Plugins zinit ice depth=1; zinit light romkatv/powerlevel10k zinit ice depth=1; zinit light jimhester/per-directory-history -# zinit ice depth=1; zinit light atuinsh/atuin zinit ice wait lucid depth=1; zinit light zsh-users/zsh-completions zinit ice wait lucid depth=1; zinit light zsh-users/zsh-autosuggestions zinit ice wait lucid depth=1; zinit light zdharma-continuum/fast-syntax-highlighting +zinit ice wait lucid depth=1; zinit snippet OMZP::alias-finder zinit ice wait lucid depth=1; zinit snippet OMZP::colored-man-pages zinit ice wait lucid depth=1; zinit snippet OMZP::command-not-found zinit ice wait lucid depth=1; zinit snippet OMZP::dotenv @@ -77,9 +77,11 @@ zinit ice wait lucid depth=1; zinit snippet OMZP::urltools zinit ice wait lucid depth=1; zinit snippet OMZP::vi-mode # Completions -zinit ice wait lucid depth=1; zinit snippet OMZP::podman +zinit ice wait lucid depth=1; zinit snippet OMZP::brew zinit ice wait lucid depth=1; zinit snippet OMZP::dotnet zinit ice wait lucid depth=1; zinit snippet OMZP::fzf +zinit ice wait lucid depth=1; zinit snippet OMZP::podman +zinit ice wait lucid depth=1; zinit snippet OMZP::rust # TIP: execute `zinit update --all` quarterly