805 commits

Author	SHA1	Message	Date
romkatv	be7e7b3b15	add ip to docs	2020-02-05 17:51:08 +01:00
romkatv	f7645af7e3	add wifi prompt segment to docs	2020-02-05 09:27:39 +01:00
romkatv	afb7a59fbe	add contacts to docs	2020-02-04 15:55:57 +01:00
romkatv	45a71cbc05	"restart your terminal" should help iTerm users who fail to restart iTerm when asked to	2020-02-03 06:37:00 +01:00
romkatv	84a7ad7cc2	add "some prompt styles missing from the wizard"	2020-02-02 18:43:26 +01:00
romkatv	9d9c50611d	s/hight/height/	2020-02-02 08:20:46 +01:00
romkatv	c08d1e846b	link to zsh building instructions	2020-02-01 18:21:09 +01:00
romkatv	b71a19c92e	more precise mitigation for the resizing bug	2020-02-01 18:18:54 +01:00
romkatv	c983ff6a41	typo	2020-02-01 17:50:37 +01:00
romkatv	0b9829d409	add "mess when resizing" to troubleshooting	2020-02-01 17:37:04 +01:00
romkatv	cea51ee866	formatting	2020-02-01 12:54:51 +01:00
romkatv	04767278bd	formatting	2020-02-01 12:52:35 +01:00
romkatv	994a1e1371	remove antibody, add "how to update" ... The instructions for installation with Antibody are likely wrong anyway. Dunno how to fix them, so Antibody goes.	2020-02-01 12:50:11 +01:00
romkatv	8bad59ef13	s/zsh/Zsh/ in docs	2020-02-01 12:10:36 +01:00
romkatv	d54f6f50ca	more links	2020-02-01 11:37:54 +01:00
romkatv	1b0ab85f87	link to installation	2020-02-01 11:10:54 +01:00
romkatv	aea3e1393e	cleanup	2020-02-01 00:45:44 +01:00
romkatv	828a776a7b	fix links	2020-01-31 16:03:56 +01:00
romkatv	c34c567be2	update toc	2020-01-31 15:45:44 +01:00
romkatv	b6cb9618a8	spelling and cleanup	2020-01-31 15:18:39 +01:00
romkatv	0d6859cae8	add configuration wizard tips	2020-01-31 14:12:30 +01:00
romkatv	44bf61ac2c	doc: describe how p9k and p10k are related	2020-01-31 13:18:56 +01:00
romkatv	6ca69df39f	doc: sub-pixel imperfections	2020-01-31 12:01:40 +01:00
romkatv	4b99ca847c	doc cleanup	2020-01-31 10:26:06 +01:00
romkatv	2c65a0c1c4	add nix_shell to the list of segments	2020-01-31 08:26:19 +01:00
romkatv	808ccfc7bd	cleanup	2020-01-30 17:43:33 +01:00
romkatv	adfbbb741a	cleanup	2020-01-30 17:42:41 +01:00
romkatv	f562a837d8	expand on commitment	2020-01-30 17:27:18 +01:00
romkatv	ea2b2f1e02	split troubleshooting out of faq; expand on spacing differences between 9k and 10k	2020-01-30 17:17:21 +01:00
romkatv	2913765868	update 'try it in docker' section	2020-01-30 13:36:15 +01:00
romkatv	d800fd5f41	rewrite the color faq; move omz p9k migration instructions to faq	2020-01-30 12:57:28 +01:00
romkatv	23e241bf67	update color scheme	2020-01-30 09:44:25 +01:00
romkatv	6c507767b8	minor style fixes	2020-01-29 18:42:39 +01:00
romkatv	7ae901212c	update toc; explain how the screenshots and gifs were produced; clean things up	2020-01-29 16:36:16 +01:00
romkatv	e916104c1c	add a table with all supported segments; reword the intro and font sections	2020-01-29 15:42:27 +01:00
romkatv	084b0203c7	spelling and cleanup	2020-01-29 13:18:04 +01:00
romkatv	b3e02f54d5	feature: customizable	2020-01-29 12:29:05 +01:00
romkatv	6686f3ba17	expand features section	2020-01-29 10:38:38 +01:00
romkatv	e07a91c1a2	some progress on docs	2020-01-28 22:57:29 +01:00
romkatv	2564afb48d	fix gif urls	2020-01-28 16:12:01 +01:00
romkatv	2a78889243	start doc overhaul	2020-01-28 16:03:18 +01:00
Max Rydahl Andersen	774701432e	Add oc to POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND (#436)	2020-01-25 18:18:30 +01:00
romkatv	833cc73f73	add a link to gitter	2020-01-24 18:50:22 +01:00
romkatv	cf2b97e389	spello	2020-01-15 19:14:14 +01:00
romkatv	124723fdd2	add faq entry about SHOW_ON_COMMAND	2020-01-15 17:38:11 +01:00
romkatv	8394e6338e	switch to debian in the docker demo ... archlinux fails to install packages half the time error: key "Christian Hesse (Arch Linux Package Signing) <arch@eworm.de>" could not be imported This seems to be a long-standing bug in arch that hasn't been acknowledged. Users suffering from it are offered to to repeatedly wipe their keyring, reinitialize, and retry.	2020-01-14 09:10:05 +01:00
romkatv	974529b642	add faq about changing colors	2020-01-12 11:36:00 +01:00
Eric Nielsen	a50a336b64	Add Zim installation instructions to README.md (#411) ... add zim installation instructions	2020-01-07 22:53:25 +01:00
romkatv	78da8d1b5a	docs	2019-12-19 16:34:23 +01:00
romkatv	c440fc79c5	docs: add faq about configuration wizard running all the time	2019-12-19 16:32:33 +01:00
Rajiv Ranjan Singh	d0ff879744	corrected docs of README.md (#384) ... Fix typos in readme.	2019-12-18 21:08:56 +01:00
romkatv	11b8979c61	s/macOS Terminal/Apple Terminal	2019-12-02 16:54:38 +01:00
romkatv	3e52e38b5b	spello	2019-12-02 16:52:53 +01:00
romkatv	5044c61902	spelling	2019-12-02 14:50:22 +01:00
romkatv	8395e6cd68	add faq about context	2019-12-02 14:48:28 +01:00
romkatv	e0697c200f	add Git status description to FAQ	2019-12-02 13:09:06 +01:00
Jacek Musial	5c11690612	Correct typo in word starting	2019-11-29 12:35:01 +01:00
romkatv	8a759305dd	extend faq	2019-11-20 23:35:45 +01:00
romkatv	1777bd41a6	docs	2019-11-15 11:58:49 +01:00
romkatv	6294e59268	font docs	2019-11-08 14:27:11 +01:00
romkatv	1382fa7e81	revert most changes from 5605799	2019-11-08 12:59:39 +01:00
romkatv	5f9dd5a619	Merge branch 'master' of https://github.com/Nobody912/powerlevel10k into Nobody912-master	2019-11-08 12:45:45 +01:00
romkatv	2aca13130a	add --depth=1	2019-11-06 10:01:16 +01:00
Nobody912	56057992b9	Update README.md	2019-10-31 12:04:07 -07:00
romkatv	f9e548dde9	docs	2019-10-27 14:43:13 +01:00
romkatv	01640fccba	doc cleanup	2019-10-26 20:54:34 +02:00
romkatv	16d526377d	doc cleanup	2019-10-26 20:53:00 +02:00
romkatv	e8cf0f6d7e	doc cleanup	2019-10-26 20:52:08 +02:00
romkatv	627d471fca	improve instant prompt usability, update docs and add an option to the wizard to enable it	2019-10-26 20:43:38 +02:00
romkatv	b46a251b93	mention that prompt can be customized by editing ~/.p10k.zsh	2019-10-25 09:57:56 +02:00
romkatv	97dbf1d1fb	add a note saying that users should NOT enable instant prompt	2019-10-21 11:27:37 +02:00
romkatv	bb7b755c25	git clone --depth=1 in docker	2019-10-20 20:28:14 +02:00
romkatv	8e8385b700	doc formatting	2019-10-20 17:52:24 +02:00
romkatv	c675fc8cce	better instant prompt docs	2019-10-20 17:49:00 +02:00
romkatv	4d561553e5	document minimum version requirements for instant prompt	2019-10-20 17:31:03 +02:00
romkatv	de98e89d72	fix links	2019-10-20 17:28:54 +02:00
romkatv	b2d1f832e9	new docs: instant prompt and broken unicode glyph debugging	2019-10-20 17:25:16 +02:00
romkatv	4f02ad912f	enable instant prompt when configuration wizard runs	2019-10-20 16:40:51 +02:00
romkatv	f5a5484412	update docs to recommend cloning powerlevel10k git repo with --depth=1	2019-10-07 10:35:27 +02:00
romkatv	7fb12160d8	doc cleanup	2019-10-07 10:13:13 +02:00
romkatv	adfdf198b7	update loading time benchmark	2019-10-04 10:06:18 +02:00
romkatv	2862e5f395	replace ubuntu with archlinux in the docker command; it's faster to install	2019-10-04 08:00:06 +02:00
romkatv	6f11dca7d3	update loading time benchmarks	2019-10-03 22:15:30 +02:00
romkatv	4f3e6c5a8e	update docs: powerlevel10k is no longer slow to load (still not fast though)	2019-10-02 16:39:41 +02:00
romkatv	28a3cc7445	be explicit that zplugin ice is not supported	2019-09-20 12:21:08 +02:00
romkatv	5f15731c6a	add zplugin installation instructions	2019-09-19 17:44:21 +02:00
seiyeah78	cea71da00f	fix readme	2019-09-20 00:05:24 +09:00
romkatv	5b293c13a2	add font instructions for konsole and tilix; change instructions for gnome terminal ... The previous instructions for GNOME Terminal were simpler but they had a hidden risk. Namely, if users skip the first step (install Meslo) and go directly for the second (set Meslo as the default monospace font), their terminal gets fucked up. See #218.	2019-09-17 10:12:48 +02:00
romkatv	f5f5fba08f	doc cleanup	2019-09-12 10:55:34 +02:00
romkatv	1ec035ead3	font docs	2019-09-06 12:24:42 +02:00
romkatv	8e653efd01	remove obsolete faq entry about auto_name_dirs (there is a workaround in the code now)	2019-09-06 12:10:27 +02:00
George Schizas	5eb555e9a4	Fix name of old windows terminal emulator ... Command prompt is the shell, Console Host is the (equivalent) of xterm.	2019-09-03 10:40:45 +03:00
romkatv	9fbdebad90	update toc	2019-08-29 11:40:13 +02:00
romkatv	9bf56e7d46	add an faq entry about auto_name_dirs	2019-08-29 11:39:01 +02:00
romkatv	08026f5071	style	2019-08-24 11:33:15 +02:00
calico	7b120bc76f	Adding Hyper to README.md font instructions	2019-08-23 21:53:01 -04:00
Roman Perepelitsa	d68bd813ae	spelling	2019-08-14 05:08:43 +02:00
romkatv	3da8913ff7	add missing #	2019-08-12 15:01:22 +02:00
romkatv	7dd52c276c	add two more faq entries that recommended the recommended font	2019-08-12 15:00:39 +02:00
romkatv	8a320aaf4e	don't assume that people know how to download files from a browser	2019-08-10 07:58:10 +02:00
romkatv	3f9957c30a	add an FAQ entry for people who cannot click on a ttf file and press Install	2019-08-09 22:42:24 +02:00
romkatv	9efe06875a	font docs	2019-08-09 09:53:23 +02:00
romkatv	ad14a65165	update toc	2019-08-06 10:22:12 +02:00
romkatv	90caf479e0	add FAQ about the python logo not rendering in the wizard; fixes #151	2019-08-06 10:21:21 +02:00
romkatv	635b0d7c99	make it easier to change the untracked files icon; fixes #147	2019-08-02 09:39:40 +02:00
romkatv	9e9a6720e6	style	2019-08-02 09:17:30 +02:00
romkatv	caddad8e4f	update font instructions on windows	2019-08-02 09:02:07 +02:00
romkatv	efde7bf6f9	grammar	2019-08-01 20:44:52 +02:00
romkatv	fd64eaa6e5	style	2019-08-01 20:44:06 +02:00
romkatv	c6633f7171	update toc	2019-08-01 20:41:49 +02:00
romkatv	012a67aa38	extend faq	2019-08-01 20:40:31 +02:00
romkatv	ebfe37b0b6	font docs	2019-08-01 20:33:09 +02:00
romkatv	ef7c9e5ccc	font docs	2019-08-01 20:30:51 +02:00
romkatv	723d48d5c0	font docs	2019-08-01 19:23:40 +02:00
romkatv	a6b572da45	add p10k configure	2019-07-31 18:21:37 +02:00
romkatv	070697a914	grammar	2019-07-31 15:08:19 +02:00
romkatv	095dd3236d	docs	2019-07-31 15:07:19 +02:00
romkatv	75d39fabd8	recommend p9k_configure after changing fonts	2019-07-31 15:05:51 +02:00
romkatv	db961be558	update headline	2019-07-31 13:17:13 +02:00
romkatv	98cd3a0b4b	show new screenshot in the docs	2019-07-31 12:46:57 +02:00
romkatv	231a7b5f06	doc cleanup	2019-07-31 12:45:33 +02:00
romkatv	fa90d99636	docs: mention that background processes are one-per-shell ... https://github.com/romkatv/powerlevel10k/issues/139#issuecomment-516757677	2019-07-31 11:10:46 +02:00
romkatv	4c4402bfe4	better font instructions	2019-07-31 11:06:25 +02:00
romkatv	fbbce2603f	styling	2019-07-30 16:12:58 +02:00
romkatv	5000969dc6	docs	2019-07-30 16:03:58 +02:00
romkatv	16fa253116	update configuration and font guide	2019-07-30 16:02:42 +02:00
romkatv	45760187f3	spello	2019-07-24 19:28:01 +02:00
romkatv	9ab53b4e9c	update faq w.r.t. hot option update	2019-07-24 19:26:12 +02:00
romkatv	5ef0ec415e	shorten config instructions	2019-07-23 10:51:58 +02:00
romkatv	be48993469	make docker commands the same as the official installation instructions; otherwise people might copy them and use instead of the normal install	2019-07-23 10:48:56 +02:00
Roman Perepelitsa	a1c45a5f99	s/-O/-o/ ... Thanks, /u/eddygeez!	2019-07-21 21:10:04 +02:00
romkatv	34d02736ce	show p10k-lean.png in readme	2019-07-20 17:16:14 +02:00
romkatv	266fa777a1	docs	2019-07-20 16:56:34 +02:00
venyii	a74603d30f	Fix README typo	2019-07-05 19:26:00 +02:00
romkatv	dcb76b224e	add an faq entry saying that powerlevel10k is not fast to load	2019-07-04 15:24:32 +02:00
Syphdias	3848f210fa	fixes links broken by a5b13acb	2019-06-10 12:03:39 +02:00
romkatv	02608e8fe0	docs	2019-06-01 19:05:03 +02:00
romkatv	7bfc164cad	docs	2019-06-01 18:59:48 +02:00
romkatv	c4b3dff06a	docs: typo in hyperlinks	2019-06-01 10:48:36 +02:00
romkatv	b47370e1af	docs: typo in hyperlinks	2019-06-01 10:47:54 +02:00
romkatv	6c55d15c0f	docs: add asciinema comparing p9k and p10k perf; shorten some sections	2019-06-01 10:46:27 +02:00
romkatv	ecb5c098a2	minor doc cleanup	2019-05-30 09:02:03 +02:00
romkatv	f061377315	simplify prezto installation instructions now that p10k is bundled ... Thanks, @belak!	2019-05-29 23:11:27 +02:00
romkatv	a5b13acb35	docs	2019-05-27 20:25:56 +02:00
romkatv	fece2f1fb4	save a fork in docker command	2019-05-19 10:08:28 +02:00
romkatv	79ea46de97	lower the minimum required zsh version to 5.1	2019-04-30 13:39:27 +02:00
Roman Perepelitsa	5f384212ee	add license section	2019-03-25 19:21:25 +01:00
romkatv	0710cc7221	docs	2019-03-23 15:34:31 +01:00
romkatv	6b55a87fbf	docs	2019-03-23 12:34:31 +01:00
romkatv	c99aa3e1b0	docs	2019-03-23 12:33:25 +01:00
romkatv	72dd96e58b	docs	2019-03-23 11:46:51 +01:00
romkatv	bdf3613395	replace .purepower argument with PURE_POWER_MODE	2019-03-23 11:32:56 +01:00
romkatv	cea3f32d59	fix links	2019-03-23 00:12:47 +01:00
romkatv	078bf0d2f4	spello	2019-03-23 00:11:26 +01:00
romkatv	1140a79b10	docs	2019-03-22 21:11:10 +01:00
romkatv	4b273dd745	typo	2019-03-22 21:06:33 +01:00
romkatv	5fc4c6b826	typo	2019-03-22 21:06:17 +01:00
romkatv	4dd85e8918	add curl	2019-03-22 21:05:18 +01:00
romkatv	fd9b08a412	spello	2019-03-22 21:04:38 +01:00
romkatv	460155a9e5	fix links	2019-03-22 20:59:36 +01:00
romkatv	0ab0c04cf3	docs	2019-03-22 20:53:59 +01:00
Roman Perepelitsa	d1ddcb4ca7	docs	2019-03-22 19:29:34 +01:00
Roman Perepelitsa	094c99da3e	better link	2019-03-22 08:47:53 +01:00
Roman Perepelitsa	eb67fe0563	s/fork/reimplementation/ to avoid misleading people	2019-03-21 22:13:53 +01:00
romkatv	3e9a41d619	document LOADING git state and extra styling options	2019-03-20 14:47:55 +01:00
romkatv	b55cf134d6	remove no longer relevant item from faq	2019-03-18 18:25:42 +01:00
Roman Perepelitsa	5217a31b96	docs	2019-03-17 00:06:47 +01:00
romkatv	51def07661	update TOC	2019-03-14 20:49:38 +01:00
romkatv	7097aca6d3	docs	2019-03-14 20:46:18 +01:00
romkatv	ada73dc843	mention that POWERLEVEL9K_EXPERIMENTAL_TIME_REALTIME breaks completion menu	2019-03-14 15:59:02 +01:00
romkatv	aa17fb1403	fix cd	2019-03-14 15:39:29 +01:00
romkatv	53687dc51b	formatting	2019-03-14 15:38:12 +01:00
romkatv	4c713dae6c	it is up to 3 background processes now	2019-03-14 14:26:41 +01:00
romkatv	6d895fcf57	formatting	2019-03-14 14:03:04 +01:00
romkatv	24c5503a57	nitpickers will nitpick	2019-03-14 14:02:22 +01:00
romkatv	73a3b0ca86	fix TOC	2019-03-14 13:28:27 +01:00
romkatv	8b58b926ac	remove non-refreshing background jobs from known bugs. this is fixed	2019-03-14 13:28:00 +01:00
romkatv	f2787c7aad	docs	2019-03-13 19:03:31 +01:00
romkatv	696290fb22	links	2019-03-13 01:11:19 +01:00
romkatv	bcf8b27bae	add faq; remove whats-the-catch	2019-03-13 01:08:16 +01:00
Roman Perepelitsa	02a6766b4c	typo	2019-03-12 14:51:14 +01:00
romkatv	a8bfcded1b	formatting	2019-03-12 14:03:20 +01:00
romkatv	62ca3cf121	formatting	2019-03-12 14:02:39 +01:00
romkatv	f36b333b85	formatting	2019-03-12 14:01:57 +01:00
romkatv	bd06a514d7	update benchmarks	2019-03-12 14:01:20 +01:00
romkatv	ee66e12105	shorten the benchmarks section	2019-03-11 14:24:47 +01:00
romkatv	b3e98ebb95	document known bugs	2019-03-08 16:11:06 +01:00
romkatv	afd2d1f69e	add raspberry pie benchmarks	2019-03-07 12:46:26 +01:00
Roman Perepelitsa	e08fe374ed	docs	2019-03-07 01:38:41 +01:00
Roman Perepelitsa	002febf8ff	remove junk	2019-03-07 01:36:28 +01:00
Roman Perepelitsa	2a5a10fbc9	typo	2019-03-07 01:35:27 +01:00
romkatv	d1a1bf6325	update wsl benchmarks	2019-03-07 01:18:42 +01:00
romkatv	73e20123a7	docs	2019-03-07 01:00:52 +01:00
romkatv	aace3ac7f6	docs	2019-03-07 00:57:01 +01:00
romkatv	1858bbdd20	wip	2019-03-06 23:04:06 +01:00
Roman Perepelitsa	05177a8230	docs	2019-03-04 12:18:49 +01:00
romkatv	a05b085236	add table of contents; add try-it-in-docker	2019-03-04 11:56:37 +01:00
Roman Perepelitsa	88f3d25f90	replace git uris with https	2019-03-03 01:10:36 +01:00
romkatv	731d18d6f1	docs	2019-03-02 19:35:23 +01:00
romkatv	a6f5e68ffd	add wsl benchmarks	2019-03-02 19:28:29 +01:00
romkatv	a325489dcc	update benchmark data based on the latest optimizations	2019-03-02 18:06:10 +01:00
romkatv	362ef2e586	formatting	2019-03-02 18:00:40 +01:00
romkatv	27ee80e1b5	update benchmark data based on the latest optimizations	2019-03-02 17:58:27 +01:00
Roman Perepelitsa	496ac69dfb	docs	2019-03-02 17:44:18 +01:00
Roman Perepelitsa	2533d0aac8	docs	2019-03-02 17:34:07 +01:00
romkatv	8f34780b33	docs	2019-03-02 16:19:36 +01:00
romkatv	2134eaa427	docs	2019-03-02 16:14:55 +01:00
romkatv	caff1aa9f3	formatting	2019-03-02 16:12:38 +01:00
romkatv	f4c6b60331	docs	2019-03-02 16:06:40 +01:00
romkatv	afd7732058	docs	2019-03-02 15:59:43 +01:00
Roman Perepelitsa	0fc1203628	better structure	2019-03-02 00:30:26 +01:00
Roman Perepelitsa	78e8b909fb	add latency data	2019-03-02 00:16:59 +01:00
romkatv	ceae2d7422	remove most things	2019-03-01 21:45:36 +01:00
Dominik Ritter	c56cbb800a	Add documentation	2019-02-01 14:13:02 +01:00
Dominik Ritter	8b4bed99df	Add documentation about VIRTUAL_ENV_DISABLE_PROMPT #1128	2019-01-23 22:37:45 +01:00
Evan Schiewe	faa4cb23af	Uniformly apply inline code formatting ... All POWERLEVEL variables and directory paths should be formatted with backticks for inline code. If not marked as code, the ~ home directory can unintentionally apply strikethrough.	2018-11-15 15:41:56 -06:00
sblondon	544a383dad	Add forgotten backtick ... `truncate_to_first_and_last` is not properly displayed because the ending backtick is not there.	2018-09-16 11:25:49 +02:00
Ben Hilburn	358c105de7	Oops, this change should have been in last commit.	2018-09-06 09:47:35 -04:00
Ben Hilburn	572b7a1299	Removing rbenv from default LPROMPT list.	2018-09-06 09:38:34 -04:00
Dominik Ritter	69c69b9cd9	Merge remote-tracking branch 'nnja/patch-1' into prepare_066	2018-08-17 08:03:28 +02:00
Nina Zakharenko	cd723e7792	Fix broken link in README referencing date and time configuration ... Fix broken link referencing zsh date and time configuration in prompt expansion. The current broken link points to `http://zsh.sourceforge.net/Doc/Release Prompt-Expansion.html`, while the correct link is http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Date-and-time	2018-08-16 22:33:47 -07:00
xufab	acaf8c6087	Missing etc state for the dir segment in docs	2018-07-24 00:37:24 +02:00
Ben Hilburn	22a761208d	Merge pull request #900 from AlexaraWu/patch/pyenv ... Fix `pyenv` segment	2018-07-16 11:01:00 -04:00
Ben Hilburn	e95be8f208	Update to context segment README ... Just some minor spelling fixes.	2018-07-13 13:13:12 -04:00
Dominik Ritter	d1fc86e598	Add new states to context segment in README	2018-07-12 00:37:54 +02:00
Alexara Wu	fc39d9d6b8	Fix pyenv segment	2018-07-11 20:55:27 +08:00
Dominik Ritter	b7681a00ca	Fix variable in README ... - Fix the variable name for the VCS shorten strategy. - Add a heading for VCS truncation.	2018-06-11 21:59:33 +02:00
Dominik Ritter	a2d8cccd09	Add a Laravel version segment	2018-06-07 01:54:32 +02:00
Dominik Ritter	d9d9fb9b6b	Merge remote-tracking branch 'ytang/fix-icons-cut-off' into staging_065 ... Conflicts were: - test/segments/command_execution_time.spec and test/segments/go_version.spec: All conflicts come from renaming color names on next (#703) and adding a whitespace to the Visual Identifier (#854) on master.	2018-06-07 01:51:16 +02:00
Dominik Ritter	3456af3aac	Merge remote-tracking branch 'opes/chruby_options' into staging_065	2018-06-07 01:21:16 +02:00
Dominik Ritter	4c2f58bdbd	Merge remote-tracking branch 'VanRoy/master' into staging_065 ... Conflicts were: - functions/icons.zsh: The Java Segment was added on master, but on next were added various Segments with icons in the meantime. - powerlevel9k.zsh-theme: Java Segment was added on master, Dropbox Segment was added on next.	2018-06-07 00:11:15 +02:00
Dominik Ritter	154e923033	Merge remote-tracking branch 'floor114/next' into staging_065	2018-06-06 23:52:15 +02:00
Dominik Ritter	55473c450a	Merge branch 'master' into staging_065 ... Conflicts were: - README.md: Two commits targeted the brightness table. #781 from 14. April 2018 on master and #684 from 05. December 2017 on next. - powerlevel9k.zsh-theme: Two commits targeted the rbenv segment. Both achieve the same thing: To show the Ruby version number always. #795 on next from 14. April 2018 and #610 on master from 28. September 2017. I went with #795 here as this - although being newer - is the one on master, and that should be more stable.	2018-06-06 23:40:37 +02:00
Dan	fbb85e77e3	Merge branch 'master' into chruby_options	2018-04-30 11:07:55 -07:00
Dan	75c6838a0d	Alphabetize chruby documentation	2018-04-30 10:56:44 -07:00
Dan	05f44b94bf	Add options for customizing chruby segment	2018-04-30 10:52:15 -07:00
Kevin Chandler	c36b47b007	Update default public ip file name	2018-04-24 16:07:20 -07:00
Ben Hilburn	13b0e383a0	Merge pull request #795 from ryandav/rbenv-prompt-option-always-displays-#777 ... Rbenv prompt option always displays #777	2018-04-13 22:04:50 -04:00
Ben Hilburn	356f05f0e5	Merge branch 'master' into master	2018-04-13 21:46:05 -04:00
Ben Hilburn	6e3ceb8882	Merge pull request #799 from noraj/patch-1 ... add rvm to README	2018-04-13 21:38:30 -04:00
lifehackett	cfda084eb8	Another table formatting fix	2018-04-13 08:13:15 -06:00
lifehackett	02d4e76eb4	Fix table formatting in README	2018-04-13 08:07:43 -06:00
Alexandre ZANNI	2eddce2f62	add rvm ... see those files and look for `rvm` + https://github.com/bhilburn/powerlevel9k/blob/master/CHANGELOG.md + https://github.com/bhilburn/powerlevel9k/blob/master/powerlevel9k.zsh-theme	2018-04-12 22:54:34 +02:00
Taras Shpachenko	111d152d48	Add vcs branch name truncating.	2018-04-12 18:11:23 +03:00
Ryan Davidson	e85fb6c93d	#777 update Readme with POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable description	2018-04-03 14:04:28 +01:00
Julien Roy	b260adbc1b	Added a segment that shows the Java version.	2018-03-24 11:04:16 +01:00
Niklas Mollenhauer	4de4e8d9d7	Fix POWERLEVEL9k_BATTERY_STAGES Table	2018-03-22 01:05:35 +01:00
Niklas Mollenhauer	70fa74f631	Fix Brightness Table	2018-03-21 16:28:23 +01:00
Ben Hilburn	99f142de36	**LARGE MERGE THAT TOUCHES LOTS OF THINGS.** ... From this point until the next tagged release, `next` will be in a state of heavy flux as we make some significant and invasive changes.	2018-03-06 22:07:06 -05:00
Ben Hilburn	8c055f39d8	Moving documentation about newlines to the wiki.	2018-03-06 21:31:59 -05:00