diff --git a/_desktop/install-desktop.sh b/_desktop/install-desktop.sh index 6262d5a..ede5a07 100644 --- a/_desktop/install-desktop.sh +++ b/_desktop/install-desktop.sh @@ -6,15 +6,15 @@ mkdir -p ~/.config ~/.local/bin ~/.local/settings # link config for i in dunst zathura; do rm -rf ~/.config/${i} - ln -sf ~/.local/repos/dotfiles/_desktop/${i} ~/.config + ln -sf $XDG_DATA_HOME/repos/dotfiles/_desktop/${i} ~/.config done # link clibpoard hack rm -rf ~/.local/bin/clipboard -ln -sf ~/.local/repos/dotfiles/_desktop/clipboard ~/.local/bin/clipboard +ln -sf $XDG_DATA_HOME/repos/dotfiles/_desktop/clipboard ~/.local/bin/clipboard # copy firefox wrapper -ln -sf ~/.local/repos/dotfiles/_desktop/firefox ~/.local/bin +ln -sf $XDG_DATA_HOME/repos/dotfiles/_desktop/firefox ~/.local/bin # qutebrowser files #touch ~/.local/settings/qutebrowser.py diff --git a/install.sh b/install.sh index f2184db..8611ff4 100644 --- a/install.sh +++ b/install.sh @@ -1,5 +1,10 @@ #!/bin/sh +# clean + prepare local dirs +rm -rf ~/.cache ~/.config/_cache +rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* +mkdir -p ~/.cache/ ~/.config ~/.local/bin ~/.local/share ~/.local/settings + # prepare global variables echo "skip_global_compinit=1" > $HOME/.zshenv echo "export XDG_DATA_HOME=$HOME/.local/share" >> $HOME/.zshenv @@ -16,12 +21,7 @@ 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 -# clean + prepare local dirs -rm -rf ~/.cache ~/.config/_cache ~/.config/vim ~/.config/zsh -rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* -mkdir -p ~/.cache/ ~/.config ~/.local/bin ~/.local/settings - -## neovim +## vim rm -rf ~/.config/vim ln -sf $XDG_DATA_HOME/repos/dotfiles/vim ~/.config/ touch ~/.local/settings/vimrc