Move local paths to variables.

Bugfix.

Fix cache dir.
This commit is contained in:
Bartek Stalewski 2024-03-30 00:51:39 +01:00
parent af1740df8d
commit c34e5806c2
No known key found for this signature in database
3 changed files with 28 additions and 25 deletions

View File

@ -1,5 +1,5 @@
skip_global_compinit=1 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_CONFIG_HOME=$HOME/.config
export XDG_DATA_HOME=$HOME/.local/share export XDG_DATA_HOME=$HOME/.local/share
export XDG_STATE_HOME=$HOME/.local/state 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 # if test -z "$XDG_RUNTIME_DIR"; then
# export XDG_RUNTIME_DIR=$(mktemp -d /tmp/$(id -u)-runtime-dir.XXX) # export XDG_RUNTIME_DIR=$(mktemp -d /tmp/$(id -u)-runtime-dir.XXX)
# fi # fi

View File

@ -1,15 +1,19 @@
#!/bin/sh #!/bin/sh
# variables
LOCAL_BIN_DIR=${HOME}/.local/bin
XDG_CONFIG_HOME=${HOME}/.config
# prepare local dirs # prepare local dirs
mkdir -p ~/.config ~/.local/bin mkdir -p ${XDG_CONFIG_HOME} ${LOCAL_BIN_DIR}
# install configs # install configs
for i in _configs/*; do for i in _configs/*; do
rm -rf ~/.config/$(basename $i) rm -rf ${XDG_CONFIG_HOME}/$(basename $i)
ln -sf $(pwd)/${i} ~/.config ln -sf $(pwd)/${i} ${XDG_CONFIG_HOME}
done done
# install scripts # install scripts
for i in _scripts/*; do for i in _scripts/*; do
ln -sf $(pwd)/${i} ~/.local/bin ln -sf $(pwd)/${i} ${LOCAL_BIN_DIR}
done done

View File

@ -1,33 +1,33 @@
#!/bin/sh #!/bin/sh
# variables # variables
GIT_DIR=~/.local/git LOCAL_BIN_DIR=${HOME}/.local/bin
export XDG_CACHE_HOME=/tmp/${USER}-cache LOCAL_GIT_DIR=${HOME}/.local/git
export XDG_CONFIG_HOME=$HOME/.config XDG_CACHE_HOME=/tmp/${USER}-cache
export XDG_DATA_HOME=$HOME/.local/share XDG_CONFIG_HOME=${HOME}/.config
export XDG_STATE_HOME=$HOME/.local/state XDG_DATA_HOME=${HOME}/.local/share
XDG_STATE_HOME=${HOME}/.local/state
# clean + prepare local dirs # clean + prepare local dirs
rm -rf ~/.cache ~/.config/_cache $XDG_CACHE_HOME rm -rf ~/.cache ~/.config/_cache ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh*
rm -rf ~/.config/nvim ~/.local/share/nvim ~/.local/state/nvim rm -rf ${XDG_CACHE_HOME} ${XDG_DATA_HOME}/nvim ${XDG_STATE_HOME}/nvim
rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* mkdir -p ${LOCAL_BIN_DIR} ${XDG_CACHE_HOME} ${XDG_CONFIG_HOME} ${XDG_DATA_HOME}
mkdir -p ~/.local/bin $XDG_CACHE_HOME $XDG_CONFIG_HOME $XDG_DATA_HOME chmod 700 ${XDG_CACHE_HOME}
chmod 700 $XDG_CACHE_HOME
# prepare repository # prepare repository
mkdir -p $GIT_DIR mkdir -p ${LOCAL_GIT_DIR}
rm -rf $GIT_DIR/dotfiles rm -rf ${LOCAL_GIT_DIR}/dotfiles
git clone https://git.insomniac.pl/ftpd/dotfiles $GIT_DIR/dotfiles git clone https://git.insomniac.pl/ftpd/dotfiles $LOCAL_GIT_DIR/dotfiles
# zsh modules # zsh modules
mkdir -p $GIT_DIR/zsh_modules mkdir -p ${LOCAL_GIT_DIR}/zsh_modules
rm -rf $GIT_DIR/zsh_modules/* rm -rf ${LOCAL_GIT_DIR}/zsh_modules/*
for module in mfaerevaag/wd romkatv/powerlevel10k zdharma-continuum/fast-syntax-highlighting; do 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 done
# configs # configs
for i in $GIT_DIR/dotfiles/_cli/*; do for i in ${LOCAL_GIT_DIR}/dotfiles/_cli/*; do
rm -rf $XDG_CONFIG_HOME/$(basename $i) rm -rf ${XDG_CONFIG_HOME}/$(basename $i)
ln -sf $GIT_DIR/dotfiles/_cli/$(basename $i) $XDG_CONFIG_HOME/ ln -sf ${LOCAL_GIT_DIR}/dotfiles/_cli/$(basename $i) ${XDG_CONFIG_HOME}/
done done