From antigen to zinit, removed lots of useless zsh stuff

main
Steffen Rademacker 3 years ago
parent 45256f25bd
commit 13afe85093

@ -5,7 +5,7 @@
excludesfile = ~/.gitignore
autocrlf = input
eol = lf
pager = diff-so-fancy | less --tabs=2 -RFX
pager = diff-so-fancy | less
[color]
ui = auto
@ -50,9 +50,7 @@
fi = flow init
rs = reset HEAD --hard
fame = shortlog -sn --all --no-merges
hist = log --pretty=format:\"%h | %ad | %an | %s%d \" --graph --date=local
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(blue)<%an>%Creset' --abbrev-commit
lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
[diff]
tool = nvim -d

@ -14,6 +14,7 @@ brew install jump
brew install lazygit
brew install nnn
brew install ripgrep
brew install starship
brew install tree
ln -s ~/dotfiles/lazygit ~/.config/lazygit
@ -22,7 +23,6 @@ ln -s ~/dotfiles/lazygit ~/Library/Application\ Support/lazygit
# node cli tools and helpers
npm install -g diff-so-fancy
npm install -g fkill-cli
npm install -g pure-prompt
# install fzf
/usr/local/opt/fzf/install
@ -30,6 +30,3 @@ npm install -g pure-prompt
# clipper
mkdir -p ~/Library/LaunchAgents
brew services start clipper
# nnn plugins + trash-cli
curl -Ls https://raw.githubusercontent.com/jarun/nnn/master/plugins/getplugs | sh

@ -18,7 +18,6 @@ brew install --cask iterm2
brew install --cask kap
brew install --cask karabiner-elements
brew install --cask microsoft-teams
brew install --cask numi
brew install --cask sequel-pro
brew install --cask signal
brew install --cask sketch
@ -34,7 +33,7 @@ ln -s ~/dotfiles/hammerspoon ~/.hammerspoon
ln -s ~/dotfiles/karabiner ~/.config/karabiner
# Drivers and other software
brew install --cask font-fira-code
brew install --cask font-fira-code-nerd-font
brew install --cask ubiquiti-unifi-controller
# Tell unifi-controller to use brew-installed java

@ -19,8 +19,6 @@ function! MyStatusLine(mode)
let statusline .= "%= "
let statusline .= "%{coc#status()}"
let statusline .= "%= "
let statusline .= "%{toupper(mode())}\ %{StatusLinePaste()}"
let statusline .= "%= "
let statusline .= "\ %y\ %{&fileencoding?&fileencoding:&encoding}\/\%{&fileformat}\ \|\ %l:%c\ "
return statusline
endfunction

@ -0,0 +1,64 @@
{
"alfredtheme" : {
"result" : {
"textSpacing" : 7,
"subtext" : {
"size" : 11,
"colorSelected" : "#3C3836FF",
"font" : "FiraCode Nerd Font Mono",
"color" : "#928374FF"
},
"shortcut" : {
"size" : 16,
"colorSelected" : "#B8BB26FF",
"font" : "FiraCode Nerd Font Mono",
"color" : "#B8BB26FF"
},
"backgroundSelected" : "#A89983FF",
"text" : {
"size" : 16,
"colorSelected" : "#EBDBB2FF",
"font" : "FiraCode Nerd Font Mono",
"color" : "#A89983FF"
},
"iconPaddingHorizontal" : 4,
"roundness" : 0,
"paddingVertical" : 5,
"iconSize" : 48
},
"search" : {
"backgroundSelected" : "#B2D7FFFF",
"paddingHorizontal" : 8,
"spacing" : 8,
"text" : {
"size" : 28,
"colorSelected" : "#000000FF",
"font" : "FiraCode Nerd Font Mono",
"color" : "#A89983FF"
},
"background" : "#3C3836FF",
"roundness" : 0,
"paddingVertical" : 2
},
"window" : {
"color" : "#272727FF",
"paddingHorizontal" : 10,
"width" : 720,
"borderPadding" : 6,
"borderColor" : "#3C3836FF",
"blur" : 40,
"roundness" : -64,
"paddingVertical" : 10
},
"credit" : "webgefrickel",
"separator" : {
"color" : "#CBCBCBF3",
"thickness" : 0
},
"scrollbar" : {
"color" : "#B8BB26FF",
"thickness" : 6
},
"name" : "Gruvbox"
}
}

@ -39,22 +39,16 @@
"Alpha Component" : 1,
"Green Component" : 0.18880486488342285
},
"Ansi 4 Color" : {
"Red Component" : 0.21694663166999817,
"Link Color" : {
"Red Component" : 0.7928692102432251,
"Color Space" : "Calibrated",
"Blue Component" : 0.4586675763130188,
"Blue Component" : 0.056549370288848877,
"Alpha Component" : 1,
"Green Component" : 0.45008346438407898
"Green Component" : 0.28100395202636719
},
"Rows" : 48,
"Default Bookmark" : "No",
"Ansi 5 Color" : {
"Red Component" : 0.62685638666152954,
"Color Space" : "Calibrated",
"Blue Component" : 0.45103743672370911,
"Alpha Component" : 1,
"Green Component" : 0.29604318737983704
},
"Right Option Key Sends" : 0,
"Cursor Guide Color" : {
"Red Component" : 0.17867125570774078,
"Color Space" : "Calibrated",
@ -152,164 +146,164 @@
"Unlimited Scrollback" : true,
"Keyboard Map" : {
"0xf700-0x260000" : {
"Action" : 10,
"Text" : "[1;6A"
"Text" : "[1;6A",
"Action" : 10
},
"0x37-0x40000" : {
"Action" : 11,
"Text" : "0x1f"
"Text" : "0x1f",
"Action" : 11
},
"0x32-0x40000" : {
"Action" : 11,
"Text" : "0x00"
"Text" : "0x00",
"Action" : 11
},
"0xf709-0x20000" : {
"Action" : 10,
"Text" : "[17;2~"
"Text" : "[17;2~",
"Action" : 10
},
"0xf70c-0x20000" : {
"Action" : 10,
"Text" : "[20;2~"
"Text" : "[20;2~",
"Action" : 10
},
"0xf729-0x20000" : {
"Action" : 10,
"Text" : "[1;2H"
"Text" : "[1;2H",
"Action" : 10
},
"0xf72b-0x40000" : {
"Action" : 10,
"Text" : "[1;5F"
"Text" : "[1;5F",
"Action" : 10
},
"0xf705-0x20000" : {
"Action" : 10,
"Text" : "[1;2Q"
"Text" : "[1;2Q",
"Action" : 10
},
"0xf703-0x260000" : {
"Action" : 10,
"Text" : "[1;6C"
"Text" : "[1;6C",
"Action" : 10
},
"0xf700-0x220000" : {
"Action" : 10,
"Text" : "[1;2A"
"Text" : "[1;2A",
"Action" : 10
},
"0xf701-0x280000" : {
"Action" : 11,
"Text" : "0x1b 0x1b 0x5b 0x42"
"Text" : "0x1b 0x1b 0x5b 0x42",
"Action" : 11
},
"0x38-0x40000" : {
"Action" : 11,
"Text" : "0x7f"
"Text" : "0x7f",
"Action" : 11
},
"0x33-0x40000" : {
"Action" : 11,
"Text" : "0x1b"
"Text" : "0x1b",
"Action" : 11
},
"0xf703-0x220000" : {
"Action" : 10,
"Text" : "[1;2C"
"Text" : "[1;2C",
"Action" : 10
},
"0xf701-0x240000" : {
"Action" : 10,
"Text" : "[1;5B"
"Text" : "[1;5B",
"Action" : 10
},
"0xf70d-0x20000" : {
"Action" : 10,
"Text" : "[21;2~"
"Text" : "[21;2~",
"Action" : 10
},
"0xf702-0x260000" : {
"Action" : 10,
"Text" : "[1;6D"
"Text" : "[1;6D",
"Action" : 10
},
"0xf729-0x40000" : {
"Action" : 10,
"Text" : "[1;5H"
"Text" : "[1;5H",
"Action" : 10
},
"0xf706-0x20000" : {
"Action" : 10,
"Text" : "[1;2R"
"Text" : "[1;2R",
"Action" : 10
},
"0x34-0x40000" : {
"Action" : 11,
"Text" : "0x1c"
"Text" : "0x1c",
"Action" : 11
},
"0xf700-0x280000" : {
"Action" : 11,
"Text" : "0x1b 0x1b 0x5b 0x41"
"Text" : "0x1b 0x1b 0x5b 0x41",
"Action" : 11
},
"0x2d-0x40000" : {
"Action" : 11,
"Text" : "0x1f"
"Text" : "0x1f",
"Action" : 11
},
"0xf70e-0x20000" : {
"Action" : 10,
"Text" : "[23;2~"
"Text" : "[23;2~",
"Action" : 10
},
"0xf702-0x220000" : {
"Action" : 10,
"Text" : "[1;2D"
"Text" : "[1;2D",
"Action" : 10
},
"0xf703-0x280000" : {
"Action" : 11,
"Text" : "0x1b 0x1b 0x5b 0x43"
"Text" : "0x1b 0x1b 0x5b 0x43",
"Action" : 11
},
"0xf700-0x240000" : {
"Action" : 10,
"Text" : "[1;5A"
"Text" : "[1;5A",
"Action" : 10
},
"0xf707-0x20000" : {
"Action" : 10,
"Text" : "[1;2S"
"Text" : "[1;2S",
"Action" : 10
},
"0xf70a-0x20000" : {
"Action" : 10,
"Text" : "[18;2~"
"Text" : "[18;2~",
"Action" : 10
},
"0x35-0x40000" : {
"Action" : 11,
"Text" : "0x1d"
"Text" : "0x1d",
"Action" : 11
},
"0xf70f-0x20000" : {
"Action" : 10,
"Text" : "[24;2~"
"Text" : "[24;2~",
"Action" : 10
},
"0xf703-0x240000" : {
"Action" : 10,
"Text" : "[1;5C"
"Text" : "[1;5C",
"Action" : 10
},
"0xf701-0x260000" : {
"Action" : 10,
"Text" : "[1;6B"
"Text" : "[1;6B",
"Action" : 10
},
"0xf702-0x280000" : {
"Action" : 11,
"Text" : "0x1b 0x1b 0x5b 0x44"
"Text" : "0x1b 0x1b 0x5b 0x44",
"Action" : 11
},
"0xf72b-0x20000" : {
"Action" : 10,
"Text" : "[1;2F"
"Text" : "[1;2F",
"Action" : 10
},
"0x36-0x40000" : {
"Action" : 11,
"Text" : "0x1e"
"Text" : "0x1e",
"Action" : 11
},
"0xf708-0x20000" : {
"Action" : 10,
"Text" : "[15;2~"
"Text" : "[15;2~",
"Action" : 10
},
"0xf701-0x220000" : {
"Action" : 10,
"Text" : "[1;2B"
"Text" : "[1;2B",
"Action" : 10
},
"0xf70b-0x20000" : {
"Action" : 10,
"Text" : "[19;2~"
"Text" : "[19;2~",
"Action" : 10
},
"0xf702-0x240000" : {
"Action" : 10,
"Text" : "[1;5D"
"Text" : "[1;5D",
"Action" : 10
},
"0xf704-0x20000" : {
"Action" : 10,
"Text" : "[1;2P"
"Text" : "[1;2P",
"Action" : 10
}
},
"Window Type" : 0,
@ -353,14 +347,14 @@
"Alpha Component" : 1,
"Green Component" : 0.82989895343780518
},
"Transparency" : 0,
"Ansi 1 Color" : {
"Red Component" : 0.74529051780700684,
"Ansi 0 Color" : {
"Red Component" : 0.11759927868843079,
"Color Space" : "Calibrated",
"Blue Component" : 0.090684391558170319,
"Blue Component" : 0.11759774386882782,
"Alpha Component" : 1,
"Green Component" : 0.05879192054271698
"Green Component" : 0.11759573966264725
},
"Guid" : "4EB8DD68-9A52-4908-A1E4-BDD33F3B944F",
"Ansi 2 Color" : {
"Red Component" : 0.52591603994369507,
"Color Space" : "Calibrated",
@ -375,14 +369,20 @@
"Alpha Component" : 1,
"Green Component" : 0.53254079818725586
},
"Ansi 0 Color" : {
"Red Component" : 0.11759927868843079,
"Ansi 4 Color" : {
"Red Component" : 0.21694663166999817,
"Color Space" : "Calibrated",
"Blue Component" : 0.11759774386882782,
"Blue Component" : 0.4586675763130188,
"Alpha Component" : 1,
"Green Component" : 0.11759573966264725
"Green Component" : 0.45008346438407898
},
"Ansi 5 Color" : {
"Red Component" : 0.62685638666152954,
"Color Space" : "Calibrated",
"Blue Component" : 0.45103743672370911,
"Alpha Component" : 1,
"Green Component" : 0.29604318737983704
},
"Guid" : "4EB8DD68-9A52-4908-A1E4-BDD33F3B944F",
"Ansi 6 Color" : {
"Red Component" : 0.34054014086723328,
"Color Space" : "Calibrated",
@ -390,15 +390,15 @@
"Alpha Component" : 1,
"Green Component" : 0.55607825517654419
},
"Custom Directory" : "No",
"Normal Font" : "FiraCode-Regular 13",
"Horizontal Spacing" : 1,
"Link Color" : {
"Red Component" : 0.7928692102432251,
"Transparency" : 0,
"Normal Font" : "FiraCodeNerdFontCompleteM-Regular 14",
"Ansi 1 Color" : {
"Red Component" : 0.74529051780700684,
"Color Space" : "Calibrated",
"Blue Component" : 0.056549370288848877,
"Blue Component" : 0.090684391558170319,
"Alpha Component" : 1,
"Green Component" : 0.28100395202636719
"Green Component" : 0.05879192054271698
},
"Right Option Key Sends" : 0
"Custom Directory" : "No",
"Horizontal Spacing" : 1
}

@ -0,0 +1,10 @@
sandbox_init_pyenv() {
eval "$(pyenv init -)"
}
sandbox_init_rbenv() {
eval "$(rbenv init -)"
}
sandbox_hook_shims pyenv
sandbox_hook_shims rbenv

@ -1,10 +1,10 @@
alias -- -='$EDITOR $(fzf)'
alias ...='cd ../..'
alias ..='cd ..'
alias O="cd ~ && mbsync -a && mu index"
alias anigif='convert -delay 12 -loop 0 *.jpg animated.gif'
alias brewup='brew update && brew upgrade && brew cu -a -f -y && brew cleanup'
alias dnsflush='sudo dscacheutil -flushcache'
alias dnsmasqfix='sudo brew services stop dnsmasq && sudo mkdir /usr/local/etc/dnsmasq.d && sudo brew services start dnsmasq'
alias g="git"
alias gf="git-flow"
alias ggpl='git pull origin $(current_branch)'
@ -13,8 +13,7 @@ alias ggps='git push origin $(current_branch)'
alias gmo='$EDITOR $(git ls-files -m)'
alias gs="git status"
alias lg='lazygit'
alias lock="/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend"
alias ls='exa -la'
alias e='exa -la'
alias m='neomutt'
alias mutt='neomutt'
alias nb="npm run build"
@ -34,7 +33,7 @@ alias vimdiff='$EDITOR -d'
alias woffwoff='glyphhanger --subset="*.otf" --formats=woff-zopfli,woff2'
alias yp='yarn lint && yarn production'
alias yre='rm -f yarn.lock && rm -rf node_modules && yarn'
alias ys='yarn develop'
alias ys='yarn start'
# temp fix for dnsmasq-bootup/unifi-java fuckup
alias unififix='sudo ln -s /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk /Applications/UniFi.app/Contents/PlugIns/adoptopenjdk-8.jdk && sudo v /Applications/UniFi.app/Contents/Info.plist'

File diff suppressed because it is too large Load Diff

@ -3,13 +3,10 @@ export COPYFILE_DISABLE=true
export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
export DISABLE_AUTO_TITLE=true
export EDITOR="/usr/local/bin/nvim"
export GREP_COLOR='1;32'
export GREP_OPTIONS='--color=auto'
export LANG=en_US.UTF-8
export LC_ALL=en_US.UTF-8
export LC_CTYPE=$LANG
export LESS="-R"
export LSCOLORS=gxBxhxDxfxhxhxhxhxcxcx
export LESS="-F -i -J -M -R -W -x2 -X -z-4"
export MANPATH=/usr/local/share/man:$MANPATH
export PAGER="less"
export PATH=/usr/local/bin:$PATH
@ -31,7 +28,6 @@ export NNN_BMS='d:~/Dotfiles;s:~/Sites;l:~/Downloads;h:~/'
export NNN_FCOLORS='c1e26c2e006033f5c6d6abc4'
export NNN_FIFO='/tmp/nnn.fifo'
export NNN_TRASH=0
export NNN_PLUG='o:fzcd;j:autojump;p:preview-tui'
export NNN_ARCHIVE="\\.(7z|bz|bz2|gz|rar|rpm|tar|tgz|zip)$"
# fzf colors

@ -1,41 +1,41 @@
# Load the antigen, and all functions, aliases and exports
source ~/dotfiles/zsh/antigen.zsh
### Added by Zinit's installer
if [[ ! -f $HOME/.zinit/bin/zinit.zsh ]]; then
print -P "%F{33}▓▒░ %F{220}Installing %F{33}DHARMA%F{220} Initiative Plugin Manager (%F{33}zdharma/zinit%F{220})…%f"
command mkdir -p "$HOME/.zinit" && command chmod g-rwX "$HOME/.zinit"
command git clone https://github.com/zdharma/zinit "$HOME/.zinit/bin" && \
print -P "%F{33}▓▒░ %F{34}Installation successful.%f%b" || \
print -P "%F{160}▓▒░ The clone has failed.%f%b"
fi
source "$HOME/.zinit/bin/zinit.zsh"
autoload -Uz _zinit
(( ${+_comps} )) && _comps[zinit]=_zinit
### End of Zinit's installer chunk
# exports, functions and aliases
source ~/dotfiles/zsh/exports
source ~/dotfiles/zsh/aliases
source ~/dotfiles/zsh/functions
# plugins
antigen use belak/zsh-utils
antigen bundle zsh-users/zsh-autosuggestions
antigen bundle zsh-users/zsh-completions
antigen bundle zsh-users/zsh-syntax-highlighting
antigen bundle completion
antigen bundle history
antigen apply
zinit wait lucid for \
light-mode benvan/sandboxd \
light-mode zsh-users/zsh-autosuggestions \
light-mode zsh-users/zsh-completions \
light-mode zdharma/fast-syntax-highlighting \
light-mode "https://github.com/belak/zsh-utils/blob/master/history/history.plugin.zsh" \
light-mode "https://github.com/belak/zsh-utils/blob/master/completion/completion.plugin.zsh"
# history
setopt SHARE_HISTORY
unsetopt HIST_BEEP
# a nice prompt, install it via npm to make this work
autoload -U promptinit; promptinit
prompt pure
# completions
zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
compdef g=git
compdef gf=git-flow
# easy vim/terminal switch
zle -N fancy-ctrl-z
bindkey '^Z' fancy-ctrl-z
# smart urls
autoload -U url-quote-magic
zle -N self-insert url-quote-magic
# other tools init
# other tools init, pyenv + rbenv are sandboxd
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
eval "$(starship init zsh)"
eval "$(jump shell)"
eval "$(rbenv init -)"
eval "$(pyenv init -)"

Loading…
Cancel
Save