diff options
| -rw-r--r-- | README.md | 16 | ||||
| -rw-r--r-- | bashrc | 12 | ||||
| -rw-r--r-- | sh/aliases.sh (renamed from shell/aliases.sh) | 0 | ||||
| -rw-r--r-- | sh/gpg.sh (renamed from shell/gpg.sh) | 0 | ||||
| -rw-r--r-- | sh/profile.sh (renamed from shell/profile.sh) | 0 | ||||
| -rw-r--r-- | sh/wsl.sh (renamed from shell/wsl.sh) | 0 | ||||
| -rwxr-xr-x | wsl.install | 12 | ||||
| -rw-r--r-- | zsh/aliases.zsh | 2 | ||||
| -rw-r--r-- | zsh/wsl.zsh | 4 | ||||
| -rw-r--r-- | zshrc | 3 |
10 files changed, 31 insertions, 18 deletions
@@ -35,20 +35,20 @@ Configs #### Zsh Configuration -- [zshrc](zshrc) - Zsh profile (sources [profile.sh](shell/profile.sh) & [zsh/*](zsh)) -- [p10k.zsh](p10k.zsh) - p10k theme config -- [shell/](shell) - Posix shell configs, shared (sourced) by different shell profiles - - [aliases.sh](shell/aliases.sh) - Alias definitions shared between shells - - [gpg.sh](shell/gpg.sh) - Sets up the GPG agent bridges between wsl and windows - - [profile.sh](shell/profile.sh) - Exports and Path additions shared between shells - - [wsl.sh](shell/wsl.sh) - WSL2 specific config (sources [gpg.sh](shell/gpg.sh)) +- [zshrc](zshrc) - Zsh profile (sources [profile.sh](sh/profile.sh) & [zsh/*](zsh)) +- [starship.toml](starship.toml) - [starship](https://starship.rs/) cross-shell theme config +- [sh/](sh) - Posix compliant cross-shell configs + - [aliases.sh](sh/aliases.sh) - Alias definitions shared between shells + - [gpg.sh](sh/gpg.sh) - Sets up the GPG agent bridges between wsl and windows + - [profile.sh](sh/profile.sh) - Exports and Path additions shared between shells + - [wsl.sh](sh/wsl.sh) - WSL2 specific config (sources [gpg.sh](sh/gpg.sh)) - [zsh/](zsh) - Zsh configs - [aliases.zsh](zsh/aliases.zsh) - Alias definitions (sources [aliases.sh](zsh/aliases.zsh)) - [antigen.zsh](zsh/antigen.zsh) - Loads Antigen plugins and theme - [keybindings.zsh](zsh/keybindings.zsh) - Keybindings and related functions - [prompt.zsh](zsh/prompt.zsh) - Prompt configuration and prompt theme settings - [setopt.zsh](zsh/setopt.zsh) - Zsh configuration settings - - [wsl.zsh](zsh/wsl.zsh) - WSL2 specific config (sources [wsl.sh](shell/wsl.sh)) + - [wsl.zsh](zsh/wsl.zsh) - WSL2 specific config (sources [wsl.sh](sh/wsl.sh)) #### Misc @@ -0,0 +1,12 @@ +source "${DOTFILES:="${HOME}/dotfiles"}/sh/profile.sh" + +# Directory hashtable +hash -d .=${HOME}/dotfiles + + +source $DOTFILES/sh/aliases.sh +source $DOTFILES/sh/wsl.sh +source $DOTFILES/sh/gpg.sh +[ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/sh/wsl.sh + +eval "$(starship init zsh)"
\ No newline at end of file diff --git a/shell/aliases.sh b/sh/aliases.sh index 6505a39..6505a39 100644 --- a/shell/aliases.sh +++ b/sh/aliases.sh diff --git a/shell/profile.sh b/sh/profile.sh index bde5867..bde5867 100644 --- a/shell/profile.sh +++ b/sh/profile.sh diff --git a/wsl.install b/wsl.install index 69cbd71..0d4b2f5 100755 --- a/wsl.install +++ b/wsl.install @@ -6,18 +6,20 @@ force=1 mkln() { dirname="$(dirname $2)" filename="$(basename $2)" + source=$(wslpath -w $DOTFILES/$1) + target=$(wslpath -w $dirname)\\$filename + cmd="cd ~; cmd /c mklink $target $source" - if ls -la $dirname/ 2>/dev/null | grep -q $filename ; then + if ls -la $dirname/ 2>/dev/null | grep -q $filename; then if [ $force = 1 ]; then - rm $2 + cmd="cd ~; rm $target; cmd /c mklink $target $source" else echo "$filename already exists. Use -f to overwrite." return fi fi - source=$(wslpath -w $DOTFILES/$1) - target=$(wslpath -w $dirname)\\$filename - powershell.exe -c "cd ~; cmd /c mklink $target $source" + powershell.exe -c "$cmd" &>/dev/null + echo "linked $2 --> $1" } show-warning() { diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 145f23a..05f1e86 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -1 +1 @@ -source "${DOTFILES:="${HOME}/dotfiles"}/shell/aliases.sh"
\ No newline at end of file +source "${DOTFILES:="${HOME}/dotfiles"}/sh/aliases.sh"
\ No newline at end of file diff --git a/zsh/wsl.zsh b/zsh/wsl.zsh index 37bb447..a1e091d 100644 --- a/zsh/wsl.zsh +++ b/zsh/wsl.zsh @@ -1,5 +1,5 @@ -source "${DOTFILES:-"${HOME}/dotfiles"}/shell/wsl.sh" -source "${DOTFILES:-"${HOME}/dotfiles"}/shell/gpg.sh" +source "${DOTFILES:-"${HOME}/dotfiles"}/sh/wsl.sh" +source "${DOTFILES:-"${HOME}/dotfiles"}/sh/gpg.sh" hash -d w=/mnt/c/Users/$USER @@ -1,9 +1,8 @@ -source "${DOTFILES:="${HOME}/dotfiles"}/shell/profile.sh" +source "${DOTFILES:="${HOME}/dotfiles"}/sh/profile.sh" # Directory hashtable hash -d .=${HOME}/dotfiles - source $DOTFILES/antigen/antigen.zsh source $DOTFILES/zsh/setopt.zsh source $DOTFILES/zsh/prompt.zsh |