diff --git a/_cli/zsh/.zshenv b/_cli/zsh/.zshenv index de317b5..d7db53c 100644 --- a/_cli/zsh/.zshenv +++ b/_cli/zsh/.zshenv @@ -1,5 +1,5 @@ skip_global_compinit=1 -export XDG_CACHE_HOME=$HOME/.cache +export XDG_CACHE_HOME=/tmp/${USER}-cache export XDG_CONFIG_HOME=$HOME/.config export XDG_DATA_HOME=$HOME/.local/share export XDG_STATE_HOME=$HOME/.local/state @@ -9,4 +9,3 @@ export HISTFILE=$XDG_DATA_HOME/zsh/history # if test -z "$XDG_RUNTIME_DIR"; then # export XDG_RUNTIME_DIR=$(mktemp -d /tmp/$(id -u)-runtime-dir.XXX) # fi - diff --git a/_gui/install.sh b/_gui/install.sh index 9f6728d..16d6052 100644 --- a/_gui/install.sh +++ b/_gui/install.sh @@ -1,15 +1,19 @@ #!/bin/sh +# variables +LOCAL_BIN_DIR=${HOME}/.local/bin +XDG_CONFIG_HOME=${HOME}/.config + # prepare local dirs -mkdir -p ~/.config ~/.local/bin +mkdir -p ${XDG_CONFIG_HOME} ${LOCAL_BIN_DIR} # install configs for i in _configs/*; do - rm -rf ~/.config/$(basename $i) - ln -sf $(pwd)/${i} ~/.config + rm -rf ${XDG_CONFIG_HOME}/$(basename $i) + ln -sf $(pwd)/${i} ${XDG_CONFIG_HOME} done # install scripts for i in _scripts/*; do - ln -sf $(pwd)/${i} ~/.local/bin + ln -sf $(pwd)/${i} ${LOCAL_BIN_DIR} done diff --git a/install.sh b/install.sh index 92a6cf9..0639c88 100644 --- a/install.sh +++ b/install.sh @@ -1,33 +1,33 @@ #!/bin/sh # variables -GIT_DIR=~/.local/git -export XDG_CACHE_HOME=/tmp/${USER}-cache -export XDG_CONFIG_HOME=$HOME/.config -export XDG_DATA_HOME=$HOME/.local/share -export XDG_STATE_HOME=$HOME/.local/state +LOCAL_BIN_DIR=${HOME}/.local/bin +LOCAL_GIT_DIR=${HOME}/.local/git +XDG_CACHE_HOME=/tmp/${USER}-cache +XDG_CONFIG_HOME=${HOME}/.config +XDG_DATA_HOME=${HOME}/.local/share +XDG_STATE_HOME=${HOME}/.local/state # clean + prepare local dirs -rm -rf ~/.cache ~/.config/_cache $XDG_CACHE_HOME -rm -rf ~/.config/nvim ~/.local/share/nvim ~/.local/state/nvim -rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* -mkdir -p ~/.local/bin $XDG_CACHE_HOME $XDG_CONFIG_HOME $XDG_DATA_HOME -chmod 700 $XDG_CACHE_HOME +rm -rf ~/.cache ~/.config/_cache ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* +rm -rf ${XDG_CACHE_HOME} ${XDG_DATA_HOME}/nvim ${XDG_STATE_HOME}/nvim +mkdir -p ${LOCAL_BIN_DIR} ${XDG_CACHE_HOME} ${XDG_CONFIG_HOME} ${XDG_DATA_HOME} +chmod 700 ${XDG_CACHE_HOME} # prepare repository -mkdir -p $GIT_DIR -rm -rf $GIT_DIR/dotfiles -git clone https://git.insomniac.pl/ftpd/dotfiles $GIT_DIR/dotfiles +mkdir -p ${LOCAL_GIT_DIR} +rm -rf ${LOCAL_GIT_DIR}/dotfiles +git clone https://git.insomniac.pl/ftpd/dotfiles $LOCAL_GIT_DIR/dotfiles # zsh modules -mkdir -p $GIT_DIR/zsh_modules -rm -rf $GIT_DIR/zsh_modules/* +mkdir -p ${LOCAL_GIT_DIR}/zsh_modules +rm -rf ${LOCAL_GIT_DIR}/zsh_modules/* for module in mfaerevaag/wd romkatv/powerlevel10k zdharma-continuum/fast-syntax-highlighting; do - git clone https://github.com/${module} $GIT_DIR/zsh_modules/${module#*/} + git clone https://github.com/${module} $LOCAL_GIT_DIR/zsh_modules/${module#*/} done # configs -for i in $GIT_DIR/dotfiles/_cli/*; do - rm -rf $XDG_CONFIG_HOME/$(basename $i) - ln -sf $GIT_DIR/dotfiles/_cli/$(basename $i) $XDG_CONFIG_HOME/ +for i in ${LOCAL_GIT_DIR}/dotfiles/_cli/*; do + rm -rf ${XDG_CONFIG_HOME}/$(basename $i) + ln -sf ${LOCAL_GIT_DIR}/dotfiles/_cli/$(basename $i) ${XDG_CONFIG_HOME}/ done