diff --git a/.config/git/config b/.config/git/config index eb1f9bf51..6b7b1967c 100644 --- a/.config/git/config +++ b/.config/git/config @@ -45,7 +45,7 @@ file-removed-label = [-] file-renamed-label = [->] hunk-header-style = omit - line-numbers-left-format = "{nm:>3}" + line-numbers-left-format = "{nm:>3} " line-numbers-left-style = "#b2555b" line-numbers-right-format = "{np:>3} " line-numbers-right-style = "#41a6b5" diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua index ae8f5528b..e87cddef2 100644 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -10,7 +10,4 @@ o.tabstop = 4 o.scrolloff = 8 o.conceallevel = 0 -g.loaded_node_provider = 0 -g.loaded_perl_provider = 0 -g.loaded_python3_provider = 0 -g.loaded_ruby_provider = 0 +g.lazyvim_php_lsp = "intelephense" diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 61e9d0485..90f9dd19e 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -84,49 +84,58 @@ set -a source $XDG_CONFIG_HOME/user-dirs.dirs set +a -export SVDIR="$HOME/.local/sv" -export WORKON_HOME="$XDG_DATA_HOME/virtualenv" -export ZSH_COMPDUMP="$XDG_CACHE_HOME/zcompdump" -export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config" -export GTK2_RC_FILES="$XDG_CONFIG_HOME/.config}/gtk-2.0/gtkrc-2.0" -export LESSHISTFILE="-" -export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" -export INPUTRC="$XDG_CONFIG_HOME/shell/inputrc" -export GNUPGHOME="$XDG_CONFIG_HOME/gnupg" -export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default" -export TMUX_TMPDIR="$XDG_RUNTIME_DIR" export ANDROID_HOME="$XDG_DATA_HOME/android" -export CARGO_HOME="$XDG_DATA_HOME/cargo" -export GOPATH="$XDG_DATA_HOME/go" -export ANSIBLE_HOME="$XDG_DATA_HOME/ansible" -export ANSIBLE_LOCAL_TMP="$XDG_CACHE_HOME/ansible/tmp" export ANSIBLE_GALAXY_CACHE_DIR="$XDG_CACHE_HOME/ansible/galaxy" export ANSIBLE_GALAXY_TOKEN_PATH="$XDG_DATA_HOME/ansible/galaxy_token" +export ANSIBLE_HOME="$XDG_DATA_HOME/ansible" +export ANSIBLE_LOCAL_TMP="$XDG_CACHE_HOME/ansible/tmp" export ANSIBLE_PERSISTENT_CONTROL_PATH_DIR="$XDG_RUNTIME_DIR/ansible_pc.sock" -export UNISON="$XDG_DATA_HOME/unison" -export HISTFILE="$XDG_DATA_HOME/history" -export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle" -export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # WARN: This line can break some display managers -export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" -export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history" +export CARGO_HOME="$XDG_DATA_HOME/cargo" export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv" -export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java" -export MOZBUILD_STATE_PATH="$XDG_DATA_HOME/mozbuild" -export W3M_DIR="$XDG_DATA_HOME/w3m" -export RUSTUP_HOME="$XDG_DATA_HOME/rustup" -export PYTHONSTARTUP="/etc/python/pythonrc" export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker" +export GNUPGHOME="$XDG_CONFIG_HOME/gnupg" +export GOPATH="$XDG_DATA_HOME/go" +export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle" +export PERL_CPANM_HOME="$XDG_CACHE_HOME/cpanm" +export PNPM_HOME="$XDG_DATA_HOME/pnpm" +export GTK2_RC_FILES="$XDG_CONFIG_HOME/.config}/gtk-2.0/gtkrc-2.0" +export HISTFILE="$XDG_DATA_HOME/history" +export INPUTRC="$XDG_CONFIG_HOME/shell/inputrc" +export LESSHISTFILE="-" +export MOZBUILD_STATE_PATH="$XDG_DATA_HOME/mozbuild" +export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history" +export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config" +export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" +export PYTHONSTARTUP="/etc/python/pythonrc" +export RUSTUP_HOME="$XDG_DATA_HOME/rustup" +export SVDIR="$HOME/.local/sv" +export TMUX_TMPDIR="$XDG_RUNTIME_DIR" +export UNISON="$XDG_DATA_HOME/unison" +export W3M_DIR="$XDG_DATA_HOME/w3m" +export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" +export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default" +export WORKON_HOME="$XDG_DATA_HOME/virtualenv" +export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # WARN: This line can break some display managers export XBPS_DISTDIR="$XDG_DOCUMENTS_DIR/dev/server/void-packages" export ZK_NOTEBOOK_DIR="$XDG_DOCUMENTS_DIR/notes" +export ZSH_COMPDUMP="$XDG_CACHE_HOME/zcompdump" +export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java" -localpath="$(find -L ~/.local/bin -type d -printf %p: | sed 's/.$//')" +localpath="" export PATH="$PATH:$localpath" -export PNPM_HOME="/home/luca/.local/share/pnpm" -case ":$PATH:" in - *":$PNPM_HOME:"*) ;; - *) export PATH="$PNPM_HOME:$PATH" ;; -esac +for NEW_PATH in \ + "${XDG_DATA_HOME}/pnpm" \ + "${XDG_DATA_HOME}/cargo/bin" + "$(gem environment gempath)" \ + "$(find -L ~/.local/bin -type d -printf %p: | sed 's/.$//')" \ +do + case ":$PATH:" in + *":$NEW_PATH:"*) ;; + *) export PATH="$NEW_PATH:$PATH" ;; + esac +done + unset SSH_AGENT_PID if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then