This commit is contained in:
Michael Zhang 2020-11-22 23:35:09 -06:00
parent 1874098311
commit 4cce442470
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
5 changed files with 26 additions and 6 deletions

View file

@ -2,3 +2,4 @@
# Should not be executable, only sourced by other scripts # Should not be executable, only sourced by other scripts
command_exists() { command -v ${1} >/dev/null; } command_exists() { command -v ${1} >/dev/null; }
source_if_exists() { [ -f "$1" ] && source $1; }

View file

@ -1,5 +1,7 @@
source $HOME/.local/scripts/zsh/zsh-prelude.zsh source $HOME/.common.sh
source $HOME/.local/scripts/zsh/check-update.zsh
source_if_exists $HOME/.local/scripts/zsh/zsh-prelude.zsh
source_if_exists $HOME/.local/scripts/zsh/check-update.zsh
export LANG=en_US.UTF-8 export LANG=en_US.UTF-8
@ -21,8 +23,8 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1
export EDITOR=nvim export EDITOR=nvim
export MAILDIR=$HOME/Mail export MAILDIR=$HOME/Mail
source $HOME/.cargo/env source_if_exists $HOME/.cargo/env
source $HOME/.ghcup/env source_if_exists $HOME/.ghcup/env
export PATH="$HOME/.local/bin:$HOME/.local/scripts:$HOME/.dotnet/tools:$PATH:$HOME/go/bin:$HOME/.idris2/bin" export PATH="$HOME/.local/bin:$HOME/.local/scripts:$HOME/.dotnet/tools:$PATH:$HOME/go/bin:$HOME/.idris2/bin"
[ -f "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env" ] && source "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env" [ -f "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env" ] && source "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env"
@ -44,7 +46,7 @@ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
fi fi
source $HOME/.local/scripts/zsh/aliases.zsh source_if_exists $HOME/.local/scripts/zsh/aliases.zsh
source $HOME/.zsh/extras/*.zsh [ -f "$HOME/.zsh/extras" ] && source $HOME/.zsh/extras/*.zsh
# vim: set filetype=zsh: # vim: set filetype=zsh:

6
executable_dot_profile Normal file
View file

@ -0,0 +1,6 @@
export PATH="$HOME/.cargo/bin:/usr/local/go/bin:$PATH"
export TERMINAL="/usr/bin/alacritty"
export EDITOR="/usr/bin/nvim"
# vim: set ft=bash :

View file

@ -0,0 +1,11 @@
#!/bin/bash
{{ if eq .chezmoi.osRelease.id "arch" }}
sudo pacman -Syy --needed \
feh \
git \
zsh \
&& true
{{ end }}
# vim: set ft=bash :