From 15cf525fbf4ba70293dfe1551d54f1ad27cece8a Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Thu, 17 Aug 2017 17:24:55 +0200 Subject: [PATCH] updated folder organization --- config/dir/config => cfg/dir/cfg | 0 cfg/dotbot/cfg | 6 ++ config/git/config => cfg/git/cfg | 0 {config => cfg}/git/gitignore_global | 0 config/ssh/config => cfg/ssh/cfg | 0 {config => cfg}/tmux/tmux.extra.conf | 0 {config => cfg}/tmux/tmux.only.conf | 0 .../config.d => cfg/zsh/cfg.d}/00-ohmy.zsh | 0 .../config.d => cfg/zsh/cfg.d}/01-aliases.zsh | 2 +- cfg/zsh/cfg.d/02-functions.zsh | 1 + .../zsh/cfg.d}/03-highlighting.zsh | 0 .../zsh/cfg.d}/04-autosuggest.zsh | 0 .../zsh/cfg.d}/aliases/dcompose.zsh | 0 cfg/zsh/cfg.d/aliases/os.zsh | 3 + .../zsh/cfg.d}/aliases/os/archlinux.zsh | 0 .../zsh/cfg.d}/aliases/os/debian.zsh | 0 .../zsh/cfg.d}/aliases/systemd.zsh | 0 cfg/zsh/cfg.d/export | 19 +++++ .../zsh/cfg.d}/functions/cnf.zsh | 0 cfg/zsh/cfg.d/functions/dircolors.zsh | 1 + .../zsh/cfg.d}/functions/extract.zsh | 0 .../zsh/cfg.d}/functions/fixatwork.zsh | 0 .../zsh/cfg.d}/functions/fzf.zsh | 0 .../zsh/cfg.d}/functions/git.zsh | 0 .../zsh/cfg.d}/functions/gitignore.zsh | 0 .../zsh/cfg.d}/functions/tmux.zsh | 2 +- .../zsh/cfg.d}/functions/transfer.zsh | 0 cfg/zsh/cfg.d/functions/up.zsh | 81 +++++++++++++++++++ .../zsh/cfg.d}/functions/zshmarks.zsh | 0 cfg/zsh/cfg.zsh | 7 ++ config/dotbot/config | 6 -- config/zsh/config | 20 ----- config/zsh/config.d/02-functions.zsh | 1 - config/zsh/config.d/aliases/os.zsh | 3 - config/zsh/config.d/functions/dircolors.zsh | 1 - install | 3 +- 36 files changed, 121 insertions(+), 35 deletions(-) rename config/dir/config => cfg/dir/cfg (100%) create mode 100644 cfg/dotbot/cfg rename config/git/config => cfg/git/cfg (100%) rename {config => cfg}/git/gitignore_global (100%) rename config/ssh/config => cfg/ssh/cfg (100%) rename {config => cfg}/tmux/tmux.extra.conf (100%) rename {config => cfg}/tmux/tmux.only.conf (100%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/00-ohmy.zsh (100%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/01-aliases.zsh (64%) create mode 100644 cfg/zsh/cfg.d/02-functions.zsh rename {config/zsh/config.d => cfg/zsh/cfg.d}/03-highlighting.zsh (100%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/04-autosuggest.zsh (100%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/aliases/dcompose.zsh (100%) create mode 100644 cfg/zsh/cfg.d/aliases/os.zsh rename {config/zsh/config.d => cfg/zsh/cfg.d}/aliases/os/archlinux.zsh (100%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/aliases/os/debian.zsh (100%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/aliases/systemd.zsh (100%) create mode 100644 cfg/zsh/cfg.d/export rename {config/zsh/config.d => cfg/zsh/cfg.d}/functions/cnf.zsh (100%) create mode 100644 cfg/zsh/cfg.d/functions/dircolors.zsh rename {config/zsh/config.d => cfg/zsh/cfg.d}/functions/extract.zsh (100%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/functions/fixatwork.zsh (100%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/functions/fzf.zsh (100%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/functions/git.zsh (100%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/functions/gitignore.zsh (100%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/functions/tmux.zsh (98%) rename {config/zsh/config.d => cfg/zsh/cfg.d}/functions/transfer.zsh (100%) create mode 100644 cfg/zsh/cfg.d/functions/up.zsh rename {config/zsh/config.d => cfg/zsh/cfg.d}/functions/zshmarks.zsh (100%) create mode 100644 cfg/zsh/cfg.zsh delete mode 100644 config/dotbot/config delete mode 100644 config/zsh/config delete mode 100644 config/zsh/config.d/02-functions.zsh delete mode 100644 config/zsh/config.d/aliases/os.zsh delete mode 100644 config/zsh/config.d/functions/dircolors.zsh diff --git a/config/dir/config b/cfg/dir/cfg similarity index 100% rename from config/dir/config rename to cfg/dir/cfg diff --git a/cfg/dotbot/cfg b/cfg/dotbot/cfg new file mode 100644 index 0000000..1510c2b --- /dev/null +++ b/cfg/dotbot/cfg @@ -0,0 +1,6 @@ +- clean: ['~'] + +- link: + ~/.gitconfig: cfg/git/cfg + ~/.zshrc: cfg/zsh/cfg.zsh + ~/.ssh/config: cfg/ssh/cfg diff --git a/config/git/config b/cfg/git/cfg similarity index 100% rename from config/git/config rename to cfg/git/cfg diff --git a/config/git/gitignore_global b/cfg/git/gitignore_global similarity index 100% rename from config/git/gitignore_global rename to cfg/git/gitignore_global diff --git a/config/ssh/config b/cfg/ssh/cfg similarity index 100% rename from config/ssh/config rename to cfg/ssh/cfg diff --git a/config/tmux/tmux.extra.conf b/cfg/tmux/tmux.extra.conf similarity index 100% rename from config/tmux/tmux.extra.conf rename to cfg/tmux/tmux.extra.conf diff --git a/config/tmux/tmux.only.conf b/cfg/tmux/tmux.only.conf similarity index 100% rename from config/tmux/tmux.only.conf rename to cfg/tmux/tmux.only.conf diff --git a/config/zsh/config.d/00-ohmy.zsh b/cfg/zsh/cfg.d/00-ohmy.zsh similarity index 100% rename from config/zsh/config.d/00-ohmy.zsh rename to cfg/zsh/cfg.d/00-ohmy.zsh diff --git a/config/zsh/config.d/01-aliases.zsh b/cfg/zsh/cfg.d/01-aliases.zsh similarity index 64% rename from config/zsh/config.d/01-aliases.zsh rename to cfg/zsh/cfg.d/01-aliases.zsh index 35ed02c..4b105d8 100644 --- a/config/zsh/config.d/01-aliases.zsh +++ b/cfg/zsh/cfg.d/01-aliases.zsh @@ -4,4 +4,4 @@ alias mv='mv -i' alias la='ls -lAh' clearall () { clear; printf '\033[3J' } -for file in ${DOTCONFD}/aliases/*.zsh; do source $file; done +for file in ${DOTCFGD}/aliases/*.zsh; do source $file; done diff --git a/cfg/zsh/cfg.d/02-functions.zsh b/cfg/zsh/cfg.d/02-functions.zsh new file mode 100644 index 0000000..0700d90 --- /dev/null +++ b/cfg/zsh/cfg.d/02-functions.zsh @@ -0,0 +1 @@ +for file in ${DOTCFGD}/functions/*.zsh; do source $file; done diff --git a/config/zsh/config.d/03-highlighting.zsh b/cfg/zsh/cfg.d/03-highlighting.zsh similarity index 100% rename from config/zsh/config.d/03-highlighting.zsh rename to cfg/zsh/cfg.d/03-highlighting.zsh diff --git a/config/zsh/config.d/04-autosuggest.zsh b/cfg/zsh/cfg.d/04-autosuggest.zsh similarity index 100% rename from config/zsh/config.d/04-autosuggest.zsh rename to cfg/zsh/cfg.d/04-autosuggest.zsh diff --git a/config/zsh/config.d/aliases/dcompose.zsh b/cfg/zsh/cfg.d/aliases/dcompose.zsh similarity index 100% rename from config/zsh/config.d/aliases/dcompose.zsh rename to cfg/zsh/cfg.d/aliases/dcompose.zsh diff --git a/cfg/zsh/cfg.d/aliases/os.zsh b/cfg/zsh/cfg.d/aliases/os.zsh new file mode 100644 index 0000000..80a0610 --- /dev/null +++ b/cfg/zsh/cfg.d/aliases/os.zsh @@ -0,0 +1,3 @@ +# Aliases for OS +if type pacman &>/dev/null; then source ${DOTCFGD}/aliases/os/archlinux.zsh; fi +if type apt-get &>/dev/null; then source ${DOTCFGD}/aliases/os/debian.zsh; fi diff --git a/config/zsh/config.d/aliases/os/archlinux.zsh b/cfg/zsh/cfg.d/aliases/os/archlinux.zsh similarity index 100% rename from config/zsh/config.d/aliases/os/archlinux.zsh rename to cfg/zsh/cfg.d/aliases/os/archlinux.zsh diff --git a/config/zsh/config.d/aliases/os/debian.zsh b/cfg/zsh/cfg.d/aliases/os/debian.zsh similarity index 100% rename from config/zsh/config.d/aliases/os/debian.zsh rename to cfg/zsh/cfg.d/aliases/os/debian.zsh diff --git a/config/zsh/config.d/aliases/systemd.zsh b/cfg/zsh/cfg.d/aliases/systemd.zsh similarity index 100% rename from config/zsh/config.d/aliases/systemd.zsh rename to cfg/zsh/cfg.d/aliases/systemd.zsh diff --git a/cfg/zsh/cfg.d/export b/cfg/zsh/cfg.d/export new file mode 100644 index 0000000..c18874c --- /dev/null +++ b/cfg/zsh/cfg.d/export @@ -0,0 +1,19 @@ +# For Dotfiles +export DOTFLS="${HOME}/dotfiles" +export DOTLIB="${DOTFLS}/lib" +export DOTBIN="${DOTFLS}/bin" +export DOTCFG="${DOTFLS}/cfg" +export DOTCFGD="${DOTCFG}/zsh/cfg.d" + +# Path +path+=(${DOTBIN}) +path+=(/opt/android-sdk/build-tools/26.0.1) +path+=(${HOME}/.gem/2.4.0/bin) +export PATH + +# Editor Setting +export EDITOR='vim' + +# Completions Paths +fpath+=(${DOTLIB}/completions/src) +fpath+=(${DOTLIB}/local) diff --git a/config/zsh/config.d/functions/cnf.zsh b/cfg/zsh/cfg.d/functions/cnf.zsh similarity index 100% rename from config/zsh/config.d/functions/cnf.zsh rename to cfg/zsh/cfg.d/functions/cnf.zsh diff --git a/cfg/zsh/cfg.d/functions/dircolors.zsh b/cfg/zsh/cfg.d/functions/dircolors.zsh new file mode 100644 index 0000000..749c30d --- /dev/null +++ b/cfg/zsh/cfg.d/functions/dircolors.zsh @@ -0,0 +1 @@ +eval `dircolors ${DOTCFG}/dir/cfg` diff --git a/config/zsh/config.d/functions/extract.zsh b/cfg/zsh/cfg.d/functions/extract.zsh similarity index 100% rename from config/zsh/config.d/functions/extract.zsh rename to cfg/zsh/cfg.d/functions/extract.zsh diff --git a/config/zsh/config.d/functions/fixatwork.zsh b/cfg/zsh/cfg.d/functions/fixatwork.zsh similarity index 100% rename from config/zsh/config.d/functions/fixatwork.zsh rename to cfg/zsh/cfg.d/functions/fixatwork.zsh diff --git a/config/zsh/config.d/functions/fzf.zsh b/cfg/zsh/cfg.d/functions/fzf.zsh similarity index 100% rename from config/zsh/config.d/functions/fzf.zsh rename to cfg/zsh/cfg.d/functions/fzf.zsh diff --git a/config/zsh/config.d/functions/git.zsh b/cfg/zsh/cfg.d/functions/git.zsh similarity index 100% rename from config/zsh/config.d/functions/git.zsh rename to cfg/zsh/cfg.d/functions/git.zsh diff --git a/config/zsh/config.d/functions/gitignore.zsh b/cfg/zsh/cfg.d/functions/gitignore.zsh similarity index 100% rename from config/zsh/config.d/functions/gitignore.zsh rename to cfg/zsh/cfg.d/functions/gitignore.zsh diff --git a/config/zsh/config.d/functions/tmux.zsh b/cfg/zsh/cfg.d/functions/tmux.zsh similarity index 98% rename from config/zsh/config.d/functions/tmux.zsh rename to cfg/zsh/cfg.d/functions/tmux.zsh index a3dac50..22ae08b 100644 --- a/config/zsh/config.d/functions/tmux.zsh +++ b/cfg/zsh/cfg.d/functions/tmux.zsh @@ -38,7 +38,7 @@ if which tmux &> /dev/null # Get the absolute path to the current directory - local zsh_tmux_plugin_path=${DOTCONF}/tmux + local zsh_tmux_plugin_path=${DOTCFG}/tmux # Determine if the terminal supports 256 colors if [[ `tput colors` == "256" ]] diff --git a/config/zsh/config.d/functions/transfer.zsh b/cfg/zsh/cfg.d/functions/transfer.zsh similarity index 100% rename from config/zsh/config.d/functions/transfer.zsh rename to cfg/zsh/cfg.d/functions/transfer.zsh diff --git a/cfg/zsh/cfg.d/functions/up.zsh b/cfg/zsh/cfg.d/functions/up.zsh new file mode 100644 index 0000000..c8da6b4 --- /dev/null +++ b/cfg/zsh/cfg.d/functions/up.zsh @@ -0,0 +1,81 @@ +__updir() { + if [[ "$1" == "/" || -z "$1" || -z "$2" ]]; then + return + fi + + local p="$(dirname $1)" + local a="$(basename $p)" + local b="$(basename $2)" + + if [[ -z "$a" || -z "$b" ]]; then + return + fi + + if [[ "$a" == "$b"* ]]; then + echo "$p" + return + fi + + __updir "$p" "$2" +} + +__upnum() { + if [[ -z "$1" || -z "$2" || ! "$2" =~ ^[0-9]+$ ]]; then + return + fi + + local p="$1" + local i="$2" + + while (( i-- )); do + p="$(dirname $p)" + done + + echo "$p" +} + +_up() { + local p="$(dirname $PWD)" + local w="${COMP_WORDS[COMP_CWORD]}" + + COMPREPLY=( $(IFS=';' compgen -S/ -W "${p//\//;}" -- "$w") ) +} + +up() { + # up one + if (( ! $# )); then + cd .. + return + fi + + # up dir + local d="$(__updir "$PWD" "$1")" + + if [[ -d "$d" ]]; then + cd "$d" + return + fi + + # up num + local n="$(__upnum "$PWD" "$1")" + + if [[ -d "$n" ]]; then + cd "$n" + return + fi + + # fallback + if [[ $1 == - || -d $1 ]]; then + cd $1 + return + fi + + # usage + echo -e "usage: up [dir|num|-]\npwd: $PWD" +} + + +autoload -U +X bashcompinit && bashcompinit + +# tab-completion +complete -o nospace -F _up up diff --git a/config/zsh/config.d/functions/zshmarks.zsh b/cfg/zsh/cfg.d/functions/zshmarks.zsh similarity index 100% rename from config/zsh/config.d/functions/zshmarks.zsh rename to cfg/zsh/cfg.d/functions/zshmarks.zsh diff --git a/cfg/zsh/cfg.zsh b/cfg/zsh/cfg.zsh new file mode 100644 index 0000000..99f590a --- /dev/null +++ b/cfg/zsh/cfg.zsh @@ -0,0 +1,7 @@ +# Source all files +source ${HOME}/dotfiles/cfg/zsh/cfg.d/export +for file in ${DOTCFGD}/*.zsh; do source $file; done + +# Prompt +autoload -U promptinit && promptinit +prompt filthy diff --git a/config/dotbot/config b/config/dotbot/config deleted file mode 100644 index 68832f6..0000000 --- a/config/dotbot/config +++ /dev/null @@ -1,6 +0,0 @@ -- clean: ['~'] - -- link: - ~/.gitconfig: config/git/config - ~/.zshrc: config/zsh/config - ~/.ssh/config: config/ssh/config diff --git a/config/zsh/config b/config/zsh/config deleted file mode 100644 index 51a9526..0000000 --- a/config/zsh/config +++ /dev/null @@ -1,20 +0,0 @@ -export DOTFILES="${HOME}/dotfiles" -export DOTLIB="${DOTFILES}/lib" -export DOTBIN="${DOTFILES}/bin" -export DOTCONF="${DOTFILES}/config" -export DOTCONFD="${DOTCONF}/zsh/config.d" - -# Export Path -export PATH="${DOTBIN}:/opt/android-sdk/build-tools/26.0.1:${PATH}" - -# Export Editor -export EDITOR='nano' - -# Completions Paths -fpath+=(${DOTLIB}/completions/src ${DOTLIB}/local) - -for file in ${DOTCONFD}/*.zsh; do source $file; done - -# Prompt -autoload -U promptinit && promptinit -prompt filthy diff --git a/config/zsh/config.d/02-functions.zsh b/config/zsh/config.d/02-functions.zsh deleted file mode 100644 index 7aa652d..0000000 --- a/config/zsh/config.d/02-functions.zsh +++ /dev/null @@ -1 +0,0 @@ -for file in ${DOTCONFD}/functions/*.zsh; do source $file; done diff --git a/config/zsh/config.d/aliases/os.zsh b/config/zsh/config.d/aliases/os.zsh deleted file mode 100644 index b61d60e..0000000 --- a/config/zsh/config.d/aliases/os.zsh +++ /dev/null @@ -1,3 +0,0 @@ -# Aliases for OS -if type pacman &>/dev/null; then source ${DOTCONFD}/aliases/os/archlinux.zsh; fi -if type apt-get &>/dev/null; then source ${DOTCONFD}/aliases/os/debian.zsh; fi diff --git a/config/zsh/config.d/functions/dircolors.zsh b/config/zsh/config.d/functions/dircolors.zsh deleted file mode 100644 index 908b692..0000000 --- a/config/zsh/config.d/functions/dircolors.zsh +++ /dev/null @@ -1 +0,0 @@ -eval `dircolors ${DOTCONF}/dir/config` diff --git a/install b/install index ae08344..c715201 100755 --- a/install +++ b/install @@ -5,9 +5,8 @@ BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd ${BASEDIR} git submodule update --init --recursive - echo "Installing Dotbot and Linking Files" -${BASEDIR}/lib/dotbot/bin/dotbot -d ${BASEDIR} -c config/dotbot/config ${@} +${BASEDIR}/lib/dotbot/bin/dotbot -d ${BASEDIR} -c cfg/dotbot/cfg ${@} echo "Installing ZUnit" cd ${BASEDIR}/lib/zunit