diff --git a/install.sh b/install.sh index 8611ff4..30702d3 100644 --- a/install.sh +++ b/install.sh @@ -3,7 +3,7 @@ # 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 +mkdir -p ~/.cache/ ~/.config ~/.local/bin ~/.local/share ~/.local/config # prepare global variables echo "skip_global_compinit=1" > $HOME/.zshenv @@ -24,12 +24,12 @@ git clone --recurse https://git.insomniac.pl/ftpd/dotfiles $XDG_DATA_HOME/repos/ ## vim rm -rf ~/.config/vim ln -sf $XDG_DATA_HOME/repos/dotfiles/vim ~/.config/ -touch ~/.local/settings/vimrc +touch ~/.local/config/vimrc ## fdignore rm -rf ~/.config/fd ln -sf $XDG_DATA_HOME/repos/dotfiles/fd ~/.config/ -touch ~/.local/settings/fd +touch ~/.local/config/fd ## tmux rm -rf ~/.config/tmux @@ -47,4 +47,4 @@ done ## zsh rm -rf ~/.config/zsh ln -sf $XDG_DATA_HOME/repos/dotfiles/zsh ~/.config/ -touch ~/.local/settings/zsh +touch ~/.local/config/zsh diff --git a/vim/vimrc b/vim/vimrc index 52d5d56..fe72f32 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -70,7 +70,7 @@ hi! NonText ctermbg=NONE guibg=NONE let g:Hexokinase_highlighters = [ 'backgroundfull' ] -let $FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/settings/fd' +let $FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/config/fd' command! -bang -nargs=? -complete=dir Files \ call fzf#vim#files(, {'options': ['-e', '--layout=reverse', '--preview', 'bat --color=always --style=plain --theme=Monokai\ Extended\ Bright {}']}, 0) command! -bang -nargs=? -complete=dir Colors @@ -93,4 +93,4 @@ function! LightLineReadonly() return &readonly && &filetype !=# 'help' ? '' : '' endfunction -source ~/.local/settings/vimrc +source ~/.local/config/vimrc diff --git a/zsh/.zshrc b/zsh/.zshrc index 0ca58db..18ca5e9 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -45,7 +45,7 @@ wd () { fpath=($ZDOTDIR/modules/wd $fpath) # local settings -source ~/.local/settings/zsh +source ~/.local/config/zsh [ ! -e $XDG_DATA_HOME/zsh/zcompdump.zwc ] && autoload -U zrecompile && zrecompile -p -R $XDG_DATA_HOME/zsh/zcompdump autoload -U compinit && compinit -d $XDG_DATA_HOME/zsh/zcompdump diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index c92db0d..9f72ad0 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 ~/.local/settings/fd' + alias fd='fd -H -L --ignore-file ~/.local/config/fd' fi function ud() { diff --git a/zsh/fzf.zsh b/zsh/fzf.zsh index fd9c2c4..2c8bb42 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 ~/.local/settings/fd' -export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file ~/.local/settings/fd' +export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/config/fd' +export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file ~/.local/config/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 ~/.local/settings/fd . "$1" + fd -H -L --ignore-file ~/.local/config/fd . "$1" } _fzf_compgen_dir() { - fd -H -L --ignore-file ~/.local/settings/fd --type d . "$1" + fd -H -L --ignore-file ~/.local/config/fd --type d . "$1" } # heavily inspired (and sometimes stolen from): https://github.com/wfxr/forgit.git