diff options
| -rw-r--r-- | bashrc | 3 | ||||
| -rw-r--r-- | install.conf.yaml | 8 | ||||
| -rw-r--r-- | sh/env.sh (renamed from profile) | 4 | ||||
| -rw-r--r-- | zsh/aliases.zsh | 2 | ||||
| -rw-r--r-- | zshrc | 6 |
5 files changed, 12 insertions, 11 deletions
@@ -1,7 +1,8 @@ #!/usr/bin/env bash -source "./.profile" +export DOTFILES="${HOME}/dotfiles" +source $DOTFILES/sh/env.sh source $DOTFILES/sh/aliases.sh [ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/sh/wsl.sh [ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/sh/gpg.sh diff --git a/install.conf.yaml b/install.conf.yaml index 2cf59ce..78375f1 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -12,7 +12,6 @@ - [./bat/install bat, Installing bat] - link: - ~/.profile: ~/.bashrc: ~/.zshrc: ~/.p10k.zsh: @@ -24,6 +23,9 @@ path: gnupg/*.conf - shell: - - [gpg --keyserver hkps://keys.openpgp.org --recv-key 0xC8F6E06F5C8E2634, Getting GPG public key] + - [ + gpg --keyserver hkps://keys.openpgp.org --recv-key 0xC8F6E06F5C8E2634, + Getting GPG public key, + ] - [gpg --import-ownertrust gnupg/trustfile.txt, Importing GPG trustfile] - - ["[ -n \"${WSL_DISTRO_NAME+1}\" ] && ./wsl.install || echo ''"]
\ No newline at end of file + - ['[ -n "${WSL_DISTRO_NAME+1}" ] && ./wsl.install || :'] @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# Exports -export DOTFILES="$(cd $(dirname "$(readlink -fm "$0")"); git rev-parse --show-toplevel)" # https://github.com/junegunn/fzf#respecting-gitignore export FZF_BASE="${DOTFILES}/fzf" @@ -11,4 +9,4 @@ export BAT_CONFIG_PATH="${DOTFILES}/bat.conf" export MANPAGER="sh -c 'col -bx | bat -l man -p'" # Path -PATH=$PATH:$HOME/.local/bin:$HOME/.dotnet/tools:$HOME/.cargo/bin:$DOTFILES/scripts
\ No newline at end of file +PATH=$PATH:$HOME/.local/bin:$HOME/.dotnet/tools:$HOME/.cargo/bin:$DOTFILES/scripts diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 50cc7af..b9e3291 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -1,6 +1,6 @@ #!/usr/bin/env zsh -source "${DOTFILES:="${HOME}/dotfiles"}/sh/aliases.sh" +source "${DOTFILES:-"${HOME}/dotfiles"}/sh/aliases.sh" # Command line head / tail shortcuts alias -g H='| head' @@ -1,10 +1,10 @@ #!/usr/bin/env zsh -source "./.profile" +export DOTFILES="${HOME}/dotfiles" # Directory hashtable hash -d .=${HOME}/dotfiles - +source $DOTFILES/sh/env.sh source $DOTFILES/antigen/antigen.zsh source $DOTFILES/zsh/setopt.zsh source $DOTFILES/zsh/prompt.zsh @@ -23,4 +23,4 @@ antigen bundle zsh-users/zsh-syntax-highlighting antigen bundle zsh-users/zsh-autosuggestions antigen bundle memark/zsh-dotnet-completion antigen theme romkatv/powerlevel10k.git -antigen apply
\ No newline at end of file +antigen apply |