From 961b9d03b183a360b80273bf0d5b20985f6c49f2 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Mon, 4 Dec 2017 15:22:19 -0800 Subject: [PATCH 1/6] add user segment --- segments/__flseg_user.fish | 9 +++++++++ tests/fltest_user.fish | 8 ++++++++ 2 files changed, 17 insertions(+) create mode 100644 segments/__flseg_user.fish create mode 100644 tests/fltest_user.fish diff --git a/segments/__flseg_user.fish b/segments/__flseg_user.fish new file mode 100644 index 0000000..b6aeabf --- /dev/null +++ b/segments/__flseg_user.fish @@ -0,0 +1,9 @@ +#!/usr/bin/env fish +# -*- mode:fish; tab-width:4 -*- + +function __flseg_user + + __fishline_segment $FLCLR_USER_BG $FLCLR_USER_FG + printf $USER + +end diff --git a/tests/fltest_user.fish b/tests/fltest_user.fish new file mode 100644 index 0000000..93e0e23 --- /dev/null +++ b/tests/fltest_user.fish @@ -0,0 +1,8 @@ +#!/usr/bin/env fish +# -*- mode:fish; tab-width:4 -*- + +function fltest_user + + __fishline_test USER + +end From 9b581546a1782748e76001fd800af5a2855cf3a8 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Mon, 4 Dec 2017 15:46:10 -0800 Subject: [PATCH 2/6] use userhost colors for User segment --- segments/__flseg_user.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/segments/__flseg_user.fish b/segments/__flseg_user.fish index b6aeabf..9bd291d 100644 --- a/segments/__flseg_user.fish +++ b/segments/__flseg_user.fish @@ -3,7 +3,7 @@ function __flseg_user - __fishline_segment $FLCLR_USER_BG $FLCLR_USER_FG + __fishline_segment $FLCLR_USERHOST_BG $FLCLR_USERHOST_FG printf $USER end From 7f6acd1a8f173a9ceaa1ac8c14b01876e9cba3b5 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Mon, 4 Dec 2017 15:58:52 -0800 Subject: [PATCH 3/6] add seperate colorset for HOST segment --- themes/default_256_colors.fish | 4 +++- themes/default_ansi_colors.fish | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/themes/default_256_colors.fish b/themes/default_256_colors.fish index 6acfdb4..abd37ae 100644 --- a/themes/default_256_colors.fish +++ b/themes/default_256_colors.fish @@ -56,7 +56,9 @@ set FLCLR_GIT_FG_DETACHED white set FLCLR_CLOCK_BG $__256_blue set FLCLR_CLOCK_FG white -# Color for USERHOST segment +# Color for USER and USERHOST segments +set FLCLR_USERHOST_FG black +set FLCLR_USER_BG $__256_white set FLCLR_USERHOST_BG $__256_white set FLCLR_USERHOST_FG black diff --git a/themes/default_ansi_colors.fish b/themes/default_ansi_colors.fish index 7d48179..b6b77c7 100644 --- a/themes/default_ansi_colors.fish +++ b/themes/default_ansi_colors.fish @@ -47,7 +47,9 @@ set FLCLR_GIT_FG_DETACHED normal set FLCLR_CLOCK_BG white set FLCLR_CLOCK_FG black -# Color for USERHOST segment +# Color for USER and USERHOST segments +set FLCLR_USER_BG cyan +set FLCLR_USER_FG normal set FLCLR_USERHOST_BG cyan set FLCLR_USERHOST_FG normal From bddf62a3237d5f011b4a844b2fa78473d653caff Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Mon, 4 Dec 2017 16:02:38 -0800 Subject: [PATCH 4/6] Fix color formatting and other things --- segments/__flseg_user.fish | 2 +- themes/default_256_colors.fish | 4 ++-- themes/default_ansi_colors.fish | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/segments/__flseg_user.fish b/segments/__flseg_user.fish index 9bd291d..b6aeabf 100644 --- a/segments/__flseg_user.fish +++ b/segments/__flseg_user.fish @@ -3,7 +3,7 @@ function __flseg_user - __fishline_segment $FLCLR_USERHOST_BG $FLCLR_USERHOST_FG + __fishline_segment $FLCLR_USER_BG $FLCLR_USER_FG printf $USER end diff --git a/themes/default_256_colors.fish b/themes/default_256_colors.fish index abd37ae..89e8a88 100644 --- a/themes/default_256_colors.fish +++ b/themes/default_256_colors.fish @@ -57,8 +57,8 @@ set FLCLR_CLOCK_BG $__256_blue set FLCLR_CLOCK_FG white # Color for USER and USERHOST segments -set FLCLR_USERHOST_FG black -set FLCLR_USER_BG $__256_white +set FLCLR_USER_BG $__256_white +set FLCLR_USER_FG black set FLCLR_USERHOST_BG $__256_white set FLCLR_USERHOST_FG black diff --git a/themes/default_ansi_colors.fish b/themes/default_ansi_colors.fish index b6b77c7..fc91436 100644 --- a/themes/default_ansi_colors.fish +++ b/themes/default_ansi_colors.fish @@ -48,8 +48,8 @@ set FLCLR_CLOCK_BG white set FLCLR_CLOCK_FG black # Color for USER and USERHOST segments -set FLCLR_USER_BG cyan -set FLCLR_USER_FG normal +set FLCLR_USER_BG cyan +set FLCLR_USER_FG normal set FLCLR_USERHOST_BG cyan set FLCLR_USERHOST_FG normal From 2f570f6746f44b3f0972540d527dafefa09060bc Mon Sep 17 00:00:00 2001 From: Jean-Philippe Roemer Date: Tue, 5 Dec 2017 11:26:04 +0000 Subject: [PATCH 5/6] themes: add USER colors to tty_compatible theme --- themes/tty_compatible.fish | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/themes/tty_compatible.fish b/themes/tty_compatible.fish index 3482ea6..c3af5cb 100644 --- a/themes/tty_compatible.fish +++ b/themes/tty_compatible.fish @@ -100,7 +100,9 @@ set FLCLR_GIT_FG_DETACHED red set FLCLR_CLOCK_BG normal set FLCLR_CLOCK_FG yellow -# Color for USERHOST segment +# Color for USER and USERHOST segments +set FLCLR_USER_BG normal +set FLCLR_USER_FG purple set FLCLR_USERHOST_BG normal set FLCLR_USERHOST_FG purple From 6d0dc7ffd4b63514230a583e139d88aaf7c44727 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Roemer Date: Tue, 29 Aug 2017 16:35:41 +0100 Subject: [PATCH 6/6] README: add logo to README --- README.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b6e472a..7129057 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,13 @@ -# fishline - -[![Join the chat at https://gitter.im/0rax/fishline](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/0rax/fishline?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -**A powerline prompt framework for the fish-shell built in fish-shell.** +

+ +

+

A powerline prompt framework for the fish-shell built in fish-shell

+

+ Latest release + Join the chat at https://gitter.im/0rax/fishline +

+ +## Preview ![fishline_preview](https://raw.githubusercontent.com/0rax/fishline/screenshots/prompt.png "Fishline Preview")