From 67da18597a59eff8ce01b30d55232d812544f249 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Thu, 13 Jul 2023 17:02:40 +0200 Subject: [PATCH] BIG reorganisation. --- install.sh | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/install.sh b/install.sh index ac5d656..f107261 100644 --- a/install.sh +++ b/install.sh @@ -1,40 +1,40 @@ #!/bin/sh -# # clean + prepare local dirs -# rm -rf ~/.cache ~/.config/_cache /tmp/${USER}-cache -# rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* ~/.local/share/nvim ~/.local/state/nvim -# mkdir -p /tmp/${USER}-cache/ ~/.config ~/.local/bin ~/.local/share -# chmod 700 /tmp/${USER}-cache -# -# # export XDG stuff for later use -# 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 -# -# # prepare repository -# mkdir -p $XDG_DATA_HOME/repos -# rm -rf $XDG_DATA_HOME/repos/dotfiles -# git clone --recurse https://git.insomniac.pl/ftpd/dotfiles $XDG_DATA_HOME/repos/dotfiles -# -# # astronvim -# rm -rf ~/.config/nvim $XDG_DATA_HOME/repos/AstroNvim -# git clone --depth 1 https://github.com/AstroNvim/AstroNvim $XDG_DATA_HOME/repos/AstroNvim -# ln -sf $XDG_DATA_HOME/repos/AstroNvim $XDG_CONFIG_HOME/nvim -# +# clean + prepare local dirs +rm -rf ~/.cache ~/.config/_cache /tmp/${USER}-cache +rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* ~/.local/share/nvim ~/.local/state/nvim +mkdir -p /tmp/${USER}-cache/ ~/.config ~/.local/bin ~/.local/share +chmod 700 /tmp/${USER}-cache + +# export XDG stuff for later use +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 + +# prepare repository +mkdir -p $XDG_DATA_HOME/repos +rm -rf $XDG_DATA_HOME/repos/dotfiles +git clone --recurse https://git.insomniac.pl/ftpd/dotfiles $XDG_DATA_HOME/repos/dotfiles + +# astronvim +rm -rf ~/.config/nvim $XDG_DATA_HOME/repos/AstroNvim +git clone --depth 1 https://github.com/AstroNvim/AstroNvim $XDG_DATA_HOME/repos/AstroNvim +ln -sf $XDG_DATA_HOME/repos/AstroNvim $XDG_CONFIG_HOME/nvim + # configs for i in _cli/*; do - echo rm -rf $XDG_CONFIG_HOME/$(basename $i) - echo ln -sf $XDG_DATA_HOME/repos/dotfiles/${i} $XDG_CONFIG_HOME/ + rm -rf $XDG_CONFIG_HOME/$(basename $i) + ln -sf $XDG_DATA_HOME/repos/dotfiles/${i} $XDG_CONFIG_HOME/ done -# -# ## zsh -# ### modules -# mkdir -p $XDG_DATA_HOME/repos/zsh_modules -# rm -rf $XDG_DATA_HOME/repos/zsh_modules/* -# for module in mfaerevaag/wd zdharma-continuum/fast-syntax-highlighting; do -# git clone https://github.com/${module} $XDG_DATA_HOME/repos/zsh_modules/${module#*/} -# done -# ### config -# rm -rf $XDG_CONFIG_HOME/zsh -# ln -sf $XDG_DATA_HOME/repos/dotfiles/zsh $XDG_CONFIG_HOME + +## zsh +### modules +mkdir -p $XDG_DATA_HOME/repos/zsh_modules +rm -rf $XDG_DATA_HOME/repos/zsh_modules/* +for module in mfaerevaag/wd zdharma-continuum/fast-syntax-highlighting; do + git clone https://github.com/${module} $XDG_DATA_HOME/repos/zsh_modules/${module#*/} +done +### config +rm -rf $XDG_CONFIG_HOME/zsh +ln -sf $XDG_DATA_HOME/repos/dotfiles/zsh $XDG_CONFIG_HOME