stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
518 Commits 1 Branch 0 Tags 919 KiB
c1f04183c3
Commit Graph

325 Commits

Author SHA1 Message Date
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
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
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
nojhan
45fddb4517 feature #25 : unicode chars only for utf-8 charset, else latin 2012-08-13 22:23:43 +02:00
Luc Didry
0d0f8f108d Update comments 2012-08-13 22:09:49 +02:00
Poil
09d6ff48a7 Other improvment 2012-08-13 21:01:33 +02:00
Poil
7e8fc0e01f New shell detection 2012-08-13 20:47:29 +02:00
Poil
5db1507b96 Small improvement 2012-08-13 20:40:36 +02:00
Luc Didry
32a89f5b90 Update vim modeline since there is no more shebang 
Without shebang, vim doesn't know the filetype => syntaxic color off
 2012-08-13 20:20:18 +02:00
Ludovic Rousseau
86f8dba07f A login shell starts with a "-" 
A login shell process is started with a "-" as the first character in
the process name. It is the case with Terminal on Mac OS X.

See http://docstore.mik.ua/orelly/unix/upt/ch51_09.htm
 2012-08-13 16:37:56 +02:00
Ludovic Rousseau
0818aa1869 Warn if the shell is not supported 
If the shell is not recognised as a supported ("bash" and "zsh" for now)
then a warning will be displayed in red.

For example on Mac OS X the shell process is named "-bash" (note the
first character) and is not yet recognised as a valid shell name.
 2012-08-13 16:37:49 +02:00
Luc Didry
4c023a2a94 Fix bug: __battery:local:3: not an identifier: 0: 2012-08-13 16:34:02 +02:00
Luc Didry
c2fdb1751e Fix bug in load printing (% not escaped in zsh) 
Same thing than c8f01e68a3
 2012-08-13 15:20:20 +02:00
Luc Didry
e9099d15a3 Allow to have a /etc/liquidpromptrc 
Permit to have a modified configuration base for all users
 2012-08-13 14:30:54 +02:00
Luc Didry
39fc1df488 Smaller shell detection (Thx to Michel Barret) 2012-08-13 11:44:09 +02:00
Luc Didry
a11b838116 Change charging battery symbol and color 2012-08-13 10:02:10 +02:00
Luc Didry
9a33acef08 Fix bug: __battery:local:3: not an identifier: 0: 2012-08-13 09:27:14 +02:00
nojhan
1243987b80 Merge https://github.com/ldidry/liquidprompt 2012-08-12 12:16:10 +02:00
nojhan
508b218004 Indicate if the battery is (dis)charging 
Displays:
* a green ⌁ if the battery is charging and above a given threshold,
* a yellow ⌁ if the battery is charging and under threshold,
* a red ⌁ if the battery is discharging but above threshold;
 2012-08-12 12:13:47 +02:00
Luc Didry
e754319c9c Fix bug : shorten path didn't work anymore 
Stupido ! How can I have the length of $p before
its attribution ? Shame on me.
 2012-08-12 11:18:18 +02:00
Luc Didry
f7de6d019b Bug fix : no more path in bash ☹ 2012-08-12 11:02:48 +02:00
Luc Didry
2810d481aa Fix typo and remove trailing space 2012-08-12 10:52:03 +02:00
Luc Didry
fb5860bd26 Fix bug in shorten_path for zsh 2012-08-12 10:51:29 +02:00
Luc Didry
c8f01e68a3 Battery printing bug in zsh part (special character not escaped) 2012-08-12 10:38:52 +02:00
Luc Didry
4e94fa71ff Improvments for zsh shorten_path 2012-08-12 10:08:59 +02:00
Luc Didry
f51d6d21b5 Make liquidprompt bash AND zsh compliant 
The script now can be sourced from either bash and zsh
No more shebang and small improvments added too
 2012-08-12 00:46:05 +02:00