Skip to content

Commit

Permalink
updates to use zsh
Browse files Browse the repository at this point in the history
  • Loading branch information
joshghent committed Apr 14, 2023
1 parent 9e4ea3e commit 6b97178
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 32 deletions.
2 changes: 2 additions & 0 deletions .aliases
Expand Up @@ -18,6 +18,7 @@ alias gc="git commit"
alias gpo="git push origin"
alias gp="git push"
alias ll="ls -la"
alias gpx="git add -A && git commit -m \"x\" && git push origin"

# Detect which `ls` flavor is in use
if ls --color > /dev/null 2>&1; then # GNU `ls`
Expand Down Expand Up @@ -97,3 +98,4 @@ setToken() {
echo "Your creds have been set in your env."
}
alias mfa=setToken
alias python=python3
8 changes: 8 additions & 0 deletions .bash_profile
Expand Up @@ -68,3 +68,11 @@ alias ping='prettyping --nolegend'
alias c="code ."
export GPG_TTY=$(tty)
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion

SCRIPT_PATH="$( cd -- "$(dirname -- "${BASH_SOURCE[0]}")" >/dev/null 2>&1 ; pwd -P )"
setToken() {
$SCRIPT_PATH/mfa.sh $1 $2
source ~/.token_file
echo "Your creds have been set in your env."
}
alias mfa=setToken
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -16,3 +16,5 @@ Thumbs.db
# General
log/
*.log

.vscode
8 changes: 6 additions & 2 deletions .vscode/settings.json
Expand Up @@ -13,7 +13,11 @@
"titleBar.activeBackground": "#0a66ab",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#0a66ab99",
"titleBar.inactiveForeground": "#e7e7e799"
"titleBar.inactiveForeground": "#e7e7e799",
"sash.hoverBorder": "#0d83db",
"statusBarItem.remoteBackground": "#0a66ab",
"statusBarItem.remoteForeground": "#e7e7e7",
"commandCenter.border": "#e7e7e799"
},
"peacock.color": "#0a66ab"
}
}
60 changes: 31 additions & 29 deletions .zshrc
@@ -1,13 +1,18 @@
# If you come from bash you might have to change your $PATH.
ZSH_DISABLE_COMPFIX="true"
ZSH_DOTENV_ALLOWED_LIST="~/.oh-my-zsh/cache/dotenv/allow.list"
ZSH_DOTENV_DISALLOWED_LIST="~/.oh-my-zsh/cache/dotenv/disallow.list"
export ZSH="~/.oh-my-zsh"
source ~/antigen.zsh
# export PATH=$HOME/bin:/usr/local/bin:$PATH

# Path to your oh-my-zsh installation.
export ZSH="~/.oh-my-zsh"

# Set name of the theme to load --- if set to "random", it will
# load a random theme each time oh-my-zsh is loaded, in which case,
# to know which specific one was loaded, run: echo $RANDOM_THEME
# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
ZSH_THEME="robbyrussell"

# Set list of themes to pick from when loading at random
# Setting this variable when ZSH_THEME=random will cause zsh to load
# a theme from this variable instead of looking in ~/.oh-my-zsh/themes/
# a theme from this variable instead of looking in $ZSH/themes/
# If set to an empty array, this variable will have no effect.
# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )

Expand All @@ -18,17 +23,16 @@ source ~/antigen.zsh
# Case-sensitive completion must be off. _ and - will be interchangeable.
# HYPHEN_INSENSITIVE="true"

# Uncomment the following line to disable bi-weekly auto-update checks.
DISABLE_AUTO_UPDATE="true"

# Uncomment the following line to automatically update without prompting.
# DISABLE_UPDATE_PROMPT="true"
# Uncomment one of the following lines to change the auto-update behavior
# zstyle ':omz:update' mode disabled # disable automatic updates
# zstyle ':omz:update' mode auto # update automatically without asking
# zstyle ':omz:update' mode reminder # just remind me to update when it's time

# Uncomment the following line to change how often to auto-update (in days).
# export UPDATE_ZSH_DAYS=13
# zstyle ':omz:update' frequency 13

# Uncomment the following line if pasting URLs and other text is messed up.
# DISABLE_MAGIC_FUNCTIONS=true
# DISABLE_MAGIC_FUNCTIONS="true"

# Uncomment the following line to disable colors in ls.
# DISABLE_LS_COLORS="true"
Expand All @@ -37,10 +41,13 @@ DISABLE_AUTO_UPDATE="true"
# DISABLE_AUTO_TITLE="true"

# Uncomment the following line to enable command auto-correction.
ENABLE_CORRECTION="true"
# ENABLE_CORRECTION="true"

# Uncomment the following line to display red dots whilst waiting for completion.
COMPLETION_WAITING_DOTS="true"
# You can also set it to another string to have that shown instead of the default red dots.
# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
# COMPLETION_WAITING_DOTS="true"

# Uncomment the following line if you want to disable marking untracked files
# under VCS as dirty. This makes repository status check for large repositories
Expand All @@ -59,10 +66,14 @@ COMPLETION_WAITING_DOTS="true"
# ZSH_CUSTOM=/path/to/new-custom-folder

# Which plugins would you like to load?
# Standard plugins can be found in ~/.oh-my-zsh/plugins/*
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Standard plugins can be found in $ZSH/plugins/
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
# plugins=(git)

# source $ZSH/oh-my-zsh.sh

# User configuration

# export MANPATH="/usr/local/man:$MANPATH"
Expand All @@ -89,17 +100,17 @@ COMPLETION_WAITING_DOTS="true"
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"

source ~/antigen.zsh

antigen use oh-my-zsh

antigen bundle git
antigen bundle heroku
antigen bundle docker
antigen bundle pip
antigen bundle lein
antigen bundle command-not-found

antigen bundle zsh-users/zsh-completions
antigen bundle djui/alias-tips
antigen bundle zsh-users/zsh-syntax-highlighting
antigen bundle zsh-users/zsh-autosuggestions
antigen bundle qoomon/zsh-lazyload
Expand All @@ -112,7 +123,7 @@ antigen apply

zstyle :prompt:pure:path color 14
zstyle :prompt:pure:git:branch color 13
# Make it so it shows command execution time if it took over a second
# Make it so it shows command execution time if it took over a second
PURE_CMD_MAX_EXEC_TIME=1

source ~/.aliases
Expand All @@ -126,12 +137,3 @@ HISTFILE=~/.zsh_history
setopt HIST_IGNORE_ALL_DUPS
setopt SHARE_HISTORY # share command history data
export PATH="/usr/local/sbin:$PATH"

test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"

# bun completions
[ -s "/Users/joshghent/.bun/_bun" ] && source "/Users/joshghent/.bun/_bun"

# bun
export BUN_INSTALL="$HOME/.bun"
export PATH="$BUN_INSTALL/bin:$PATH"
13 changes: 12 additions & 1 deletion programs.sh
Expand Up @@ -61,6 +61,7 @@ declare -a brews=(
"the_silver_searcher"
"cmake"
"ipfs"
"neofetch"
)

# Install brews in a loop
Expand All @@ -81,7 +82,7 @@ declare -a casks=(
"spectacle"
"spotify"
"docker"
"postman"
"insomnia"
"bartender"
"discord"
"visual-studio-code"
Expand Down Expand Up @@ -131,3 +132,13 @@ hdiutil attach ~/Downloads/tableplus.dmg
# Notion Install
wget https://www.notion.so/desktop/apple-silicon/download -o ~/Downloads/notion.dmg
hdiutil attach ~/Downloads/notion.dmg

# Oh my ZSH
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"


# Antigen install
curl -L git.io/antigen > antigen.zsh

# Install Playwright
npx playwright install --with-deps

0 comments on commit 6b97178

Please sign in to comment.