From ab40c99ed16250c2a681e1295c9836ea362906a9 Mon Sep 17 00:00:00 2001 From: Matt Strapp Date: Thu, 5 Sep 2024 14:08:50 -0500 Subject: add more XDG Signed-off-by: Matt Strapp --- dot_config/zsh/dot_zshenv | 89 ++++++++++++++++++++++--------------------- dot_local/share/powerlevel10k | 2 +- 2 files changed, 46 insertions(+), 45 deletions(-) diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv index ce64049..dfa3718 100644 --- a/dot_config/zsh/dot_zshenv +++ b/dot_config/zsh/dot_zshenv @@ -12,7 +12,7 @@ unsetopt PROMPT_SP export EDITOR="nvim +star" export BROWSER="chromium" -# ~/ Clean-up: +# ~/ Clean-up (XDG): [ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME="$HOME/.config" [ -z "$XDG_DATA_HOME" ] && export XDG_DATA_HOME="$HOME/.local/share" [ -z "$XDG_CACHE_HOME" ] && export XDG_CACHE_HOME="$HOME/.cache" @@ -21,57 +21,58 @@ export BROWSER="chromium" [ -z "$XDG_RUNTIME_DIR" ] && export XDG_RUNTIME_DIR="/run/user/$UID" export DO_NOT_TRACK=1 -export USERXSESSION="$XDG_CACHE_HOME/X11/xsession" -export USERXSESSIONRC="$XDG_CACHE_HOME/X11/xsessionrc" -export ALTUSERXSESSION="$XDG_CACHE_HOME/X11/Xsession" -export ERRFILE="$XDG_CACHE_HOME/X11/xsession-errors" +export USERXSESSION="$XDG_CACHE_HOME"/X11/xsession +export USERXSESSIONRC="$XDG_CACHE_HOME"/X11/xsessionrc +export ALTUSERXSESSION="$XDG_CACHE_HOME"/X11/Xsession +export ERRFILE="$XDG_CACHE_HOME"/X11/xsession-errors export GPG_TTY=$TTY -export XINITRC="${XDG_CONFIG_HOME:-$HOME/.config}/x11/xinitrc" +export XINITRC="$XDG_CONFIG_HOME"/x11/xinitrc # this breaks X forwarding over SSH #export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs. -export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config" -export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0" +export NOTMUCH_CONFIG="$XDG_CONFIG_HOME"/notmuch-config +export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc-2.0 export LESSHISTFILE="-" -export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc" -export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/shell/inputrc" -export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh" -export NUGET_PACKAGES="$XDG_CACHE_HOME/NuGetPackages" -export DOTNET_CLI_HOME="$XDG_DATA_HOME/dotnet" -export AWS_SHARED_CREDENTIALS_FILE="$XDG_CONFIG_HOME/aws/credentials" -export AWS_CONFIG_FILE="$XDG_CONFIG_HOME/aws/config" -export ALSA_CONFIG_PATH="$XDG_CONFIG_HOME/alsa/asoundrc" -export AZURE_CONFIG_DIR="$XDG_DATA_HOME/azure" -export MIX_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/mix" -export GNUPGHOME="${XDG_DATA_HOME:-$HOME/.local/share}/gnupg" -export WINEPREFIX="${XDG_DATA_HOME:-$HOME/.local/share}/wineprefixes/default" -export KODI_DATA="${XDG_DATA_HOME:-$HOME/.local/share}/kodi" -export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store" +export WGETRC="$XDG_CONFIG_HOME"/wget/wgetrc +export INPUTRC="$XDG_CONFIG_HOME"/shell/inputrc +export ZDOTDIR="$XDG_CONFIG_HOME"/zsh +export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages +export DOTNET_CLI_HOME="$XDG_DATA_HOME"/dotnet +export ALSA_CONFIG_PATH="$XDG_CONFIG_HOME"/alsa/asoundrc +export MIX_HOME="$XDG_DATA_HOME"/mix +export GNUPGHOME="$XDG_DATA_HOME"/gnupg +export WINEPREFIX="$XDG_DATA_HOME"/wineprefixes/default +export KODI_DATA="$XDG_DATA_HOME"/kodi +export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/password-store export TMUX_TMPDIR="$XDG_RUNTIME_DIR" -export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android" +export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android export ANDROID_USER_HOME="$XDG_DATA_HOME"/android -export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo" -export GOBIN="${XDG_BIN_HOME:-$HOME/.local/bin}" -export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go" +export CARGO_HOME="$XDG_DATA_HOME"/cargo +export GOBIN="$XDG_BIN_HOME" +export GOPATH="$XDG_DATA_HOME"/go export GOMODCACHE="$XDG_CACHE_HOME"/go/mod -export VOLTA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/volta" -export PNPM_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/pnpm" -export DENO_INSTALL_ROOT="${XDG_BIN_HOME:-$HOME/.local/bin}" -export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg" -export UNISON="${XDG_DATA_HOME:-$HOME/.local/share}/unison" -export HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/history" -export WEECHAT_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/weechat" -export MBSYNCRC="${XDG_CONFIG_HOME:-$HOME/.config}/mbsync/config" -export ELECTRUMDIR="${XDG_DATA_HOME:-$HOME/.local/share}/electrum" -export OCTAVE_SITE_INITFILE="$XDG_CONFIG_HOME/octave/octaverc" -export OCTAVE_HISTFILE="$XDG_CACHE_HOME/octave/octave_hist" -export ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority" +export VOLTA_HOME="$XDG_DATA_HOME"/volta +export PNPM_HOME="$XDG_DATA_HOME"/pnpm +#export DENO_INSTALL_ROOT="${XDG_BIN_HOME:-$HOME/.local/bin} +export ANSIBLE_CONFIG="$XDG_CONFIG_HOME"/ansible/ansible.cfg +export UNISON="$XDG_DATA_HOME"/unison +export HISTFILE="$XDG_DATA_HOME"/history +export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat +export MBSYNCRC="$XDG_CONFIG_HOME"/mbsync/config +export ELECTRUMDIR="$XDG_DATA_HOME"/electrum +export OCTAVE_SITE_INITFILE="$XDG_CONFIG_HOME"/octave/octaverc +export OCTAVE_HISTFILE="$XDG_CACHE_HOME"/octave/octave_hist +export ICEAUTHORITY="$XDG_CACHE_HOME"/ICEauthority export HISTORY_IGNORE="(ls|cd|pwd|exit|sudo reboot|history|cd -|cd ..|clear|fg)" export GDBHISTFILE="$XDG_DATA_HOME"/gdb/history -export SONARLINT_USER_HOME="$XDG_DATA_HOME/sonarlint" +export SONARLINT_USER_HOME="$XDG_DATA_HOME"/sonarlint export OMNISHARPHOME="$XDG_CONFIG_HOME"/omnisharp export MIX_XDG=true export TERMINFO="$XDG_DATA_HOME"/terminfo -export TEXMFVAR="$XDG_CACHE_HOME"/texlive/texmf-var +export TEXMFVAR="$XDG_CACHE_HOME"/texlive/texmf-var +export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker +export AWS_SHARED_CREDENTIALS_FILE="$XDG_CONFIG_HOME"/aws/credentials +export AWS_CONFIG_FILE="$XDG_CONFIG_HOME"/aws/config +export AZURE_CONFIG_DIR="$XDG_DATA_HOME"/azure # Other program settings: export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -87,10 +88,10 @@ export LESS_TERMCAP_se="$(printf '%b' '')" export LESS_TERMCAP_us="$(printf '%b' '')" export LESS_TERMCAP_ue="$(printf '%b' '')" export LESSOPEN="| /usr/bin/highlight -O ansi %s 2>/dev/null" -export QT_QPA_PLATFORMTHEME="qt5ct" # Have QT use gtk2 theme. -export MOZ_USE_XINPUT2="1" # Mozilla smooth scrolling/touchpads. -export AWT_TOOLKIT="MToolkit wmname LG3D" #May have to install wmname -export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm +export QT_QPA_PLATFORMTHEME="qt5ct" # Have QT use gtk2 theme. +export MOZ_USE_XINPUT2="1" # Mozilla smooth scrolling/touchpads. +export AWT_TOOLKIT="MToolkit wmname LG3D" #May have to install wmname +export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java # This is the list for lf icons: diff --git a/dot_local/share/powerlevel10k b/dot_local/share/powerlevel10k index a42e374..d71edb8 160000 --- a/dot_local/share/powerlevel10k +++ b/dot_local/share/powerlevel10k @@ -1 +1 @@ -Subproject commit a42e374e25226d2032a38b38fc544ec1d65b0d01 +Subproject commit d71edb83f9c7f045a0d528eeff3445ec3d518d71 -- cgit v1.2.3