Merge pull request #258 from joclement/next

next

env.sh

@@ -1,30 +1,25 @@
-# NOTE: only add the directory if it is nowhere in PATH
-__path_append() {
+__path_append_if_dir_exists() {
   if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then
     PATH="$PATH:$1"
   fi
 }
 
-if [ -d "$HOME/bin" ]; then
-  __path_append "$HOME"/bin
-fi
+__path_append_if_dir_exists "$HOME"/bin
 
-if [ -d "$HOME/.local/bin" ]; then
-  __path_append "$HOME"/.local/bin
-fi
+__path_append_if_dir_exists "$HOME"/.local/bin
 
-POETRY_HOME="$HOME/.poetry/bin"
-if [ -d "$POETRY_HOME" ]; then
-  __path_append "$POETRY_HOME"
-fi
+__path_append_if_dir_exists "$HOME"/.poetry/bin
 
-if [ -f "$HOME/.cargo/env" ]; then
+__path_append_if_dir_exists "$HOME"/.fzf/bin
+
+unset -f __path_append_if_dir_exists
+
+CARGO_ENV="$HOME"/.cargo/env
+if [ -f "$CARGO_ENV" ]; then
   # shellcheck source=/dev/null
-  source "$HOME"/.cargo/env
+  source "$CARGO_ENV"
 fi
 
-unset -f __path_append
-
 # ---------------------------------------------------------------------
 
 export VISUAL=vim

gitconfig

@@ -59,6 +59,7 @@
 [pull]
     rebase = true
     prune = true
+    tags = true
 [push]
     default = simple
     followTags = true

renovate.json

@@ -18,11 +18,6 @@
       "matchPackageNames": [
         "/.*/"
       ]
-    },
-    {
-      "matchPackageNames": ["/fzf.vim/"],
-      "description": "The new version requires fzf version 0.57 or higher",
-      "enabled": false
     }
   ]
 }

ruff.toml

@@ -6,14 +6,15 @@ ignore = [
     "ANN204",
     "COM812",
     "CPY001",
-    "E501",
     "D103",
     "D211",
     "D213",
+    "E501",
     "FIX001",
     "PLR2004",
     "PLW2901",
     "PTH123",
+    "RET504",
     "TD001",
     "TD003",
 ]