mirror of
https://github.com/jimeh/dotfiles.git
synced 2026-02-19 11:26:41 +00:00
Upgrade to zplug 2.x, and switch default theme
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -10,9 +10,9 @@
|
|||||||
[submodule "shell/bash/git-aware-prompt"]
|
[submodule "shell/bash/git-aware-prompt"]
|
||||||
path = shell/bash/git-aware-prompt
|
path = shell/bash/git-aware-prompt
|
||||||
url = git@github.com:jimeh/git-aware-prompt.git
|
url = git@github.com:jimeh/git-aware-prompt.git
|
||||||
[submodule "shell/zsh/zplug"]
|
|
||||||
path = shell/zsh/zplug
|
|
||||||
url = https://github.com/b4b4r07/zplug
|
|
||||||
[submodule "tmux/plugins/tpm"]
|
[submodule "tmux/plugins/tpm"]
|
||||||
path = tmux/plugins/tpm
|
path = tmux/plugins/tpm
|
||||||
url = https://github.com/tmux-plugins/tpm
|
url = https://github.com/tmux-plugins/tpm
|
||||||
|
[submodule "shell/zsh/zplug"]
|
||||||
|
path = shell/zsh/zplug
|
||||||
|
url = https://github.com/zplug/zplug
|
||||||
|
|||||||
Submodule shell/zsh/zplug updated: 78cfe440ec...cd82438f89
3
shell/zsh/zplug-cache/.gitignore
vendored
3
shell/zsh/zplug-cache/.gitignore
vendored
@@ -1,3 +1,2 @@
|
|||||||
.cache
|
cache/*
|
||||||
repos/*
|
repos/*
|
||||||
zcompdump*
|
|
||||||
|
|||||||
0
shell/zsh/zplug-cache/repos/.gitkeep
Normal file
0
shell/zsh/zplug-cache/repos/.gitkeep
Normal file
@@ -7,7 +7,9 @@ DISABLE_AUTO_TITLE="true"
|
|||||||
|
|
||||||
# Export path variables.
|
# Export path variables.
|
||||||
DOTZSH="$DOTSHELL/zsh"
|
DOTZSH="$DOTSHELL/zsh"
|
||||||
ZPLUG_HOME="$DOTZSH/zplug-cache"
|
ZPLUG_HOME="$DOTZSH/zplug"
|
||||||
|
ZPLUG_CACHE_DIR="$DOTZSH/zplug-cache/cache"
|
||||||
|
ZPLUG_REPOS="$DOTZSH/zplug-cache/repos"
|
||||||
|
|
||||||
# Don't wrap these commands in a Bundler wrapper.
|
# Don't wrap these commands in a Bundler wrapper.
|
||||||
UNBUNDLED_COMMANDS=(shotgun)
|
UNBUNDLED_COMMANDS=(shotgun)
|
||||||
@@ -16,21 +18,22 @@ UNBUNDLED_COMMANDS=(shotgun)
|
|||||||
# zplug
|
# zplug
|
||||||
#
|
#
|
||||||
|
|
||||||
source "$DOTZSH/zplug/zplug"
|
source "$DOTZSH/zplug/init.zsh"
|
||||||
alias zp="zplug"
|
alias zp="zplug"
|
||||||
|
|
||||||
|
zplug "robbyrussell/oh-my-zsh", use:"lib/*.zsh", defer:0
|
||||||
|
|
||||||
zplug "plugins/bundler", from:oh-my-zsh
|
zplug "plugins/bundler", from:oh-my-zsh
|
||||||
zplug "plugins/git", from:oh-my-zsh
|
zplug "plugins/git", from:oh-my-zsh
|
||||||
|
|
||||||
zplug "$DOTZSH/themes/plain", from:local
|
zplug "aaronjamesyoung/aaron-zsh-theme", use:"aaron.zsh-theme", defer:3
|
||||||
|
# zplug "$DOTZSH/themes/plain", from:local, use:"plain.zsh-theme", defer:3
|
||||||
|
|
||||||
# zplug "junegunn/fzf", of:"shell/*.zsh"
|
|
||||||
zplug "jimeh/zsh-peco-history"
|
zplug "jimeh/zsh-peco-history"
|
||||||
|
zplug "b4b4r07/enhancd", use:"init.sh"
|
||||||
zplug "b4b4r07/enhancd", of:"init.sh"
|
|
||||||
zplug "zsh-users/zsh-completions"
|
zplug "zsh-users/zsh-completions"
|
||||||
zplug "zsh-users/zsh-autosuggestions"
|
zplug "zsh-users/zsh-autosuggestions"
|
||||||
zplug "zsh-users/zsh-syntax-highlighting", nice:19
|
zplug "zsh-users/zsh-syntax-highlighting", defer:3
|
||||||
|
|
||||||
# Install plugins if there are plugins that have not been installed
|
# Install plugins if there are plugins that have not been installed
|
||||||
if ! zplug check --verbose; then
|
if ! zplug check --verbose; then
|
||||||
@@ -53,6 +56,8 @@ fi
|
|||||||
|
|
||||||
zplug load
|
zplug load
|
||||||
|
|
||||||
|
# source "$DOTZSH/themes/plain/plain.zsh-theme"
|
||||||
|
|
||||||
#
|
#
|
||||||
# Basic Z-Shell settings
|
# Basic Z-Shell settings
|
||||||
#
|
#
|
||||||
@@ -68,4 +73,4 @@ unsetopt share_history
|
|||||||
unsetopt correctall
|
unsetopt correctall
|
||||||
|
|
||||||
# Cause I hit emacs shorts too much.
|
# Cause I hit emacs shorts too much.
|
||||||
bindkey -s "\C-x\C-f" "cd "
|
# bindkey -s "\C-x\C-f" "cd "
|
||||||
|
|||||||
Reference in New Issue
Block a user