diff options
| -rw-r--r-- | bash/aliases.sh (renamed from shell/aliases.sh) | 0 | ||||
| -rw-r--r-- | bash/env.sh (renamed from shell/env.sh) | 2 | ||||
| -rw-r--r-- | bashrc | 8 | ||||
| -rw-r--r-- | install.conf.yaml | 32 | ||||
| -rwxr-xr-x | wsl/gpg.sh (renamed from shell/gpg.sh) | 0 | ||||
| -rw-r--r-- | wsl/wsl.sh (renamed from shell/wsl.sh) | 8 | ||||
| -rw-r--r-- | zshrc | 18 |
7 files changed, 32 insertions, 36 deletions
diff --git a/shell/aliases.sh b/bash/aliases.sh index 99104e7..99104e7 100644 --- a/shell/aliases.sh +++ b/bash/aliases.sh diff --git a/shell/env.sh b/bash/env.sh index 4dd479d..7988142 100644 --- a/shell/env.sh +++ b/bash/env.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash +export DOTFILES=~/dotfiles export GPG_TTY=$(tty) export BROWSER=wslview export STARSHIP_LOG="error" export BAT_CONFIG_PATH="${DOTFILES}/bat.conf" export MANPAGER="sh -c 'col -bx | bat -l man -p'" -export FZF_BASE="${HOME}/.fzf" export FZF_PREVIEW_COMMAND="bat --style=numbers,changes --wrap never --color always {} || cat {} || tree -C {}" export FZF_CTRL_T_OPTS="--min-height 30 --preview-window down:60% --preview-window noborder --preview '($FZF_PREVIEW_COMMAND) 2> /dev/null'" @@ -1,16 +1,12 @@ #!/usr/bin/env bash -export DOTFILES="${HOME}/dotfiles" +source ~/.profile comp_dir=${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion/completions if [ -d "$comp_dir" ]; then for f in "$comp_dir"/*; do source $f; done; fi -if [ -d "~/.bash.d" ]; then for f in ~/.bash.d/*; do source $f; done; fi +if [ -d "~/.bash" ]; then for f in ~/.bash/*; do source $f; done; fi -source $DOTFILES/shell/env.sh -source $DOTFILES/shell/aliases.sh -[ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/shell/wsl.sh -[ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/shell/gpg.sh eval "$(starship init bash)" diff --git a/install.conf.yaml b/install.conf.yaml index e6cd3d0..88d75b1 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -12,8 +12,8 @@ - create: - ~/.local/share/bash-completion/completions - ~/.local/share/zsh/site-functions - - ~/.bash.d - - ~/.zsh.d + - ~/.bash + - ~/.zsh - shell: - description: Installing submodules @@ -47,8 +47,8 @@ rm -rf $td && ( curl -sL https://raw.githubusercontent.com/junegunn/fzf/master/shell/completion.bash >~/.local/share/bash-completion/completions/fzf; curl -sL https://raw.githubusercontent.com/junegunn/fzf/master/shell/completion.zsh >~/.local/share/zsh/site-functions/_fzf; - curl -sL https://raw.githubusercontent.com/junegunn/fzf/master/shell/key-bindings.bash >~/.bash.d/fzf-key-bindings.sh; - curl -sL https://raw.githubusercontent.com/junegunn/fzf/master/shell/key-bindings.zsh >~/.zsh.d/fzf-key-bindings.zsh; + curl -sL https://raw.githubusercontent.com/junegunn/fzf/master/shell/key-bindings.bash >~/.bash/fzf-key-bindings.sh; + curl -sL https://raw.githubusercontent.com/junegunn/fzf/master/shell/key-bindings.zsh >~/.zsh/fzf-key-bindings.zsh; ) - description: Installing bat @@ -106,19 +106,39 @@ - description: Installing zsh-autosuggestions command: repo=https://github.com/zsh-users/zsh-autosuggestions && - target=~/.zsh.d/zsh-autosuggestions && + target=~/.zsh/zsh-autosuggestions && rm -rf $target && git clone $repo $target - description: Installing zsh-syntax-highlighting command: repo=https://github.com/zsh-users/zsh-syntax-highlighting - target=~/.zsh.d/zsh-syntax-highlighting && + target=~/.zsh/zsh-syntax-highlighting && rm -rf $target && git clone $repo $target - link: + # shell ~/.bashrc: ~/.zshrc: + ~/.bash: + glob: true + path: bash/* + ~/.zsh: + glob: true + path: zsh/* + ~/.zsh/env.sh: bash/env.sh + ~/.zsh/aliases.sh: bash/aliases.sh + + # wsl + ~/.bash/: + glob: true + if: '[ -n "${WSL_DISTRO_NAME+1}" ]' + path: wsl/* + ~/.zsh/: + glob: true + if: '[ -n "${WSL_DISTRO_NAME+1}" ]' + path: wsl/* + ~/.config/starship.toml: starship.toml ~/.config/alacritty.yml: alacritty.yml ~/.gitconfig: diff --git a/shell/gpg.sh b/wsl/gpg.sh index 5fa3ec2..5fa3ec2 100755 --- a/shell/gpg.sh +++ b/wsl/gpg.sh diff --git a/shell/wsl.sh b/wsl/wsl.sh index 5e1e186..2287f15 100644 --- a/shell/wsl.sh +++ b/wsl/wsl.sh @@ -2,14 +2,6 @@ WINHOME="/mnt/c/Users/$USER" [ "$PWD" = "$WINHOME" ] && cd -# XDG Specs -export XDG_DESKTOP_DIR="$WINHOME/Desktop" -export XDG_DOCUMENTS_DIR="$WINHOME/Documents" -export XDG_DOWNLOAD_DIR="$WINHOME/Downloads" -export XDG_MUSIC_DIR="$WINHOME/Music" -export XDG_PICTURES_DIR="$WINHOME/Pictures" -export XDG_TEMPLATES_DIR="$WINHOME/Templates" -export XDG_VIDEOS_DIR="$WINHOME/Videos" export EDITOR="code --wait" export DOCKER_HOST=${DOCKER_HOST:-tcp://0.0.0.0:2375} @@ -1,20 +1,8 @@ #!/usr/bin/env zsh -export DOTFILES="${HOME}/dotfiles" -export ZDOTDIR=~/.zsh.d - fpath=(~/.local/share/zsh/site-functions "${fpath[@]}") -if [ -d "$ZDOTDIR" ]; then for f in $ZDOTDIR/*; do source $f; done; fi - -source $DOTFILES/shell/env.sh - -[ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/shell/wsl.sh -[ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/shell/gpg.sh - -source $DOTFILES/shell/aliases.sh -source $DOTFILES/zsh/setopt.zsh -source $DOTFILES/zsh/keybindings.zsh +if [ -d "${HOME}/.zsh" ]; then for f in ~/.zsh/*; do source $f; done; fi eval "$(starship init zsh)" @@ -30,5 +18,5 @@ precmd_functions+=(set_win_title) autoload -U compinit compinit -i -source $ZDOTDIR/zsh-autosuggestions/zsh-autosuggestions.zsh -source $ZDOTDIR/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh +source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh |