diff options
Diffstat (limited to 'mac/.config')
| -rw-r--r-- | mac/.config/shell/bm-files | 6 | ||||
| -rw-r--r-- | mac/.config/shell/profile | 29 | ||||
| -rw-r--r-- | mac/.config/vim/init.vim | 2 | ||||
| -rw-r--r-- | mac/.config/vim/vimrc | 3 | ||||
| -rw-r--r-- | mac/.config/zsh/.zshrc | 2 |
5 files changed, 23 insertions, 19 deletions
diff --git a/mac/.config/shell/bm-files b/mac/.config/shell/bm-files index 17aefce..aabc278 100644 --- a/mac/.config/shell/bm-files +++ b/mac/.config/shell/bm-files @@ -25,10 +25,12 @@ vnp ${XDG_CONFIG_HOME:-${HOME}/.config}/ncmpcpp/config vns ${XDG_CONFIG_HOME:-${HOME}/.config}/newsboat/config # Newsboat config (RSS reader) vnu ${XDG_CONFIG_HOME:-${HOME}/.config}/newsboat/urls # Newsboat url (RSS reader) vqt $HOME/.qutebrowser/config.py # Qutebrowser 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 vsh $HOME/.ssh/config # SSH config vsk ${XDG_CONFIG_HOME:-${HOME}/.config}/sketchybar/sketchybarrc # Sketchybar config -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 vsx ${XDG_CONFIG_HOME:-${HOME}/.config}/nsxiv/exec/key-handler # Nsxiv (image viewer) key/script handler vtc ${XDG_CONFIG_HOME:-${HOME}/.config}/task/taskrc # Task config @@ -43,8 +45,6 @@ vvw ${XDG_DATA_HOME:-${HOME}/.local/share}/vimwiki/index.md vyc ${XDG_CONFIG_HOME:-${HOME}/.config}/yazi/yazi.toml # Yazi config vyi ${XDG_CONFIG_HOME:-${HOME}/.config}/yazi/init.lua # Yazi init for plugins vyk ${XDG_CONFIG_HOME:-${HOME}/.config}/yazi/keymap-default.toml # Yazi key 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/mac/.config/shell/profile b/mac/.config/shell/profile index 0b676be..da5b702 100644 --- a/mac/.config/shell/profile +++ b/mac/.config/shell/profile @@ -1,19 +1,9 @@ ################################################### -### --- ENV PATH --- ### +### --- LANG --- ### ################################################### export LANG=ko_KR.UTF-8 export LC_CTYPE=ko_KR.UTF-8 -# 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 ':' -)" -export PATH="$PATH:/opt/homebrew/bin" -export PATH="$PATH:$(find -L /opt/homebrew/Caskroom \( -name bin -o -name MacOS \) -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)" -export PATH="$PATH:$(find -L /opt/homebrew/Cellar -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)" -export PATH="$PATH:$(find -L /opt/homebrew/opt -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)" - -unsetopt PROMPT_SP 2>/dev/null - ################################################### ### --- DEFAULT PROGRAMS --- ### ################################################### @@ -64,7 +54,6 @@ 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" -export PATH="$ASDF_DATA_DIR/shims:$PATH" ### --- BAT --- ### export BAT_CONFIG_PATH="$XDG_CONFIG_HOME/bat/config" @@ -236,5 +225,21 @@ export STARDICT_DATA_DIR="$XDG_DATA_HOME/dic" export STARDICT_HISTFILE="$XDG_DATA_HOME/history/dic" 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" +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" + +unsetopt PROMPT_SP 2>/dev/null + +################################################### ### --- SHORTCUTS --- ### +################################################### [ ! -f "$XDG_CONFIG_HOME/shell/shortcutrc" ] && nohup bmshortcuts >/dev/null 2>&1 & diff --git a/mac/.config/vim/init.vim b/mac/.config/vim/init.vim index fbb9097..9193b48 100644 --- a/mac/.config/vim/init.vim +++ b/mac/.config/vim/init.vim @@ -33,7 +33,7 @@ autocmd BufWritePre *neomutt* %s/^--$/-- /e " dash-dash-space signature delimite autocmd BufWritePre * cal cursor(currPos[1], currPos[2]) " When shortcut files are updated, renew bash and ranger configs with new material: -autocmd BufWritePost bm-files,bm-dirs !shortcuts +autocmd BufWritePost bm-files,bm-dirs !bmshortcuts " Run xrdb whenever Xdefaults or Xresources are updated. autocmd BufRead,BufNewFile Xresources,Xdefaults,xresources,xdefaults set filetype=xdefaults diff --git a/mac/.config/vim/vimrc b/mac/.config/vim/vimrc index 0535aec..0a76953 100644 --- a/mac/.config/vim/vimrc +++ b/mac/.config/vim/vimrc @@ -367,9 +367,6 @@ set title set timeoutlen=300 " Time (in milliseconds) to wait for a mapping set ttimeoutlen=10 " Time (in milliseconds) to wait for terminal key codes -" Esc -set noesckeys - " Set the commands to save in history default number is 20. set history=1000 diff --git a/mac/.config/zsh/.zshrc b/mac/.config/zsh/.zshrc index a90fe52..145ee4a 100644 --- a/mac/.config/zsh/.zshrc +++ b/mac/.config/zsh/.zshrc @@ -124,3 +124,5 @@ export AVANTE_OPENAI_API_KEY="$(pass show api/chatGPT/nvim | head -n1)" ### --- OPENAI --- ### export OPENAI_API_KEY="$(pass show api/chatGPT/nvim | head -n1)" + +. "$(brew --prefix asdf)/libexec/asdf.sh" |