diff --git a/chezmoi/dot_zshrc.d/executable_direnv.zsh b/chezmoi/dot_zshrc.d/executable_direnv.zsh deleted file mode 100644 index 31fdee6..0000000 --- a/chezmoi/dot_zshrc.d/executable_direnv.zsh +++ /dev/null @@ -1,3 +0,0 @@ -if command -v direnv &> /dev/null; then - eval "$(direnv hook zsh)" -fi diff --git a/chezmoi/dot_zshrc.d/executable_weather.zsh b/chezmoi/dot_zshrc.d/executable_weather.zsh index fc2c4de..185b832 100644 --- a/chezmoi/dot_zshrc.d/executable_weather.zsh +++ b/chezmoi/dot_zshrc.d/executable_weather.zsh @@ -35,7 +35,7 @@ function weather_short_status() { WEATHER_LOCATION_KEY="$(< "${HOME_LOCATION_KEY_PATH}")" - _weather_current_conditions | jq -er "$(<<'EOF' + _weather_current_conditions | jq -r "$(<<'EOF' first | [ "RF:"+(.RealFeelTemperature.Imperial.Value | tostring)+"°", @@ -49,7 +49,7 @@ first | join(" ") | rtrimstr(" ") EOF - )" 2>/dev/null + )" ) } @@ -151,22 +151,15 @@ function _weather_current_conditions() { TEMP_OUTPUT="$(mktemp)" trap 'rm -f "${TEMP_OUTPUT}"' EXIT - ( - set +e - curl -LSsf \ - --max-time "${WEATHER_CURL_TIMEOUT}" \ - --get \ - -X GET \ - --data-urlencode "apikey=${WEATHER_API_KEY}" \ - --data-urlencode "language=en-us" \ - --data-urlencode "details=true" \ - "https://dataservice.accuweather.com/currentconditions/v1/${WEATHER_LOCATION_KEY}" \ - -o "${TEMP_OUTPUT}" - if [ $? -eq 28 ]; then - # timeout reached, just store empty data - echo '{}' > "${TEMP_OUTPUT}" - fi - ) + curl -LSsf \ + --max-time "${WEATHER_CURL_TIMEOUT}" \ + --get \ + -X GET \ + --data-urlencode "apikey=${WEATHER_API_KEY}" \ + --data-urlencode "language=en-us" \ + --data-urlencode "details=true" \ + "https://dataservice.accuweather.com/currentconditions/v1/${WEATHER_LOCATION_KEY}" \ + -o "${TEMP_OUTPUT}" mv -f "${TEMP_OUTPUT}" "${CURRENT_WEATHER_CACHE_FILE}" > /dev/stdout < "${CURRENT_WEATHER_CACHE_FILE}"