From c4cea7e6c926c26409be86fa81a723a31d5b1753 Mon Sep 17 00:00:00 2001 From: Thek4n Date: Tue, 7 Nov 2023 09:39:35 +0300 Subject: [PATCH] rename .subbash to .config/bash, .subzsh to .config/zsh --- .gitignore | 10 ++++----- home/user/.bashrc | 7 +++--- home/user/{.subbash => .config/bash}/aliases | 0 .../{.subbash => .config/bash}/completion | 0 home/user/{.subbash => .config/bash}/export | 0 .../user/{.subbash => .config/bash}/functions | 0 home/user/{.subbash => .config/bash}/prompt | 0 home/user/{.subbash => .config/bash}/shopt | 0 home/user/.config/bash/sourcer | 19 ++++++++++++++++ home/user/.config/git/config | 2 +- home/user/{.subzsh => .config/zsh}/aliases | 0 home/user/{.subzsh => .config/zsh}/completion | 0 home/user/{.subzsh => .config/zsh}/history | 0 home/user/{.subzsh => .config/zsh}/options | 0 home/user/{.subzsh => .config/zsh}/other | 0 home/user/{.subzsh => .config/zsh}/plugin | 8 +++---- home/user/{.subzsh => .config/zsh}/prompt | 0 home/user/.config/zsh/sourcer | 22 +++++++++++++++++++ .../bashrc.d => .config/zsh/zshrc.d}/.gitkeep | 0 home/user/.subbash/sourcer | 19 ---------------- home/user/.subzsh/sourcer | 22 ------------------- home/user/.subzsh/zshrc.d/.gitkeep | 0 home/user/.zshrc | 4 ++-- install | 4 ++-- 24 files changed, 59 insertions(+), 58 deletions(-) rename home/user/{.subbash => .config/bash}/aliases (100%) rename home/user/{.subbash => .config/bash}/completion (100%) rename home/user/{.subbash => .config/bash}/export (100%) rename home/user/{.subbash => .config/bash}/functions (100%) rename home/user/{.subbash => .config/bash}/prompt (100%) rename home/user/{.subbash => .config/bash}/shopt (100%) create mode 100644 home/user/.config/bash/sourcer rename home/user/{.subzsh => .config/zsh}/aliases (100%) rename home/user/{.subzsh => .config/zsh}/completion (100%) rename home/user/{.subzsh => .config/zsh}/history (100%) rename home/user/{.subzsh => .config/zsh}/options (100%) rename home/user/{.subzsh => .config/zsh}/other (100%) rename home/user/{.subzsh => .config/zsh}/plugin (57%) rename home/user/{.subzsh => .config/zsh}/prompt (100%) create mode 100644 home/user/.config/zsh/sourcer rename home/user/{.subbash/bashrc.d => .config/zsh/zshrc.d}/.gitkeep (100%) delete mode 100644 home/user/.subbash/sourcer delete mode 100644 home/user/.subzsh/sourcer delete mode 100644 home/user/.subzsh/zshrc.d/.gitkeep diff --git a/.gitignore b/.gitignore index aad9e0f..283e985 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ -home/user/.subzsh/plugins/* +home/user/.config/zsh/plugins/* home/user/.config/nvim/plugin home/user/.config/nvim/spell -home/user/.subbash/bashrc.d/* -!home/user/.subbash/bashrc.d/.gitkeep -home/user/.subzsh/zshrc.d/* -!home/user/.subzsh/zshrc.d/.gitkeep +home/user/.config/bash/bashrc.d/* +!home/user/config/bash/bashrc.d/.gitkeep +home/user/.config/zsh/zshrc.d/* +!home/user/.config/zsh/zshrc.d/.gitkeep *.zwc diff --git a/home/user/.bashrc b/home/user/.bashrc index 2c4160a..873e2c8 100644 --- a/home/user/.bashrc +++ b/home/user/.bashrc @@ -1,6 +1,7 @@ +#!/usr/bin/env bash # .bashrc by TheK4n # https://github.com/TheK4n/dotfiles -if [ -f $HOME/.subbash/sourcer ]; then - source $HOME/.subbash/sourcer -fi \ No newline at end of file +if [ -f "$HOME/.config/bash/sourcer" ]; then + source $HOME/.config/bash/sourcer +fi diff --git a/home/user/.subbash/aliases b/home/user/.config/bash/aliases similarity index 100% rename from home/user/.subbash/aliases rename to home/user/.config/bash/aliases diff --git a/home/user/.subbash/completion b/home/user/.config/bash/completion similarity index 100% rename from home/user/.subbash/completion rename to home/user/.config/bash/completion diff --git a/home/user/.subbash/export b/home/user/.config/bash/export similarity index 100% rename from home/user/.subbash/export rename to home/user/.config/bash/export diff --git a/home/user/.subbash/functions b/home/user/.config/bash/functions similarity index 100% rename from home/user/.subbash/functions rename to home/user/.config/bash/functions diff --git a/home/user/.subbash/prompt b/home/user/.config/bash/prompt similarity index 100% rename from home/user/.subbash/prompt rename to home/user/.config/bash/prompt diff --git a/home/user/.subbash/shopt b/home/user/.config/bash/shopt similarity index 100% rename from home/user/.subbash/shopt rename to home/user/.config/bash/shopt diff --git a/home/user/.config/bash/sourcer b/home/user/.config/bash/sourcer new file mode 100644 index 0000000..1b1d50b --- /dev/null +++ b/home/user/.config/bash/sourcer @@ -0,0 +1,19 @@ + +_so () { + [ -r "$1" ] && source "$1" +} + +if [[ $0 == *bash ]]; then + _so "$HOME"/.config/bash/export + _so "$HOME"/.config/bash/shopt +fi + +if [[ $- == *i* ]]; then + _so "$HOME"/.config/bash/prompt + _so "$HOME"/.config/bash/aliases + _so "$HOME"/.config/bash/functions + _so "$HOME"/.config/bash/completion +fi + + +_sod "$HOME"/.config/bash/bashrc.d diff --git a/home/user/.config/git/config b/home/user/.config/git/config index 8e9f8c3..aca065c 100644 --- a/home/user/.config/git/config +++ b/home/user/.config/git/config @@ -26,7 +26,7 @@ addEmptyPathspec = false [alias] - a = "!git ls-files -m | fzf | xargs git add" + a = "!git ls-files --exclude-standard -m --others -t | fzf | cut -d' ' -f2 | xargs git add" d = diff ds = diff --staged dno = diff --name-only diff --git a/home/user/.subzsh/aliases b/home/user/.config/zsh/aliases similarity index 100% rename from home/user/.subzsh/aliases rename to home/user/.config/zsh/aliases diff --git a/home/user/.subzsh/completion b/home/user/.config/zsh/completion similarity index 100% rename from home/user/.subzsh/completion rename to home/user/.config/zsh/completion diff --git a/home/user/.subzsh/history b/home/user/.config/zsh/history similarity index 100% rename from home/user/.subzsh/history rename to home/user/.config/zsh/history diff --git a/home/user/.subzsh/options b/home/user/.config/zsh/options similarity index 100% rename from home/user/.subzsh/options rename to home/user/.config/zsh/options diff --git a/home/user/.subzsh/other b/home/user/.config/zsh/other similarity index 100% rename from home/user/.subzsh/other rename to home/user/.config/zsh/other diff --git a/home/user/.subzsh/plugin b/home/user/.config/zsh/plugin similarity index 57% rename from home/user/.subzsh/plugin rename to home/user/.config/zsh/plugin index 6b6a19e..b151216 100644 --- a/home/user/.subzsh/plugin +++ b/home/user/.config/zsh/plugin @@ -14,7 +14,7 @@ install_if_not_exists zsh-users/zsh-syntax-highlighting install_if_not_exists hlissner/zsh-autopair install_if_not_exists unixorn/fzf-zsh-plugin -so ~/.subzsh/plugins/zsh-users/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -so ~/.subzsh/plugins/zsh-users/zsh-autosuggestions/zsh-autosuggestions.zsh -so ~/.subzsh/plugins/hlissner/zsh-autopair/autopair.zsh -so ~/.subzsh/plugins/unixorn/fzf-zsh-plugin/fzf-zsh-plugin.plugin.zsh +so ~/.config/zsh/plugins/zsh-users/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +so ~/.config/zsh/plugins/zsh-users/zsh-autosuggestions/zsh-autosuggestions.zsh +so ~/.config/zsh/plugins/hlissner/zsh-autopair/autopair.zsh +so ~/.config/zsh/plugins/unixorn/fzf-zsh-plugin/fzf-zsh-plugin.plugin.zsh diff --git a/home/user/.subzsh/prompt b/home/user/.config/zsh/prompt similarity index 100% rename from home/user/.subzsh/prompt rename to home/user/.config/zsh/prompt diff --git a/home/user/.config/zsh/sourcer b/home/user/.config/zsh/sourcer new file mode 100644 index 0000000..4041a5b --- /dev/null +++ b/home/user/.config/zsh/sourcer @@ -0,0 +1,22 @@ + +_so () { + [ -f "$1" ] && source "$1" +} + +_so /etc/zsh_command_not_found +_so "$HOME"/.config/zsh/options +_so "$HOME"/.config/zsh/completion +_so "$HOME"/.config/zsh/history +_so "$HOME"/.config/zsh/prompt +_so "$HOME"/.config/zsh/other +_so "$HOME"/.config/zsh/plugin +_so "$HOME"/.config/zsh/aliases + +_so "$HOME"/.config/bash/aliases +_so "$HOME"/.config/bash/completion +_so "$HOME"/.config/bash/export +_so "$HOME"/.config/bash/functions +_so "$HOME"/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + + +_sod "$HOME"/.config/zsh/zshrc.d diff --git a/home/user/.subbash/bashrc.d/.gitkeep b/home/user/.config/zsh/zshrc.d/.gitkeep similarity index 100% rename from home/user/.subbash/bashrc.d/.gitkeep rename to home/user/.config/zsh/zshrc.d/.gitkeep diff --git a/home/user/.subbash/sourcer b/home/user/.subbash/sourcer deleted file mode 100644 index f179460..0000000 --- a/home/user/.subbash/sourcer +++ /dev/null @@ -1,19 +0,0 @@ - -_so () { - [ -r "$1" ] && source "$1" -} - -if [[ $0 == *bash ]]; then - _so "$HOME"/.subbash/export - _so "$HOME"/.subbash/shopt -fi - -if [[ $- == *i* ]]; then - _so "$HOME"/.subbash/prompt - _so "$HOME"/.subbash/aliases - _so "$HOME"/.subbash/functions - _so "$HOME"/.subbash/completion -fi - - -_sod "$HOME"/.subbash/bashrc.d diff --git a/home/user/.subzsh/sourcer b/home/user/.subzsh/sourcer deleted file mode 100644 index a1278e0..0000000 --- a/home/user/.subzsh/sourcer +++ /dev/null @@ -1,22 +0,0 @@ - -_so () { - [ -f "$1" ] && source "$1" -} - -_so /etc/zsh_command_not_found -_so "$HOME"/.subzsh/options -_so "$HOME"/.subzsh/completion -_so "$HOME"/.subzsh/history -_so "$HOME"/.subzsh/prompt -_so "$HOME"/.subzsh/other -_so "$HOME"/.subzsh/plugin -_so "$HOME"/.subzsh/aliases - -_so "$HOME"/.subbash/aliases -_so "$HOME"/.subbash/completion -_so "$HOME"/.subbash/export -_so "$HOME"/.subbash/functions -_so "$HOME"/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh - - -_sod "$HOME"/.subzsh/zshrc.d diff --git a/home/user/.subzsh/zshrc.d/.gitkeep b/home/user/.subzsh/zshrc.d/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/home/user/.zshrc b/home/user/.zshrc index 28b3f7d..d2fea43 100644 --- a/home/user/.zshrc +++ b/home/user/.zshrc @@ -2,8 +2,8 @@ # .zshrc by TheK4n # https://github.com/TheK4n/dotfiles -if [ -f $HOME/.subzsh/sourcer ]; then - source $HOME/.subzsh/sourcer +if [ -f $HOME/.config/zsh/sourcer ]; then + source $HOME/.config/zsh/sourcer fi diff --git a/install b/install index b74c453..0d268f1 100755 --- a/install +++ b/install @@ -9,8 +9,8 @@ readonly SUB="$(pwd)/home/user" declare -A TARGETS=( - ["bash"]=".subbash .bashrc .profile" - ["zsh"]="%bash .subzsh .zshrc .zprofile .zfunc .zlogout .inputrc" + ["bash"]=".config/bash .bashrc .profile" + ["zsh"]="%bash .config/zsh .zshrc .zprofile .zfunc .zlogout .inputrc" ["tmux"]=".tmux.conf" ["alacritty"]=".config/alacritty" ["nvim"]=".config/nvim .local/bin/vim_askpass_helper .local/bin/vim_askpass_helper_python"