Skip to content

Commit

Permalink
Switch to atuin for aliases & env
Browse files Browse the repository at this point in the history
When/if atuinsh/atuin#2371 is merged, split the
atuin init line across ~/.zshrc and ~/.zshenv.
  • Loading branch information
calebhearth committed Aug 30, 2024
1 parent 0d517d2 commit 61d93ff
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 20 deletions.
3 changes: 3 additions & 0 deletions atuin/.config/atuin/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,6 @@ common_prefix = [
# This ensures that sync v2 is enabled for new installs only
# In a later release it will become the default across the board
records = true

[dotfiles]
enabled = true
3 changes: 1 addition & 2 deletions zsh/.zshenv
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export GITHUB_PERSONAL_TOKEN=2663e57f9d9049fc14f2f04f7432a08d4bfafe4c
export EDITOR=nvim
export VISUAL=nvim

export GHC_OPTIONS="-j4 +RTS -A128m -n2m -RTS"
export FAST_GHC_OPTIONS=$GHC_OPTIONS
. "$HOME/.cargo/env"
30 changes: 12 additions & 18 deletions zsh/.zshrc
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# if command -v brew 2>&1 > /dev/null; then
# if [ -d "/opt/homebrew/share/chruby" ]; then
# source /opt/homebrew/share/chruby/chruby.sh
# source /opt/homebrew/share/chruby/auto.sh
# fi
# if [ -d "/opt/homebrew/share/gem_home" ]; then
# source /opt/homebrew/share/gem_home/gem_home.sh
# gem_home $HOME
# fi
# fi
if command -v brew 2>&1 > /dev/null; then
local chruby="$(brew --prefix)/share/chruby"
if [ -d "$chruby" ]; then
source "$chruby/chruby.sh"
source "$chruby/auto.sh"
fi
local gemHome="$(brew --prefix)/share/gem_home"
if [ -d "$gemHome" ]; then
source "$gemHome/gem_home.sh"
gem_home $HOME
fi
fi

export LC_ALL=en_US.UTF-8
typeset -U path PATH
typeset -U fpath FPATH

Expand All @@ -19,8 +20,6 @@ if command -v brew 2>&1 > /dev/null; then
export MANPATH="$(brew --prefix)/opt/coreutils/libexec/gnuman:$MANPATH"
fi
export PATH="$HOME/bin:/opt/homebrew/opt/coreutils/libexec/gnubin:$PATH:/Applications/Postgres.app/Contents/Versions/latest/bin:/sbin"
export GOPATH=~/code/go
export DISABLE_SPRING=1

export HISTFILE=~/.zsh_history
export HISTSIZE=10000000
Expand All @@ -39,16 +38,12 @@ alias ag='echo "Use rg instead of ag"'
function rg() {
command rg --json "$@" | delta
}
alias h='TZ=UTC heroku'
function a() {
app=$1
}
function ha() {
heroku "$@" -a $app;
}
alias hb='hs run bash -a'
alias hl='hs logs -t -a'
alias git=hub

# initialize autocomplete here, otherwise functions won't be loaded
fpath=(~/.local/share/zsh/site-functions $fpath)
Expand All @@ -73,7 +68,6 @@ bindkey -s "^T" "^[Isudo ^[S" # "t" for "toughguy"
bindkey "^[[3~" delete-char # delete forward
bindkey '[[Z' reverse-menu-complete

alias vim=nvim
ssh-add ~/.ssh/id_ed25519 > /dev/null 2>&1

command -v direnv 2>&1 > /dev/null && eval "$(direnv hook zsh)"
Expand Down

0 comments on commit 61d93ff

Please sign in to comment.