diff options
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/.config/shell/profile | 28 | ||||
| -rw-r--r-- | mac/.config/vim/vimrc | 4 | ||||
| -rwxr-xr-x | mac/.local/bin/fzffiles | 2 |
3 files changed, 25 insertions, 9 deletions
diff --git a/mac/.config/shell/profile b/mac/.config/shell/profile index da5b702..3e1ca79 100644 --- a/mac/.config/shell/profile +++ b/mac/.config/shell/profile @@ -137,6 +137,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" @@ -161,11 +167,21 @@ 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" @@ -229,13 +245,13 @@ export SDCV_PAGER='less --quit-if-one-screen -RX' ### --- ENV PATH --- ### ################################################### # Add all directories in each subdirectory to $PATH -export PATH="$(find ~/.local/bin -path '*/.git*' -prune -o \( -type f -o -type l \) -perm -u=x -exec dirname {} \; | sort -u | paste -sd ':' -):$PATH" -export PATH="$(find ~/.local/share/.password-store -type d -name '.extensions' | paste -sd ':' -):$PATH" +[ -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" export PATH="$ASDF_DATA_DIR/shims:$PATH" export PATH="/opt/homebrew/bin:$PATH" -export PATH="$(find -L /opt/homebrew/Caskroom \( -name bin -o -name MacOS \) -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH" -export PATH="$(find -L /opt/homebrew/Cellar -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH" -export PATH="$(find -L /opt/homebrew/opt -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH" +[ -d /opt/homebrew/Caskroom ] && export PATH="$(find -L /opt/homebrew/Caskroom \( -name bin -o -name MacOS \) -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH" +[ -d /opt/homebrew/Cellar ] && export PATH="$(find -L /opt/homebrew/Cellar -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH" +[ -d /opt/homebrew/opt ] && export PATH="$(find -L /opt/homebrew/opt -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH" unsetopt PROMPT_SP 2>/dev/null diff --git a/mac/.config/vim/vimrc b/mac/.config/vim/vimrc index 0a76953..a782a14 100644 --- a/mac/.config/vim/vimrc +++ b/mac/.config/vim/vimrc @@ -335,8 +335,8 @@ set nocursorcolumn set shiftwidth=4 set tabstop=4 -" If the current file type is HTML, set indentation to 2 spaces. -autocmd Filetype html setlocal tabstop=2 shiftwidth=2 expandtab +" If the current file type is HTML, CSS, JS, JSX, TS, TSX set indentation to 2 spaces. +autocmd Filetype html,css,js,jsx,ts,tsx setlocal tabstop=2 shiftwidth=2 expandtab " Do not save backup files. set nobackup diff --git a/mac/.local/bin/fzffiles b/mac/.local/bin/fzffiles index 44634a2..97047e9 100755 --- a/mac/.local/bin/fzffiles +++ b/mac/.local/bin/fzffiles @@ -53,7 +53,7 @@ files=$(fzf-tmux \ --bind "ctrl-g:change-prompt( )+reload(fd -H -L -t f -E .Trash -E .git -E .cache . $HOME/Private/repos $HOME/Public/repos)" \ --bind "ctrl-h:change-prompt( 🏠 )+reload(fd -H -L -t f -E .Trash -E .git -E .cache . $HOME)" \ --bind "ctrl-k:change-prompt( 🖥️ )+reload(fd -H -L -t f -E .Trash -E .git -E .cache . ${XDG_DESKTOP_DIR:-${HOME}/Desktop})" \ - --bind "ctrl-r:change-prompt( 👟 )+reload(fd -H -L -t f -E .Trash -E .git -E .cache -E zsh . ${XDG_BIN_HOME:-${HOME}/.local/bin})" \ + --bind "ctrl-r:change-prompt( 👟 )+reload(fd -H -L -t f -E .Trash -E .git -E .cache -E zsh . ${XDG_SCRIPTS_HOME:-${HOME}/.local/bin})" \ --bind "ctrl-s:change-prompt( 🛠 )+reload(find ${XDG_SOURCES_HOME:-${HOME}/.local/src}/suckless -maxdepth 2 -type f -not -path '*/.git/*')" \ --bind "ctrl-u:change-prompt( 📝 )+reload(if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then top=\$(git rev-parse --show-toplevel 2>/dev/null); git -C \"\$top\" status --porcelain | awk -v root=\"\$top\" '{ staged=substr(\$0,1,1); |