Shellcheck compliance.
This commit is contained in:
parent
689a752a94
commit
58ed90e705
@ -1,3 +1,5 @@
|
||||
#shellcheck disable=SC2034
|
||||
|
||||
skip_global_compinit=1
|
||||
export XDG_CACHE_HOME=/tmp/${USER}-cache
|
||||
export XDG_CONFIG_HOME=$HOME/.config
|
||||
|
@ -1,12 +1,14 @@
|
||||
# shellcheck disable=SC1091,SC1094,SC2206,SC2148
|
||||
|
||||
# macOS specific
|
||||
if [[ $(uname -s) = "Darwin" ]]; then
|
||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||
fi
|
||||
|
||||
# prepare directories
|
||||
touch $HOME/.hushlogin
|
||||
mkdir -p $XDG_CACHE_HOME/zsh
|
||||
mkdir -p $XDG_DATA_HOME/zsh
|
||||
touch "${HOME}/.hushlogin"
|
||||
mkdir -p "${XDG_CACHE_HOME}/zsh"
|
||||
mkdir -p "${XDG_DATA_HOME}/zsh"
|
||||
|
||||
# global exports and options
|
||||
setopt HIST_IGNORE_ALL_DUPS
|
||||
@ -14,34 +16,35 @@ setopt HIST_SAVE_NO_DUPS
|
||||
setopt HIST_REDUCE_BLANKS
|
||||
setopt SHARE_HISTORY
|
||||
setopt INC_APPEND_HISTORY
|
||||
rm $ZDOTDIR/.zsh_history && ln -sf $XDG_DATA_HOME/zsh/history $ZDOTDIR/.zsh_history
|
||||
rm "${ZDOTDIR}/.zsh_history" && ln -sf "${XDG_DATA_HOME}/zsh/history" "${ZDOTDIR}/.zsh_history"
|
||||
|
||||
# set path
|
||||
path=(~/.local/bin "${path[@]}")
|
||||
|
||||
# source configuration
|
||||
source $ZDOTDIR/aliases.zsh
|
||||
source $ZDOTDIR/cleanhome.zsh
|
||||
source $ZDOTDIR/keys.zsh
|
||||
source "${ZDOTDIR}/aliases.zsh"
|
||||
source "${ZDOTDIR}/cleanhome.zsh"
|
||||
source "${ZDOTDIR}/keys.zsh"
|
||||
## it has to be last
|
||||
source $ZDOTDIR/fzf.zsh
|
||||
source "${ZDOTDIR}/fzf.zsh"
|
||||
|
||||
# source modules
|
||||
source $HOME/.local/git/zsh_modules/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
|
||||
source $HOME/.local/git/zsh_modules/wd/wd.plugin.zsh
|
||||
export WD_CONFIG=$XDG_CONFIG_HOME/wd_list
|
||||
source "${HOME}/.local/git/zsh_modules/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh"
|
||||
source "${HOME}/.local/git/zsh_modules/wd/wd.plugin.zsh"
|
||||
export WD_CONFIG="${XDG_CONFIG_HOME}/wd_list"
|
||||
|
||||
# set fpath
|
||||
fpath=(~/.local/git/zsh_modules/wd $fpath)
|
||||
|
||||
# theme and colors
|
||||
if [[ $(command -v vivid) ]]; then
|
||||
export LS_COLORS=$(vivid generate molokai)
|
||||
LS_COLORS=$(vivid generate molokai)
|
||||
export LS_COLORS
|
||||
else
|
||||
unset LS_COLORS
|
||||
fi
|
||||
if [ "$TERM_PROGRAM" != "Apple_Terminal" ]; then
|
||||
eval "$(oh-my-posh --config ${XDG_CONFIG_HOME}/omp/omp.toml init zsh)"
|
||||
eval "$(oh-my-posh --config "${XDG_CONFIG_HOME}/omp/omp.toml" init zsh)"
|
||||
fi
|
||||
|
||||
# completion
|
||||
@ -49,23 +52,20 @@ zstyle ':completion:*' menu select
|
||||
zstyle ':completion:*' list-colors ''
|
||||
|
||||
autoload -Uz compinit
|
||||
if [ ! -e $XDG_DATA_HOME/zsh/zcompdump.zwc ]; then
|
||||
if [ ! -e "${XDG_DATA_HOME}/zsh/zcompdump.zwc" ]; then
|
||||
autoload -Uz zrecompile
|
||||
zrecompile -p -R $XDG_DATA_HOME/zsh/zcompdump
|
||||
zrecompile -p -R "${XDG_DATA_HOME}/zsh/zcompdump"
|
||||
fi
|
||||
compinit -C -d $XDG_DATA_HOME/zsh/zcompdump
|
||||
compinit -C -d "${XDG_DATA_HOME}/zsh/zcompdump"
|
||||
|
||||
# quick note functionality
|
||||
if [[ -f ~/.note ]]; then
|
||||
if [[ -f "${HOME}/.note" ]]; then
|
||||
echo
|
||||
cat ~/.note
|
||||
cat "${HOME}/.note"
|
||||
echo
|
||||
fi
|
||||
|
||||
# cleaning
|
||||
rm -rf ~/.warprc
|
||||
|
||||
# local settings
|
||||
if [[ -f $HOME/.local/config/zsh ]]; then
|
||||
source $HOME/.local/config/zsh
|
||||
if [[ -f "${HOME}/.local/config/zsh" ]]; then
|
||||
source "${HOME}/.local/config/zsh"
|
||||
fi
|
||||
|
@ -61,7 +61,7 @@ fi
|
||||
|
||||
function ud() {
|
||||
for i in ${LOCAL_GIT_DIR}/dotfiles ${LOCAL_GIT_DIR}/zsh_modules/*; do git -C ${i} pull; done
|
||||
. ${LOCAL_GIT_DIR}/dotfiles/scripts/post-update.sh
|
||||
. "${LOCAL_GIT_DIR}/dotfiles/scripts/post-update.sh"
|
||||
}
|
||||
|
||||
function upgrade() {
|
||||
|
@ -1,2 +1,2 @@
|
||||
export GNUPGHOME="$XDG_DATA_HOME/gnupg"
|
||||
export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
|
||||
export LESSHISTFILE='/dev/null'
|
||||
|
@ -9,12 +9,12 @@ if [[ $(command -v fzf) ]]; then
|
||||
--border=none --preview=sharp --layout=reverse
|
||||
--prompt="> " --marker=">" --separator="" --scrollbar="│"
|
||||
'
|
||||
export FZF_DEFAULT_OPTS=$FZF_COLORS" --multi -e --ansi --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended\ Bright {}'"
|
||||
export FZF_CTRL_R_OPTS=$FZF_COLORS" -e --ansi --preview=''"
|
||||
export FZF_DEFAULT_OPTS=${FZF_COLORS}" --multi -e --ansi --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended\ Bright {}'"
|
||||
export FZF_CTRL_R_OPTS=${FZF_COLORS}" -e --ansi --preview=''"
|
||||
_fzf_compgen_path() {
|
||||
fd -H -L --ignore-file ~/.local/config/fd . "$1"
|
||||
fd -H -L --ignore-file "${HOME}/.local/config/fd" . "$1"
|
||||
}
|
||||
_fzf_compgen_dir() {
|
||||
fd -H -L --ignore-file ~/.local/config/fd --type d . "$1"
|
||||
fd -H -L --ignore-file "${HOME}/.local/config/fd" --type d . "$1"
|
||||
}
|
||||
fi
|
||||
|
@ -1,9 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
# basic git configuration
|
||||
if [[ ! -d ${XDG_CONFIG_HOME}/git ]]; then
|
||||
mkdir -p ${XDG_CONFIG_HOME}/git
|
||||
cat << EOF > ${XDG_CONFIG_HOME}/git/config
|
||||
if [ ! -d "${XDG_CONFIG_HOME}/git" ]; then
|
||||
mkdir -p "${XDG_CONFIG_HOME}/git"
|
||||
cat << EOF > "${XDG_CONFIG_HOME}/git/config"
|
||||
[pull]
|
||||
rebase = true
|
||||
EOF
|
||||
|
Loading…
Reference in New Issue
Block a user