From ee45430c00ea0ae2c1fe141d701dd86c6f35b8b0 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 20 Apr 2021 22:52:38 +0200
Subject: [PATCH] Migrate from ~/.config/local to ~/.local/settings.

---
 install.sh      | 34 +++++++++++++++++++++-------------
 nvim/init.vim   |  4 ++--
 zsh/.zshrc      |  2 +-
 zsh/aliases.zsh |  2 +-
 zsh/fzf.zsh     |  8 ++++----
 5 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/install.sh b/install.sh
index 100b61b..5972150 100644
--- a/install.sh
+++ b/install.sh
@@ -1,27 +1,32 @@
 #!/bin/sh
 
-# cleaning
-rm -rf ~/.bash* ~/.profile
-rm -rf ~/.dotfiles ~/.local/dotfiles ~/.local/repos/dotfiles
-rm -rf ~/.cache ~/.config/_cache ~/.config/fd ~/.config/git/ignore ~/.config/nvim ~/.config/tmux ~/.config/vim ~/.config/zsh ~/.zshenv
-rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh*
-
-# repo + preparations
-mkdir -p ~/.config/git ~/.config/local ~/.local/repos
+# prepare repository
+rm -rf ~/.local/repos/dotfiles
+mkdir -p ~/.local/repos
 git clone --recurse https://git.insomniac.pl/ftpd/dotfiles ~/.local/repos/dotfiles
 
-## neovim
-ln -sf ~/.local/repos/dotfiles/nvim ~/.config/
-touch ~/.config/local/init.vim
+# 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 ~/.config ~/.local/settings
 
-## .gitignore
+## neovim
+rm -rf ~/.config/nvim
+ln -sf ~/.local/repos/dotfiles/nvim ~/.config/
+touch ~/.local/settings/init.vim
+
+## git
+mkdir -p ~/.config/git
+rm -rf ~/.config/git/ignore
 ln -sf ~/.local/repos/dotfiles/git/ignore ~/.config/git/ignore
 
 ## fdignore
+rm -rf ~/.config/fd
 ln -sf ~/.local/repos/dotfiles/fd ~/.config/
-touch ~/.config/local/fd
+touch ~/.local/settings/fd
 
 ## tmux
+rm -rf ~/.config/tmux
 ln -sf ~/.local/repos/dotfiles/tmux ~/.config/
 
 ## zsh
@@ -33,4 +38,7 @@ case $(uname -s) in
 esac
 echo "export XDG_CONFIG_HOME=$HOME/.config" >> $HOME/.zshenv
 echo "export ZDOTDIR=$HOME/.config/zsh" >> $HOME/.zshenv
+rm -rf ~/.bash* ~/.profile
+rm -rf ~/.
 ln -sf ~/.local/repos/dotfiles/zsh ~/.config/
+touch ~/.local/settings/zsh
diff --git a/nvim/init.vim b/nvim/init.vim
index 2e79b6b..1e70e1e 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -71,7 +71,7 @@ let g:limelight_conceal_guifg = '0'
 autocmd! User GoyoEnter Limelight
 autocmd! User GoyoLeave Limelight!
 
-let $FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.config/local/fd'
+let $FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/settings/fd'
 command! -bang -nargs=? -complete=dir Files
   \ call fzf#vim#files(<q-args>, {'options': ['-e', '--layout=reverse', '--preview', 'bat --color=always --style=plain --theme=Monokai\ Extended\ Bright {}']}, <bang>0)
 command! -bang -nargs=? -complete=dir Colors
@@ -94,4 +94,4 @@ function! LightLineReadonly()
   return &readonly && &filetype !=# 'help' ? 'RO' : ''
 endfunction
 
-source ~/.config/local/init.vim
+source ~/.local/settings/init.vim
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 63981b6..9408386 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -33,4 +33,4 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
 fi
 
 # local settings
-[ -e $XDG_CONFIG_HOME/local/zsh ] && source $XDG_CONFIG_HOME/local/zsh
+source ~/.local/settings/zsh
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 9b08252..2065f1a 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -14,7 +14,7 @@ else
   alias ll='ls -l'
 fi
 if [ $(command -v fd) ]; then
-  alias fd='fd -H -L --ignore-file ~/.config/local/fd'
+  alias fd='fd -H -L --ignore-file ~/.local/settings/fd'
 fi
 if [ $(command -v nvim) ]; then
   export EDITOR='nvim'
diff --git a/zsh/fzf.zsh b/zsh/fzf.zsh
index 48a0392..fdc4266 100644
--- a/zsh/fzf.zsh
+++ b/zsh/fzf.zsh
@@ -1,13 +1,13 @@
 source $XDG_CONFIG_HOME/fzf/fzf.zsh
-export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd'
-export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd'
+export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/settings/fd'
+export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file ~/.local/settings/fd'
 export FZF_DEFAULT_OPTS="--multi -e --ansi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended\ Bright {}'"
 export FZF_CTRL_R_OPTS="-e --ansi --layout=reverse --preview=''"
 _fzf_compgen_path() {
-  fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd . "$1"
+  fd -H -L --ignore-file ~/local/settings/fd . "$1"
 }
 _fzf_compgen_dir() {
-  fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd --type d . "$1"
+  fd -H -L --ignore-file ~/local/settings/fd --type d . "$1"
 }
 
 # heavily inspired (and sometimes stolen from): https://github.com/wfxr/forgit.git