move everything zsh-related to zsh/ directory

This commit is contained in:
Dmytro Meleshko 2019-04-22 18:07:02 +03:00
parent 5f22915211
commit 33e4ffe2cc
19 changed files with 12 additions and 11 deletions

5
.gitignore vendored
View File

@ -1,3 +1,4 @@
/custom
/cache
/zsh/custom
/zsh/cache
!/zsh/cache/.gitkeep
*.pyc

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "zgen"]
path = zgen
path = zsh/zgen
url = https://github.com/tarjoilija/zgen.git

View File

@ -15,7 +15,7 @@ install_dotfile() {
for zsh_file_name in zshrc; do
install_dotfile "$HOME/.$zsh_file_name" <<EOF
#!/usr/bin/env zsh
source "$PWD/$zsh_file_name"
source "$PWD/zsh/$zsh_file_name"
EOF
done
unset zsh_file_name

View File

@ -32,5 +32,5 @@ lazy_load() {
}
welcome() {
python "$DOTFILES_PATH/welcome/main.py"
python "$ZSH_DOTFILES/welcome/main.py"
}

View File

@ -38,7 +38,7 @@ path=("$GOPATH/bin" "${path[@]}")
path=(~/bin ~/.local/bin "${path[@]}")
# add my completions
fpath=("$DOTFILES_PATH/completions" "${fpath[@]}")
fpath=("$ZSH_DOTFILES/completions" "${fpath[@]}")
# check for Rust installed via rustup
if rust_sysroot="$(~/.cargo/bin/rustc --print sysroot 2> /dev/null)"; then

View File

View File

@ -22,7 +22,7 @@ configure_oh_my_zsh() {
}
configure_syntax_highlighting() {
FAST_WORK_DIR="$DOTFILES_PATH/cache"
FAST_WORK_DIR="$ZSH_DOTFILES/cache"
}
configure_prompt() {
@ -62,7 +62,7 @@ configure_oh_my_zsh
configure_syntax_highlighting
configure_prompt
source "$DOTFILES_PATH/zgen/zgen.zsh"
source "$ZSH_DOTFILES/zgen/zgen.zsh"
if ! zgen saved; then
zgen oh-my-zsh

View File

@ -1,10 +1,10 @@
#!/usr/bin/env zsh
DOTFILES_PATH="${0:h}"
ZSH_DOTFILES="${0:h}"
for script in functions path exports zgen aliases palette theme; do
source "$DOTFILES_PATH/zsh/$script.zsh"
source_if_exists "$DOTFILES_PATH/custom/$script.zsh"
source "$ZSH_DOTFILES/$script.zsh"
source_if_exists "$ZSH_DOTFILES/custom/$script.zsh"
done
if command_exists rbenv; then