From 6868aa0211b89f3a8096bec107a4c679b59134be Mon Sep 17 00:00:00 2001 From: TheK4n Date: Fri, 4 Feb 2022 17:11:21 +0300 Subject: [PATCH] full refactor --- .gitignore | 4 +-- Makefile | 32 ++++++++----------- .bashrc => bashrc | 0 {.light => light}/.bashrc | 0 {.light => light}/.vimrc | 0 .profile => profile | 0 {.subbash => subbash}/aliases | 0 .../completion}/all | 0 {.subbash => subbash}/export | 0 {.subbash => subbash}/functions | 0 {.subbash => subbash}/prompt | 0 {.subbash => subbash}/shopt | 0 {.subbash => subbash}/sourcer | 2 +- .gitconfig => subgit/.gitconfig | 0 {.ranger => subranger}/rc.conf | 0 {.ssh => subssh}/config | 0 {.vim => subvim}/.vimrc | 0 {.subzsh => subzsh}/completion | 0 {.subzsh => subzsh}/history | 0 {.subzsh => subzsh}/options | 0 {.subzsh => subzsh}/other | 0 {.subzsh => subzsh}/plugin | 0 {.subzsh => subzsh}/prompt | 0 {.subzsh => subzsh}/sourcer | 0 .tmux.conf => tmux.conf | 0 .zshrc => zshrc | 0 26 files changed, 17 insertions(+), 21 deletions(-) rename .bashrc => bashrc (100%) rename {.light => light}/.bashrc (100%) rename {.light => light}/.vimrc (100%) rename .profile => profile (100%) rename {.subbash => subbash}/aliases (100%) rename {etc/bash_completion.d => subbash/completion}/all (100%) rename {.subbash => subbash}/export (100%) rename {.subbash => subbash}/functions (100%) rename {.subbash => subbash}/prompt (100%) rename {.subbash => subbash}/shopt (100%) rename {.subbash => subbash}/sourcer (87%) rename .gitconfig => subgit/.gitconfig (100%) rename {.ranger => subranger}/rc.conf (100%) rename {.ssh => subssh}/config (100%) rename {.vim => subvim}/.vimrc (100%) rename {.subzsh => subzsh}/completion (100%) rename {.subzsh => subzsh}/history (100%) rename {.subzsh => subzsh}/options (100%) rename {.subzsh => subzsh}/other (100%) rename {.subzsh => subzsh}/plugin (100%) rename {.subzsh => subzsh}/prompt (100%) rename {.subzsh => subzsh}/sourcer (100%) rename .tmux.conf => tmux.conf (100%) rename .zshrc => zshrc (100%) diff --git a/.gitignore b/.gitignore index 2086932..e877a14 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,5 @@ Session.vim # local -.vim/bundle/ -.subzsh/plugins/ +subvim/bundle/ +subzsh/plugins/ diff --git a/Makefile b/Makefile index 0eb8134..d20e947 100644 --- a/Makefile +++ b/Makefile @@ -13,42 +13,38 @@ backup: mv ~/.gitignore ~/.gitignore.bak || true bash: - ln -s $(PWD)/.subbash ~ || true - ln -s $(PWD)/.bashrc ~ || true + ln -s $(PWD)/subbash ~/.subbash || true + ln -s $(PWD)/bashrc ~/.bashrc || true zsh: - ln -s $(PWD)/.subzsh ~ || true - ln -s $(PWD)/.zshrc ~ || true + ln -s $(PWD)/subzsh ~/.subzsh || true + ln -s $(PWD)/zshrc ~/.zshrc || true mkdir ~/.subzsh/plugins || true - git clone https://github.com/zsh-users/zsh-autosuggestions ~/.subzsh/plugins/zsh-autosuggestions || true - git clone https://github.com/zsh-users/zsh-syntax-highlighting ~/.subzsh/plugins/zsh-syntax-highlighting + git clone https://github.com/zsh-users/zsh-autosuggestions $(PWD)/subzsh/plugins/zsh-autosuggestions || true + git clone https://github.com/zsh-users/zsh-syntax-highlighting $(PWD)/subzsh/plugins/zsh-syntax-highlighting tmux: - ln -s $(PWD)/.tmux.conf ~ || true + ln -s $(PWD)/tmux.conf ~/.tmux.conf || true vim: - ln -s $(PWD)/.vim ~ && \ - ln -s $(PWD)/.vim/.vimrc ~ && \ + ln -s $(PWD)/subvim ~/.vim && \ + ln -s $(PWD)/subvim/.vimrc ~/.vimrc && \ mkdir -p ~/.config/nvim && \ - ln -s $(PWD)/.vim/.vimrc ~/.config/nvim/init.vim && \ - git clone https://github.com/VundleVim/Vundle.vim.git $(PWD)/.vim/bundle/Vundle.vim && \ + ln -s $(PWD)/subvim/.vimrc ~/.config/nvim/init.vim && \ + git clone https://github.com/VundleVim/Vundle.vim.git $(PWD)/subvim/bundle/Vundle.vim && \ vim +PluginInstall +qall ssh: - echo -e "\n" >> ~/.ssh/config && cat .ssh/config >> ~/.ssh/config + echo -e "\n" >> ~/.ssh/config && cat $(PWD)/subssh/config >> ~/.ssh/config git: - ln -s $(PWD)/.gitconfig ~ || true + ln -s $(PWD)/subgit/.gitconfig ~ || true ln -s $(PWD)/.gitignore ~ || true -completion: - sudo mkdir -p /etc/bash_completion.d && \ - sudo ln -s $(PWD)/etc/bash_completion.d/all /etc/bash_completion.d - ranger: mkdir -p ~/.config/ranger || true - ln -s $(PWD)/.ranger/rc.conf ~/.config/ranger || true + ln -s $(PWD)/subranger/rc.conf ~/.config/ranger || true mkdir -p ~/.config/ranger/plugins && \ git clone https://github.com/alexanderjeurissen/ranger_devicons ~/.config/ranger/plugins/ranger_devicons diff --git a/.bashrc b/bashrc similarity index 100% rename from .bashrc rename to bashrc diff --git a/.light/.bashrc b/light/.bashrc similarity index 100% rename from .light/.bashrc rename to light/.bashrc diff --git a/.light/.vimrc b/light/.vimrc similarity index 100% rename from .light/.vimrc rename to light/.vimrc diff --git a/.profile b/profile similarity index 100% rename from .profile rename to profile diff --git a/.subbash/aliases b/subbash/aliases similarity index 100% rename from .subbash/aliases rename to subbash/aliases diff --git a/etc/bash_completion.d/all b/subbash/completion/all similarity index 100% rename from etc/bash_completion.d/all rename to subbash/completion/all diff --git a/.subbash/export b/subbash/export similarity index 100% rename from .subbash/export rename to subbash/export diff --git a/.subbash/functions b/subbash/functions similarity index 100% rename from .subbash/functions rename to subbash/functions diff --git a/.subbash/prompt b/subbash/prompt similarity index 100% rename from .subbash/prompt rename to subbash/prompt diff --git a/.subbash/shopt b/subbash/shopt similarity index 100% rename from .subbash/shopt rename to subbash/shopt diff --git a/.subbash/sourcer b/subbash/sourcer similarity index 87% rename from .subbash/sourcer rename to subbash/sourcer index cf4cad0..9555ec2 100644 --- a/.subbash/sourcer +++ b/subbash/sourcer @@ -12,6 +12,6 @@ if [[ $- == *i* ]]; then so "$HOME"/.subbash/prompt so "$HOME"/.subbash/aliases so "$HOME"/.subbash/functions + so "$HOME"/.subbash/completion/all fi -so /etc/bash_completion.d/all diff --git a/.gitconfig b/subgit/.gitconfig similarity index 100% rename from .gitconfig rename to subgit/.gitconfig diff --git a/.ranger/rc.conf b/subranger/rc.conf similarity index 100% rename from .ranger/rc.conf rename to subranger/rc.conf diff --git a/.ssh/config b/subssh/config similarity index 100% rename from .ssh/config rename to subssh/config diff --git a/.vim/.vimrc b/subvim/.vimrc similarity index 100% rename from .vim/.vimrc rename to subvim/.vimrc diff --git a/.subzsh/completion b/subzsh/completion similarity index 100% rename from .subzsh/completion rename to subzsh/completion diff --git a/.subzsh/history b/subzsh/history similarity index 100% rename from .subzsh/history rename to subzsh/history diff --git a/.subzsh/options b/subzsh/options similarity index 100% rename from .subzsh/options rename to subzsh/options diff --git a/.subzsh/other b/subzsh/other similarity index 100% rename from .subzsh/other rename to subzsh/other diff --git a/.subzsh/plugin b/subzsh/plugin similarity index 100% rename from .subzsh/plugin rename to subzsh/plugin diff --git a/.subzsh/prompt b/subzsh/prompt similarity index 100% rename from .subzsh/prompt rename to subzsh/prompt diff --git a/.subzsh/sourcer b/subzsh/sourcer similarity index 100% rename from .subzsh/sourcer rename to subzsh/sourcer diff --git a/.tmux.conf b/tmux.conf similarity index 100% rename from .tmux.conf rename to tmux.conf diff --git a/.zshrc b/zshrc similarity index 100% rename from .zshrc rename to zshrc