michael/dotfiles
1
0
Fork 0
mirror of https://github.com/m-housh/dotfiles.git synced 2026-02-15 06:32:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed zsh errors on M1

Browse Source
This commit is contained in:
Michael Housh
2021-12-27 13:01:59 -05:00
parent afb17d1f4e
commit cf5521aee2
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
macOS/.config/macOS/AppStore.Brewfile
View File

@@ -1,3 +1,4 @@
mas "pwSafe", id: "520993579" mas "pwSafe", id: "520993579"
mas "Xcode", id: "497799835" mas "Xcode", id: "497799835"
mas "Home Assistant", id: "1099568401" mas "Home Assistant", id: "1099568401"
mas "Vimari", id: "1480933944"

31
zsh/.config/zsh/.zshrc
View File

@@ -3,13 +3,6 @@ setopt appendhistory
setopt sharehistory setopt sharehistory
setopt incappendhistory setopt incappendhistory
fpath=("$ZDOTDIR/completions" $fpath)
autoload -Uz compinit; compinit
zstyle ':completion:*' menu select
zmodload zsh/complist
# compinit
_comp_options+=(globdots) # Include hidden files.
autoload -U up-line-or-beginning-search autoload -U up-line-or-beginning-search
autoload -U down-line-or-beginning-search autoload -U down-line-or-beginning-search
zle -N up-line-or-beginning-search zle -N up-line-or-beginning-search
@@ -18,11 +11,6 @@ zle -N down-line-or-beginning-search
# Colors # Colors
autoload -Uz colors && colors autoload -Uz colors && colors
# Homebrew
if [ "$(which brew)" ]; then
eval "$(brew shellenv)"
fi
# Load Useful Functions # Load Useful Functions
source "$ZDOTDIR/zsh-functions" source "$ZDOTDIR/zsh-functions"
@@ -32,14 +20,27 @@ zsh_add_file "zsh-exports"
# Plugins # Plugins
zsh_add_plugin "zsh-users/zsh-autosuggestions" zsh_add_plugin "zsh-users/zsh-autosuggestions"
zsh_add_plugin "zsh-users/zsh-syntax-highlighting" zsh_add_plugin "zsh-users/zsh-syntax-highlighting"
#zsh_add_plugin "sindresorhus/pure"
# Homebrew
if [ "$(which brew)" ]; then
eval "$(brew shellenv)"
fi
# compinit
fpath=("$ZDOTDIR/completions" $fpath)
autoload -Uz compinit; compinit
zstyle ':completion:*' menu select
zmodload zsh/complist
_comp_options+=(globdots) # Include hidden files.
# Prompt / managed by brew. (`brew install pure`) # Prompt / managed by brew. (`brew install pure`)
#fpath+="$ZDOTDIR/plugins/pure" #fpath+="$ZDOTDIR/plugins/pure"
autoload -U promptinit; promptinit autoload -Uz promptinit; promptinit
prompt pure prompt pure
# Enable vi mode # Enable vi mode
bindkey -v #bindkey -v
cat < "$ZDOTDIR/banner" cat < "$ZDOTDIR/banner"

12
zsh/.config/zsh/zsh-exports
View File

@@ -10,21 +10,19 @@ export SHELL="$(which zsh)"
export PATH=~/.bin:$PATH export PATH=~/.bin:$PATH
export PATH=~/.local/scripts:$PATH export PATH=~/.local/scripts:$PATH
# Allow git to work on mounted volumes
export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
# Add homebrew to the path
if [ -d /opt/homebrew ]; then if [ -d /opt/homebrew ]; then
export PATH=/opt/homebrew/bin:$PATH export PATH=/opt/homebrew/bin:$PATH
export PATH=/opt/homebrew/sbin:$PATH export PATH=/opt/homebrew/sbin:$PATH
fi fi
# Allow git to work on mounted volumes
export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
# zsh-completions installed by homebrew # zsh-completions installed by homebrew
if type brew &>/dev/null; then if type brew &>/dev/null; then
FPATH=$(brew --prefix)/share/zsh/site-functions:$FPATH
FPATH=$(brew --prefix)/share/zsh-completions:$FPATH FPATH=$(brew --prefix)/share/zsh-completions:$FPATH
autoload -Uz compinit
compinit
fi fi
export EDITOR="nvim" export EDITOR="nvim"