Merge remote-tracking branch 'refs/remotes/origin/master'

* refs/remotes/origin/master: prompt: update powerlevel10k submodule to the latest commit (sorin-ionescu#1717) prompt: update powerlevel10k submodule (sorin-ionescu#1715) prompt: update powerlevel10k to latest commit Add powerlevel10k theme (sorin-ionescu#1695) Update zsh-autosuggestions submodule
noamelf · Jul 14, 2019 · 9729edc · 9729edc
2 parents c4c6485 + e94b6b2
commit 9729edc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "modules/prompt/external/powerlevel9k"]
 	path = modules/prompt/external/powerlevel9k
 	url = https://github.com/bhilburn/powerlevel9k.git
+[submodule "modules/prompt/external/powerlevel10k"]
+	path = modules/prompt/external/powerlevel10k
+	url = https://github.com/romkatv/powerlevel10k.git
diff --git a/modules/autosuggestions/external b/modules/autosuggestions/external
diff --git a/modules/prompt/external/powerlevel10k b/modules/prompt/external/powerlevel10k
diff --git a/modules/prompt/functions/prompt_powerlevel10k_setup b/modules/prompt/functions/prompt_powerlevel10k_setup
@@ -0,0 +1 @@
+../external/powerlevel10k/powerlevel10k.zsh-theme
+10 −0		CHANGELOG.md
+0 −1		Makefile
+6 −2		README.md
+1 −1		VERSION
+1 −0		ZSH_VERSIONS
+1 −1		install_test_zsh.sh
+11 −48		spec/async_spec.rb
+14 −0		spec/integrations/auto_cd_spec.rb
+0 −10		spec/integrations/client_zpty_spec.rb
+12 −0		spec/integrations/glob_subst_spec.rb
+0 −19		spec/options/async_zpty_name_spec.rb
+23 −0		spec/options/widget_lists_spec.rb
+1 −1		spec/strategies/history_spec.rb
+1 −1		spec/strategies/match_prev_cmd_spec.rb
+48 −88		src/async.zsh
+8 −21		src/bind.zsh
+64 −50		src/config.zsh
+0 −19		src/features.zsh
+1 −0		src/fetch.zsh
+9 −11		src/start.zsh
+0 −0		src/strategies/history.zsh
+26 −23		src/widgets.zsh
+157 −213		zsh-autosuggestions.zsh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../external/powerlevel10k/powerlevel10k.zsh-theme