ftpd/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Activity

New approach to dotfiles handling.

Browse Source
This commit is contained in:
Bartek Stalewski 2022-03-30 11:27:23 +02:00
parent af2d271f03
commit 74ec21fafd
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install.sh
View File

@ -3,7 +3,7 @@
# clean + prepare local dirs # clean + prepare local dirs
rm -rf ~/.cache ~/.config/_cache rm -rf ~/.cache ~/.config/_cache
rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* 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 # prepare global variables
echo "skip_global_compinit=1" > $HOME/.zshenv 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 ## vim
rm -rf ~/.config/vim rm -rf ~/.config/vim
ln -sf $XDG_DATA_HOME/repos/dotfiles/vim ~/.config/ ln -sf $XDG_DATA_HOME/repos/dotfiles/vim ~/.config/
touch ~/.local/settings/vimrc touch ~/.local/config/vimrc
## fdignore ## fdignore
rm -rf ~/.config/fd rm -rf ~/.config/fd
ln -sf $XDG_DATA_HOME/repos/dotfiles/fd ~/.config/ ln -sf $XDG_DATA_HOME/repos/dotfiles/fd ~/.config/
touch ~/.local/settings/fd touch ~/.local/config/fd
## tmux ## tmux
rm -rf ~/.config/tmux rm -rf ~/.config/tmux
@ -47,4 +47,4 @@ done
## zsh ## zsh
rm -rf ~/.config/zsh rm -rf ~/.config/zsh
ln -sf $XDG_DATA_HOME/repos/dotfiles/zsh ~/.config/ ln -sf $XDG_DATA_HOME/repos/dotfiles/zsh ~/.config/
touch ~/.local/settings/zsh touch ~/.local/config/zsh

4
vim/vimrc
View File

@ -70,7 +70,7 @@ hi! NonText ctermbg=NONE guibg=NONE
let g:Hexokinase_highlighters = [ 'backgroundfull' ] 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 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) \ 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 command! -bang -nargs=? -complete=dir Colors
@ -93,4 +93,4 @@ function! LightLineReadonly()
return &readonly && &filetype !=# 'help' ? '' : '' return &readonly && &filetype !=# 'help' ? '' : ''
endfunction endfunction
source ~/.local/settings/vimrc source ~/.local/config/vimrc

2
zsh/.zshrc
View File

@ -45,7 +45,7 @@ wd () {
fpath=($ZDOTDIR/modules/wd $fpath) fpath=($ZDOTDIR/modules/wd $fpath)
# local settings # 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 [ ! -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 autoload -U compinit && compinit -d $XDG_DATA_HOME/zsh/zcompdump

2
zsh/aliases.zsh
View File

@ -14,7 +14,7 @@ else
alias ll='ls -l' alias ll='ls -l'
fi fi
if [ $(command -v fd) ]; then 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 fi
function ud() { function ud() {

8
zsh/fzf.zsh
View File

@ -1,13 +1,13 @@
source $XDG_CONFIG_HOME/fzf/fzf.zsh source $XDG_CONFIG_HOME/fzf/fzf.zsh
export FZF_DEFAULT_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/settings/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_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=''" export FZF_CTRL_R_OPTS="-e --ansi --layout=reverse --preview=''"
_fzf_compgen_path() { _fzf_compgen_path() {
fd -H -L --ignore-file ~/.local/settings/fd . "$1" fd -H -L --ignore-file ~/.local/config/fd . "$1"
} }
_fzf_compgen_dir() { _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 # heavily inspired (and sometimes stolen from): https://github.com/wfxr/forgit.git