diff options
Diffstat (limited to 'ar/.config/shell')
| -rw-r--r-- | ar/.config/shell/bm-files | 6 | ||||
| -rw-r--r-- | ar/.config/shell/profile | 41 |
2 files changed, 36 insertions, 11 deletions
diff --git a/ar/.config/shell/bm-files b/ar/.config/shell/bm-files index 200cedd..fc8bce1 100644 --- a/ar/.config/shell/bm-files +++ b/ar/.config/shell/bm-files @@ -26,10 +26,12 @@ vns ${XDG_CONFIG_HOME:-${HOME}/.config}/newsboat/config vnu ${XDG_CONFIG_HOME:-${HOME}/.config}/newsboat/urls # Newsboat url (RSS reader) vqt ${XDG_CONFIG_HOME:-${HOME}/.config}/qutebrowser/config.py # Qutebrowser config Vsm /etc/samba/smb.conf # Samba config +vsa ${XDG_CONFIG_HOME:-${HOME}/.config}/shell/aliasrc # Aliases used by shell (and potentially other shells) vse ${XDG_CONFIG_HOME:-${HOME}/.config}/sesh/sesh.toml # Sesh config vsf ${XDG_SOURCES_HOME:-${HOME}/.local/src}/suckless/surf/config.def.h # Surf: a simple browser vsl ${XDG_SOURCES_HOME:-${HOME}/.local/src}/suckless/slock/config.def.h # Slock: lock screen -vsp ${XDG_DATA_HOME:-${HOME}/.local/share}/thesiah/snippets # Snippets +vsn ${XDG_DATA_HOME:-${HOME}/.local/share}/thesiah/snippets # Snippets +vsp ${XDG_CONFIG_HOME:-${HOME}/.config}/shell/profile # Shell profile used for system vss ${XDG_CONFIG_HOME:-${HOME}/.config}/starship/starship.toml # Starship vst ${XDG_SOURCES_HOME:-${HOME}/.local/src}/suckless/st/config.def.h # St: a simple terminal vsx ${XDG_CONFIG_HOME:-${HOME}/.config}/nsxiv/exec/key-handler # Nsxiv (image viewer) key/script handler @@ -47,8 +49,6 @@ vxp ${XDG_CONFIG_HOME:-${HOME}/.config}/x11/xprofile vxr ${XDG_CONFIG_HOME:-${HOME}/.config}/x11/xresources # Colors, themes and variables for X11 vyk ${XDG_CONFIG_HOME:-${HOME}/.config}/yazi/keymap-default.toml # Yazi keymap vyz ${XDG_CONFIG_HOME:-${HOME}/.config}/yazi/yazi.toml # Yazi config -vza ${XDG_CONFIG_HOME:-${HOME}/.config}/shell/aliasrc # Aliases used by zsh (and potentially other shells) vzc ${ZDOTDIR:-${XDG_CONFIG_HOME:-${HOME}/.config}/zsh}/.zshrc # Zsh config vzk ${ZDOTDIR:-${XDG_CONFIG_HOME:-${HOME}/.config}/zsh}/keymaps.zsh # Zsh keymaps -vzp ${XDG_CONFIG_HOME:-${HOME}/.config}/shell/profile # Zsh profile used for system vzs ${ZDOTDIR:-${XDG_CONFIG_HOME:-${HOME}/.config}/zsh}/scripts.zsh # Zsh scripts diff --git a/ar/.config/shell/profile b/ar/.config/shell/profile index b8849af..f68a4b8 100644 --- a/ar/.config/shell/profile +++ b/ar/.config/shell/profile @@ -7,10 +7,10 @@ ### --- ENV PATH --- ### ################################################### # Add all directories in each subdirectory to $PATH -export PATH="$PATH:$(find ~/.local/bin -path '*/.git*' -prune -o \( -type f -o -type l \) -perm -u=x -exec dirname {} \; | sort -u | paste -sd ':' -)" -export PATH="$PATH:$(find ~/.local/share/.password-store -type d -name '.extensions' | paste -sd ':' -)" -command -v asdf >/dev/null 2>&1 && export PATH="$PATH:$(find -L ~/.local/share/asdf/installs -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)" -command -v npm >/dev/null 2>&1 && export PATH="$PATH:$(find -L ~/.local/share/npm -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)" +[ -d ~/.local/bin ] && export PATH="$(find ~/.local/bin -path '*/.git*' -prune -o \( -type f -o -type l \) -perm -u=x -exec dirname {} \; | sort -u | paste -sd ':' -):$PATH" +[ -d ~/.local/share/.password-store ] && export PATH="$(find ~/.local/share/.password-store -type d -name '.extensions' | paste -sd ':' -):$PATH" +command -v asdf >/dev/null 2>&1 && export PATH="$(find -L ~/.local/share/asdf/installs -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH" +command -v npm >/dev/null 2>&1 && export PATH="$(find -L ~/.local/share/npm -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH" unsetopt PROMPT_SP 2>/dev/null @@ -20,8 +20,11 @@ unsetopt PROMPT_SP 2>/dev/null export BROWSER=$(command -v librewolf || command -v firefox || command -v qutebrowser) export EDITOR="nvim" export EDITOR2="vim" -# export FILE_MANAGER="lf $(lf -version)" -export FILE_MANAGER="yazi $(yazi --version)" +if command -v lf >/dev/null 2>&1; then + export FILE_MANAGER="lf $(lf -version)" +elif command -v yazi >/dev/null 2>&1; then + export FILE_MANAGER="yazi $(yazi --version)" +fi export KEYTIMEOUT=10 export SUDO_EDITOR=$EDITOR export SUDO_ASKPASS="$HOME/.local/bin/dmenupass" @@ -61,6 +64,10 @@ export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android" ### --- ANSIBLE --- ### export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible/ansible.cfg" +### --- ASDF --- ### +export ASDF_CONFIG_FILE="$XDG_CONFIG_HOME/asdf/asdfrc" +export ASDF_DATA_DIR="$XDG_DATA_HOME/asdf" + ### --- BAT --- ### export BAT_CONFIG_PATH="$XDG_CONFIG_HOME/bat/config" @@ -147,6 +154,12 @@ export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config" ### --- MOZILLA --- ### export MOZ_USE_XINPUT2=1 # Mozilla smooth scrolling/touchpads. +### --- MYSQL --- ### +export MYSQL_HISTFILE="$XDG_DATA_HOME/history/mysql_history" + +### --- NODE.JS --- ### +export NODE_REPL_HISTORY="$XDG_DATA_HOME/history/node_repl_history" + ### --- NOTMUCH --- ### export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch/config" @@ -169,12 +182,24 @@ export PASSWORD_STORE_ENABLE_EXTENSIONS="true" # export PASSWORD_STORE_EXTENSIONS_DIR="$PASSWORD_STORE_DIR/.extensions" # export BASH_COMPLETION_USER_DIR=$XDG_DATA_HOME/bash-completion/completions +### --- PHP --- ### +export PHP_HISTFILE="$XDG_STATE_HOME/history/php_history" + +### --- POSTGRESQL --- ### +export PSQLRC="$XDG_CONFIG_HOME/pg/psqlrc" +export PSQL_HISTORY="$XDG_STATE_HOME/history/psql_history" +export PGPASSFILE="$XDG_CONFIG_HOME/pg/pgpass" +export PGSERVICEFILE="$XDG_CONFIG_HOME/pg/pg_service.conf" + ### --- POWERLEVEL10K --- ### export POWERLEVEL9K_INSTALLATION_DIR="/usr/share/zsh-theme-powerlevel10k" ### --- PYTHON --- ### -export PYTHONPYCACHEPREFIX=$XDG_CACHE_HOME/python +export PYTHON_HISTORY="$XDG_DATA_HOME/history/python_history" +export PYTHONPYCACHEPREFIX="$XDG_CACHE_HOME/python" export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc" +export PIPX_BIN_DIR="$XDG_SCRIPTS_HOME" +export PIPX_MAN_DIR="$XDG_DATA_HOME/man" ### --- QT --- ### export QT_QPA_PLATFORMTHEME="gtk2" # Have QT use gtk2 theme. @@ -244,7 +269,7 @@ export SDCV_PAGER='less --quit-if-one-screen -RX' [ ! -f "$XDG_CONFIG_HOME/shell/shortcutrc" ] && setsid -f shortcuts >/dev/null 2>&1 ### --- START GRAPHICAL SERVER ON USER'S CURRENT TTY IF NOT ALREADY RUNNING --- ### -[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC" +tty -s && [ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC" ### --- LAPTOP KEYMAP --- ### sudo -n loadkeys "$XDG_DATA_HOME/thesiah/ttymaps.kmap" 2>/dev/null |