From d64674a29351317c132cb867ec853921b56e0956 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Thu, 22 Oct 2020 16:25:26 +0200 Subject: [PATCH] Neovim + XDG setup. --- conf/fdignore | 17 -------------- fd/ignore | 16 +++++++++++++ conf/gitignore => git/ignore | 0 install.sh | 41 +++++++++++---------------------- {vim => nvim}/autoload/plug.vim | 0 vim/vimrc => nvim/init.vim | 0 {conf => tmux}/tmux.conf | 0 zsh/zshrc | 25 +++++++++++--------- 8 files changed, 43 insertions(+), 56 deletions(-) delete mode 100644 conf/fdignore create mode 100644 fd/ignore rename conf/gitignore => git/ignore (100%) rename {vim => nvim}/autoload/plug.vim (100%) rename vim/vimrc => nvim/init.vim (100%) rename {conf => tmux}/tmux.conf (100%) diff --git a/conf/fdignore b/conf/fdignore deleted file mode 100644 index ba11264..0000000 --- a/conf/fdignore +++ /dev/null @@ -1,17 +0,0 @@ -*.swp -*~ -.*history* -.cache -.config/vim -.config/zsh/caches -.config/zsh/plugins -.config/zsh/themes -.fdignore -.fzf* -.git* -.lesshst -.local -.python* -.ssh/known_hosts -.vim -.zcomp* diff --git a/fd/ignore b/fd/ignore new file mode 100644 index 0000000..627282f --- /dev/null +++ b/fd/ignore @@ -0,0 +1,16 @@ +*.swp +*~ +.*history* +.cache +.config/nvim/runtime +.config/nvim/plugins +.config/zsh +nvim/runtime +nvim/plugins +zsh +.git* +.lesshst +.python* +.ssh/known_hosts +.vim +.zcomp* diff --git a/conf/gitignore b/git/ignore similarity index 100% rename from conf/gitignore rename to git/ignore diff --git a/install.sh b/install.sh index 05cc0e9..75c7851 100644 --- a/install.sh +++ b/install.sh @@ -1,47 +1,32 @@ #!/bin/sh -# cleaning & preparing +# cleaning rm -rf ~/.bash* ~/.profile rm -rf ~/.dotfiles +rm -rf ~/.config/fd ~/.config/git ~/.config/nvim ~/.config/tmux ~/.config/zsh ~/.zshrc +rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.zcomp* ~/.zsh* # repo + preparations git clone https://github.com/ftpd/dotfiles.git ~/.dotfiles -mkdir -p ~/.config +mkdir -p ~/.cache ~/.config/local ~/.config/nvim ~/.config/zsh -## vim -# cleaning -rm -rf ~/.vim* ~/.config/vim -mkdir -p ~/.config/vim/runtime -# installing -ln -sf ~/.dotfiles/vim/autoload ~/.config/vim/runtime -ln -sf ~/.dotfiles/vim/vimrc ~/.vimrc +## neovim +mkdir -p ~/.config/nvim/runtime +ln -sf ~/.dotfiles/nvim/autoload ~/.config/nvim/runtime +ln -sf ~/.dotfiles/nvim/init.vim ~/.config/nvim/init.vim ## .gitignore -# cleaning -rm -rf ~/.gitignore -# installing -ln -sf ~/.dotfiles/conf/gitignore ~/.gitignore -git config --global core.excludesfile ~/.gitignore +ln -sf ~/.dotfiles/git ~/.config/ -## .fdignore -# cleaning -rm -rf ~/.fdignore -# installing -ln -sf ~/.dotfiles/conf/fdignore ~/.fdignore +## fdignore +ln -sf ~/.dotfiles/fd ~/.config/ ## tmux -# cleaning -rm -rf ~/.tmux.conf -# installing -ln -sf ~/.dotfiles/conf/tmux.conf ~/.tmux.conf +ln -sf ~/.dotfiles/tmux ~/.config/ ## zsh -# cleaning -rm -rf ~/.zsh* ~/.zcomp* ~/.config/zsh/ -mkdir -p ~/.config/zsh/caches ~/.config/zsh/plugins ~/.config/zsh/themes -# dependiences +mkdir -p ~/.cache/zsh ~/.config/zsh/caches ~/.config/zsh/plugins ~/.config/zsh/themes git clone https://github.com/zsh-users/zsh-autosuggestions.git ~/.config/zsh/plugins/zsh-autosuggestions git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.config/zsh/plugins/zsh-syntax-highlighting git clone https://github.com/romkatv/powerlevel10k.git ~/.config/zsh/themes/powerlevel10k -# installing ln -sf ~/.dotfiles/zsh/zshrc ~/.zshrc diff --git a/vim/autoload/plug.vim b/nvim/autoload/plug.vim similarity index 100% rename from vim/autoload/plug.vim rename to nvim/autoload/plug.vim diff --git a/vim/vimrc b/nvim/init.vim similarity index 100% rename from vim/vimrc rename to nvim/init.vim diff --git a/conf/tmux.conf b/tmux/tmux.conf similarity index 100% rename from conf/tmux.conf rename to tmux/tmux.conf diff --git a/zsh/zshrc b/zsh/zshrc index 3b3094d..acd743b 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -1,31 +1,34 @@ +export XDG_CONFIG_HOME=~/.config +export XDG_DATA_HOME=~/.cache + bindkey -e -autoload -U compinit && compinit -d ~/.config/zsh/caches/zcompdump autoload -U promptinit && promptinit +autoload -U compinit && compinit -d $XDG_DATA_HOME/zsh/zcompdump zstyle ':completion:*' menu select zstyle ':completion:*' list-colors '' zmodload zsh/complist export HISTSIZE=10000 SAVEHIST=$HISTSIZE -HISTFILE=~/.history +HISTFILE=$XDG_DATA_HOME/zsh/history setopt inc_append_history setopt share_history -[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.config/local.fdignore' -export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file ~/.config/local.fdignore' +[ -f $XDG_CONFIG_HOME/fzf/fzf.zsh ] && 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_OPTS="-e --multi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=gruvbox {}'" export FZF_CTRL_R_OPTS="-e --layout=reverse --preview=''" _fzf_compgen_path() { - fd -H -L --ignore-file ~/.config/local.fdignore . "$1" + fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd . "$1" } _fzf_compgen_dir() { - fd -H -L --ignore-file ~/.config/local.fdignore --type d . "$1" + fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd --type d . "$1" } -source ~/.config/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -source ~/.config/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh -source ~/.config/zsh/themes/powerlevel10k/powerlevel10k.zsh-theme +source $XDG_CONFIG_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +source $XDG_CONFIG_HOME/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh +source $XDG_CONFIG_HOME/zsh/themes/powerlevel10k/powerlevel10k.zsh-theme source ~/.dotfiles/zsh/p10k.zsh -[ -e ~/.config/local.zsh ] && source ~/.config/local.zsh +[ -e $XDG_CONFIG_HOME/local/zsh ] && source $XDG_CONFIG_HOME/local/zsh