diff --git a/powerline_gitstatus/colorschemes/default.json b/.config/powerline/colorschemes/default.json similarity index 100% rename from powerline_gitstatus/colorschemes/default.json rename to .config/powerline/colorschemes/default.json diff --git a/powerline_gitstatus/config.json b/.config/powerline/config.json similarity index 100% rename from powerline_gitstatus/config.json rename to .config/powerline/config.json diff --git a/powerline_gitstatus/themes/shell/default.json b/.config/powerline/themes/shell/default.json similarity index 100% rename from powerline_gitstatus/themes/shell/default.json rename to .config/powerline/themes/shell/default.json diff --git a/powerline_gitstatus/themes/shell/default_right.json b/.config/powerline/themes/shell/default_right.json similarity index 100% rename from powerline_gitstatus/themes/shell/default_right.json rename to .config/powerline/themes/shell/default_right.json diff --git a/powerline_gitstatus/themes/vim/default.json b/.config/powerline/themes/vim/default.json similarity index 100% rename from powerline_gitstatus/themes/vim/default.json rename to .config/powerline/themes/vim/default.json diff --git a/.gitignore b/.gitignore index 97236a5..da41e42 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # zshrc.d -zshrc.d/*.zsh +.zshrc.d/*.zsh # ---> Linux *~ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..b2b0450 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "bin"] + path = bin + url = https://git.mount-mockery.de/dirk/bin.git diff --git a/ssh_config b/.ssh/config similarity index 100% rename from ssh_config rename to .ssh/config diff --git a/tmux.conf b/.tmux.conf similarity index 100% rename from tmux.conf rename to .tmux.conf diff --git a/vim_skeletons/class.py b/.vim/skeletons/class.py similarity index 100% rename from vim_skeletons/class.py rename to .vim/skeletons/class.py diff --git a/vimrc b/.vimrc similarity index 100% rename from vimrc rename to .vimrc diff --git a/zshrc b/.zshrc similarity index 99% rename from zshrc rename to .zshrc index 56453ae..f78522f 100644 --- a/zshrc +++ b/.zshrc @@ -112,7 +112,7 @@ fi # You may want to put all your additions into a folder file like # ~/.config_files/zshrc.d, instead of adding them here directly. -for file in ~/.config_files/zshrc.d/*.zsh; do +for file in ~/.zshrc.d/*.zsh; do source "$file" done diff --git a/zshrc.d/__available__/bin.zsh b/.zshrc.d/__available__/bin.zsh similarity index 100% rename from zshrc.d/__available__/bin.zsh rename to .zshrc.d/__available__/bin.zsh diff --git a/zshrc.d/__available__/dd.zsh b/.zshrc.d/__available__/dd.zsh similarity index 100% rename from zshrc.d/__available__/dd.zsh rename to .zshrc.d/__available__/dd.zsh diff --git a/zshrc.d/__available__/less.zsh b/.zshrc.d/__available__/less.zsh similarity index 100% rename from zshrc.d/__available__/less.zsh rename to .zshrc.d/__available__/less.zsh diff --git a/zshrc.d/__available__/neofetch.zsh b/.zshrc.d/__available__/neofetch.zsh similarity index 100% rename from zshrc.d/__available__/neofetch.zsh rename to .zshrc.d/__available__/neofetch.zsh diff --git a/zshrc.d/__available__/prompt_adam1.zsh b/.zshrc.d/__available__/prompt_adam1.zsh similarity index 100% rename from zshrc.d/__available__/prompt_adam1.zsh rename to .zshrc.d/__available__/prompt_adam1.zsh diff --git a/zshrc.d/__available__/prompt_color.zsh b/.zshrc.d/__available__/prompt_color.zsh similarity index 100% rename from zshrc.d/__available__/prompt_color.zsh rename to .zshrc.d/__available__/prompt_color.zsh diff --git a/zshrc.d/__available__/prompt_kali.zsh b/.zshrc.d/__available__/prompt_kali.zsh similarity index 100% rename from zshrc.d/__available__/prompt_kali.zsh rename to .zshrc.d/__available__/prompt_kali.zsh diff --git a/zshrc.d/__available__/prompt_powerline.zsh b/.zshrc.d/__available__/prompt_powerline.zsh similarity index 100% rename from zshrc.d/__available__/prompt_powerline.zsh rename to .zshrc.d/__available__/prompt_powerline.zsh diff --git a/zshrc.d/__available__/ssh.zsh b/.zshrc.d/__available__/ssh.zsh similarity index 100% rename from zshrc.d/__available__/ssh.zsh rename to .zshrc.d/__available__/ssh.zsh diff --git a/zshrc.d/__available__/tmux.zsh b/.zshrc.d/__available__/tmux.zsh similarity index 100% rename from zshrc.d/__available__/tmux.zsh rename to .zshrc.d/__available__/tmux.zsh diff --git a/.zshrc.d/my_defaults b/.zshrc.d/my_defaults new file mode 100755 index 0000000..2e457f7 --- /dev/null +++ b/.zshrc.d/my_defaults @@ -0,0 +1,7 @@ +ln -vs __available__/bin.zsh +ln -vs __available__/dd.zsh +ln -vs __available__/less.zsh +ln -vs __available__/neofetch.zsh +ln -vs __available__/prompt_color.zsh +ln -vs __available__/prompt_powerline.zsh + diff --git a/.zshrc.d/root_defaults b/.zshrc.d/root_defaults new file mode 100755 index 0000000..f1b37ab --- /dev/null +++ b/.zshrc.d/root_defaults @@ -0,0 +1,4 @@ +ln -vs __available__/less.zsh +ln -vs __available__/prompt_color.zsh +ln -vs __available__/prompt_powerline.zsh + diff --git a/add_bin b/add_bin new file mode 100755 index 0000000..3cdbb3b --- /dev/null +++ b/add_bin @@ -0,0 +1,12 @@ +#!/bin/zsh +# +SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" + +if [[ (-e ~/bin) ]]; then + echo "A ssh configuration already exists (~/bin)" + echo "Remove this configuration and start the script again" +else + echo "Creating link" + ln -vs $SCRIPTPATH/bin ~/bin +fi + diff --git a/add_powerline b/add_powerline new file mode 100755 index 0000000..f0550be --- /dev/null +++ b/add_powerline @@ -0,0 +1,12 @@ +#!/bin/zsh +# +SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" + +if [[ (-e ~/.config/powerline) ]]; then + echo "A powerline configuration already exists (~/.config/powerline)" + echo "Remove this configuration and start the script again" +else + echo "Creating link" + ln -vs $SCRIPTPATH/.config/powerline ~/.config/powerline +fi + diff --git a/add_ssh_config b/add_ssh_config new file mode 100755 index 0000000..58e4ab2 --- /dev/null +++ b/add_ssh_config @@ -0,0 +1,12 @@ +#!/bin/zsh +# +SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" + +if [[ (-e ~/.ssh/config) ]]; then + echo "A ssh configuration already exists (~/.ssh/config)" + echo "Remove this configuration and start the script again" +else + echo "Creating link" + ln -vs $SCRIPTPATH/.ssh/config ~/.ssh/config +fi + diff --git a/add_tmux b/add_tmux new file mode 100755 index 0000000..6a7fcab --- /dev/null +++ b/add_tmux @@ -0,0 +1,12 @@ +#!/bin/zsh +# +SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" + +if [[ (-e ~/.tmux.conf) ]]; then + echo "A tmux configuration already exists (~/.tmux.conf)" + echo "Remove this configuration and start the script again" +else + echo "Creating link" + ln -vs $SCRIPTPATH/.tmux.conf ~/.tmux.conf +fi + diff --git a/add_vim b/add_vim new file mode 100755 index 0000000..01966ee --- /dev/null +++ b/add_vim @@ -0,0 +1,13 @@ +#!/bin/zsh +# +SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" + +if [[ (-e ~/.vimrc || -e ~/.vim/skeletons) ]]; then + echo "A vim configuration already exists (~/.vimrc or ~/.vim/skeletons)" + echo "Remove this configuration and start the script again" +else + echo "Creating base links" + ln -vs $SCRIPTPATH/.vimrc ~/.vimrc + ln -vs $SCRIPTPATH/.vim/skeletons ~/.vim/skeletons +fi + diff --git a/add_zshrc b/add_zshrc new file mode 100755 index 0000000..5eaf5fc --- /dev/null +++ b/add_zshrc @@ -0,0 +1,13 @@ +#!/bin/zsh +# +SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" + +if [[ (-e ~/.zshrc || -e ~/.zshrc.d) ]]; then + echo "A zsh configuration already exists (~/.zshrc or ~/.zshrc.d)" + echo "Remove this configuration and start the script again" +else + echo "Creating base links" + ln -vs $SCRIPTPATH/.zshrc ~/.zshrc + ln -vs $SCRIPTPATH/.zshrc.d ~/.zshrc.d +fi + diff --git a/bin b/bin new file mode 160000 index 0000000..c04d69d --- /dev/null +++ b/bin @@ -0,0 +1 @@ +Subproject commit c04d69dab8b8a0e8a62e4822fb580ba69f045e9b diff --git a/zshrc.d/my_defaults b/zshrc.d/my_defaults deleted file mode 100755 index 84bfec8..0000000 --- a/zshrc.d/my_defaults +++ /dev/null @@ -1,7 +0,0 @@ -ln -s __available__/bin.zsh -ln -s __available__/dd.zsh -ln -s __available__/less.zsh -ln -s __available__/neofetch.zsh -ln -s __available__/prompt_color.zsh -ln -s __available__/prompt_powerline.zsh - diff --git a/zshrc.d/root_defaults b/zshrc.d/root_defaults deleted file mode 100755 index 0f9d9ae..0000000 --- a/zshrc.d/root_defaults +++ /dev/null @@ -1,4 +0,0 @@ -ln -s __available__/less.zsh -ln -s __available__/prompt_color.zsh -ln -s __available__/prompt_powerline.zsh -