From b836c9af21a8c4e4ff9dba7da0cb1ee4d33fadaf Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Sat, 18 May 2024 09:07:19 +0700 Subject: [PATCH] fix: macOS not so POSIX behaviour --- .config/nvim/lazy-lock.json | 2 +- .config/zsh/.zshenv | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 52e2b70..640b572 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -5,7 +5,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, + "lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index 197caee..9792001 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -41,7 +41,7 @@ fi export BUN_INSTALL="$HOME/.bun" if [[ "$OSTYPE" == "darwin"* ]]; then export PYTHONPATH="$HOME/Library/Python/3.10/lib:$PYTHONPATH" - LOCAL_PATH=$(du "$ZI_BINARY_HOME" -d 1 | cut -f2 > /tmp/ENV_PATH && paste -sd ':' /tmp/ENV_PATH) + LOCAL_PATH=$(du -d1 "$ZI_BINARY_HOME" | cut -f2 > /tmp/ENV_PATH && paste -sd ':' /tmp/ENV_PATH) LOCAL_PATH="$HOME/.rd/bin:$HOME/Library/Python/3.10/bin:$LOCAL_PATH" elif [[ "$OSTYPE" == "linux-gnu" ]]; then LOCAL_PATH=$(du "$ZI_BINARY_HOME" -d 1 | cut -f2 | paste -sd ':') @@ -128,9 +128,11 @@ export CARGO_HOME="$XDG_DATA_HOME/cargo" export GOPATH="$XDG_DATA_HOME/go" export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" # export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pyrc" -export GNUPGHOME="$XDG_DATA_HOME/gnupg" -unset SSH_AGENT_PID -export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh" +if [[ "$OSTYPE" == "linux-gnu" ]]; then + export GNUPGHOME="$XDG_DATA_HOME/gnupg" + unset SSH_AGENT_PID + export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh" +fi export PYENV_ROOT="$XDG_DATA_HOME/pyenv" export WAKATIME_HOME="$XDG_CONFIG_HOME/wakatime" export RUSTUP_HOME="$XDG_DATA_HOME/rustup" @@ -140,7 +142,9 @@ export PKG_CACHE_PATH="$XDG_DATA_HOME/pkg-cache" # Fixes [ -d $XDG_CONFIG_HOME ] || mkdir -p $XDG_CONFIG_HOME [ -f $WGETRC ] || touch $WGETRC # wget will fail to run without this file -[ -d $GNUPGHOME ] || mkdir -p $GNUPGHOME +if [[ "$OSTYPE" == "linux-gnu" ]]; then + [ -d $GNUPGHOME ] || mkdir -p $GNUPGHOME +fi [ -d $WAKATIME_HOME ] || mkdir -p $WAKATIME_HOME [ -d $WINEPREFIX ] || mkdir -p $WINEPREFIX # << [XDG]