Olivier Mengué
4b42dffb66
Fix return followed by '""'
...
@ldidry Shell functions return only an error code.
2012-08-16 16:16:51 +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
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
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
2012-08-14 12:08:43 +02:00
nojhan
7b4c68f919
Colors themes for most of the propmt parts
...
Set of parameters to change the colors, VCS still not themable.
2012-08-14 12:01:14 +02:00
Ludovic Rousseau
5c7c50e6ea
Remove declaration of LP_REVERSE
...
LP_REVERSE use has been removed in commit
21808bb5e2
2012-08-14 11:48:44 +02:00
nojhan
6b5111d8f5
Config files sourcing order
...
Always source /etc config file if it exists, before home ones.
Source config after colors declarations, to prepare theme management.
2012-08-14 11:10:12 +02:00
nojhan
5ad9e1c5dc
bring back B&W colors, alt user in bold
2012-08-14 10:56:34 +02:00
nojhan
82ee96a63a
Merge pull request #31 from jaesivsm/master
...
Bugfix _LP_OPEN_ESC, use nproc, prepare themes
2012-08-14 01:52:12 -07:00
Poil
6bffd34543
bugfix tty grab
2012-08-14 10:36:36 +02:00
François Schmidts
21808bb5e2
trusting default shell colors
...
supressing config option in configuration file
2012-08-14 00:56:27 +02:00
François Schmidts
3abc3999dd
nproc is slightly faster than grep on my machine
...
could improve overall performance, plus nproc belong to coreutils, so it
should be pretty common
2012-08-14 00:42:08 +02:00
François Schmidts
a15f104fa8
fixing redefinition of var _LP_OPEN_ESC
...
the color tag wern't closed with bash
2012-08-14 00:37:36 +02:00
nojhan
0125ee0cef
manual merge
2012-08-13 23:17:45 +02:00
nojhan
7b8ba5e7f9
fix #26 : prefix with _lp_ or LP_ and local variables
2012-08-13 23:15:24 +02:00
Luc Didry
34826d0353
Fix bug : forgot to change a 'bash' into ${WORKING_SHELL}
2012-08-13 23:07:58 +02:00
Poil
6f0bf08f61
faster TTY grab
2012-08-13 22:43:13 +02:00
nojhan
3b6d8c8e68
typo bad merge
2012-08-13 22:41:57 +02:00
nojhan
b882e1550e
merge shell grab and mac shell
2012-08-13 22:37:27 +02:00
nojhan
9fb2965c4b
adapter mark default set
2012-08-13 22:28:50 +02:00
nojhan
956ed8717c
Merge branch 'master' of https://github.com/nojhan/liquidprompt
2012-08-13 22:24:19 +02:00
