Commit Graph

511 Commits

Author SHA1 Message Date
nojhan
733522d2c7 Merge branch 'master' of https://github.com/nojhan/liquidprompt 2012-08-16 23:22:08 +02:00
nojhan
0692501ad1 correct proxy mark 2012-08-16 20:54:16 +02:00
nojhan
9051f3fb70 rename _lp_set_bash_prompt as _lp_set_prompt 2012-08-16 20:18:29 +02:00
nojhan
861f7c382d Add the screenshot to the readme 2012-08-16 20:47:41 +03:00
nojhan
0e7d3bf2b8 Merge pull request #55 from dolmen/fix/unify-LP_ENABLE-style
Unify style of LP_ENABLE_ variable handling
2012-08-16 10:40:17 -07:00
nojhan
ed9f655ad2 Merge pull request #54 from jaesivsm/develop
fix mark
2012-08-16 10:38:22 -07:00
Olivier Mengué
a4a6cf3008 Unify style of LP_ENABLE_ variable handling
See commit 7d4ca77009 for a rationale.
2012-08-16 18:35:07 +02:00
François Schmidts
7ee027e243 fix mark
in recent vars renaming we lost the custom mark
2012-08-16 17:56:36 +02:00
nojhan
39ba4c33f1 Add conditionnal enabling for the battery meter
Early detection when `acpi` is missing.
Update the README.
2012-08-16 17:10:58 +02:00
nojhan
b48a0cc8fc manual merge 2012-08-16 17:04:36 +02:00
Olivier Mengué
b52cb624bc Detect SCM tool presence just once
For git/svn/hg, the tool presence in $PATH is detected just once at init
time (instead of at runtime, at every prompt display) and the LP_ENABLE_
variable is set to false if it is missing.
2012-08-16 16:39:20 +02:00
Olivier Mengué
7d4ca77009 The only true value is 1, everything else is false
For boolean variables (there is no such type in shell) we consider
that '1' is true, and everything else ('0', ''...) is false.
So all tests are now done by comparing the "one true value", '1', and
variables expansion is protected with quotes.
Affects LP_ENABLE_*, LP_HOSTNAME_ALWAYS.
2012-08-16 16:31:00 +02:00
Olivier Mengué
4b42dffb66 Fix return followed by '""'
@ldidry Shell functions return only an error code.
2012-08-16 16:16:51 +02:00
nojhan
af629fe960 rename LP_UNTRACKED to LP_MARK_UNTRACKED 2012-08-16 15:51:01 +02:00
nojhan
38c4362836 Add enable parameters for all features
Merge branch 'disable_vcs' of ssh://localhost:8480/ldidry/liquidprompt into develop
If permissions are not enabled, echo a uncolored colon.
2012-08-16 15:34:03 +02:00
nojhan
a3be8d3465 More consistent special chars variable names
Basically rename LP_*_MARK to LP_MARK_* and list them in the README.
2012-08-16 15:22:01 +02:00
Luc Didry
05fcbe909a Allow to disable load, battery, etc. in the rc file
Yes, much more config options, but it allows to lighten the prompt and
so improve its speed. I wanted to detect the useful parts by parsing the
theme but it seems impossible (I didn't find how).
2012-08-16 15:16:48 +02:00
nojhan
991b2b38be add configurable untracked changes mark, at a better position 2012-08-16 14:28:55 +02:00
nojhan
822b20eec6 Merge ssh://localhost:8480/alexprengere/liquidprompt into develop 2012-08-16 14:16:31 +02:00
Alex
34c8d901ce Changed default zsh prompt mark from $ to % 2012-08-16 14:11:52 +02:00
Alex
3046024b29 Adding git untracked files information (branch* instead of branch if so) 2012-08-16 14:08:07 +02:00
nojhan
309ccd86fd Merge ssh://localhost:8480/jaesivsm/liquidprompt into develop 2012-08-16 13:42:39 +02:00
François Schmidts
72b4001a41 fix for issue #44 2012-08-16 13:07:32 +02:00
nojhan
170628b676 Separate templates from themes
This add colors to features in the main code, so as to avoid having to specify
them in the template part. LP_PS1 is thus easier to set, with just a list of
features to activate along with basic characters.
2012-08-16 12:13:40 +02:00
Luc Didry
71c9b6ddb8 Update README : the theme must be sourced *before* LP 2012-08-16 11:21:14 +02:00
Luc Didry
2774c8fc37 Bugfix : No more yellow color while being root 2012-08-16 11:18:17 +02:00
nojhan
a2af9a0b4a Merge branch 'disable_vcs' of ssh://localhost:8480/ldidry/liquidprompt into develop 2012-08-16 11:17:12 +02:00
Luc Didry
4b1f4646de Use short name (MERCURIAL => HG) for variable LP_ENABLE_MERCURIAL 2012-08-16 10:40:20 +02:00
Olivier Mengué
9feb14caa5 Fix _lp_CPUNUM on Linux when 'nproc' is missing
On Linux, hide the "command not found" message on Linux when 'nproc'
is missing and the grep fallback is used.
(nproc doesn't exist on Debian Lenny, see issue #31 and #36)
2012-08-16 00:25:58 +02:00
Luc Didry
36954546d7 Allow to disable git/svn/mercurial features
New variables in liquidpromptrc for that
2012-08-15 11:45:02 +02:00
Olivier Mengué
fc7b317c1f Unset LP_OS for runtime
Now that LP_OS is not used at runtime, unset it at the end of the init.
2012-08-15 00:21:21 +02:00
Olivier Mengué
2a833475bc Refactor CPU load
Use a single function name for collecting loadavg. Reduces pollution
(issue #28).
Refactor _lp_load_color: less code but same features.
2012-08-15 00:11:34 +02:00
Olivier Mengué
7f5346f953 Refactor _lp_CPUNUM 2012-08-14 23:24:55 +02:00
Olivier Mengué
1f21d7ff5e Refactor OS detection
Darwin is merged with FreeBSD as all Darwin implementation are already
delegating to FreeBSD implementations.
2012-08-14 23:10:49 +02:00
nojhan
78b9aff683 config notab everywhere 2012-08-14 15:59:36 +02:00
nojhan
7693c0394c bugfix: local connection if session is :0 but not :0.0 2012-08-14 15:55:23 +02:00
nojhan
a4ec9a4d72 Merge branch 'feature/optimize-LP_HOST' of ssh://localhost:8480/dolmen/liquidprompt 2012-08-14 15:50:06 +02:00
nojhan
c90f31351c add examples an explanations on how to make themes 2012-08-14 15:38:33 +02:00
Olivier Mengué
24858a4fdd Fix tabs 2012-08-14 15:11:48 +02:00
nojhan
660bc29d8c add configurable colormaps 2012-08-14 15:06:58 +02:00
Olivier Mengué
413fc068c7 Add myself as contributor 2012-08-14 14:41:23 +02:00
nojhan
36fd1c8f52 color themes for VCS and battery marks 2012-08-14 14:35:20 +02:00
Olivier Mengué
c9d43a52fa Optimize LP_HOST
Simplify _lp_connection (code reduced by 70%, much less external
programs used).
Call _lp_connection just once at init time.
Inline _lp_host_color.
LP_HOST is now a global defined just once.
2012-08-14 14:33:30 +02:00
nojhan
8e3d2fe0c8 remove tabs and change readme title 2012-08-14 14:12:33 +02:00
nojhan
aa0f725b99 Merge pull request #36 from jaesivsm/master
Reverting nproc adding
2012-08-14 03:20:06 -07:00
nojhan
9f06ebe883 Merge pull request #35 from dolmen/fix/WORKING_SHELL
Fix shell detection
2012-08-14 03:18:53 -07:00
nojhan
cd77001459 remove deprecated LP_REVERSE 2012-08-14 12:16:48 +02:00
François Schmidts
6d45328d02 Revert "nproc is slightly faster than grep on my machine"
This reverts commit 3abc3999dd.

Conserving retro compatibility with lenny.
2012-08-14 12:11:44 +02:00
nojhan
a7870b966b default theme colors 2012-08-14 12:09:11 +02:00
Olivier Mengué
522c7208fe Fix shell detection
Faster detection based only on BASH_VERSION/ZSH_VERSION variables.
Fixes shell detection (sub shell detection broken in 7e8fc0e).
Should better fail when started with an other shell than bash/zsh.
2012-08-14 12:08:43 +02:00