From 0f0a45b7fcd3a074c5918947270ed4112001c37d Mon Sep 17 00:00:00 2001 From: jphager2 Date: Sat, 13 Oct 2018 01:30:07 +0200 Subject: [PATCH 1/5] Allow TERMINAL to be set by environment --- apply-colors.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/apply-colors.sh b/apply-colors.sh index 1b40164..43606e6 100755 --- a/apply-colors.sh +++ b/apply-colors.sh @@ -102,16 +102,18 @@ set_theme() { # | # | Check for the terminal name (depening on os) # | =========================================== -OS=$(uname) -if [ "$OS" = "Darwin" ]; then - # | - # | Check for the terminal name and decide how to apply - # | =========================================== - TERMINAL=$TERM_PROGRAM -elif [ "${OS#CYGWIN}" != "${OS}" ]; then - TERMINAL="mintty" -else - TERMINAL="$(ps -p $(ps -p $(ps -p $$ -o ppid=) -o ppid=) -o args=)" +if [[ -z "$TERMINAL" ]]; then + OS=$(uname) + if [ "$OS" = "Darwin" ]; then + # | + # | Check for the terminal name and decide how to apply + # | =========================================== + TERMINAL=$TERM_PROGRAM + elif [ "${OS#CYGWIN}" != "${OS}" ]; then + TERMINAL="mintty" + else + TERMINAL="$(ps -p $(ps -p $(ps -p $$ -o ppid=) -o ppid=) -o args=)" + fi fi # | From 9abf91f819d4e9df526112b3cea5b91e3353535e Mon Sep 17 00:00:00 2001 From: Mohamed Amine Griche Date: Tue, 16 Oct 2018 22:18:25 +0200 Subject: [PATCH 2/5] Aadding the nighty theme --- themes/nighty.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 themes/nighty.sh diff --git a/themes/nighty.sh b/themes/nighty.sh new file mode 100644 index 0000000..ed67207 --- /dev/null +++ b/themes/nighty.sh @@ -0,0 +1,68 @@ +#!/usr/bin/env bash + +# ====================CONFIG THIS =============================== # +COLOR_01="#373D48" # Black +COLOR_02="#9B3E46" # Red +COLOR_03="#095B32" # Green +COLOR_04="#808020" # Yellow +COLOR_05="#1D3E6F" # Blue +COLOR_06="#823065" # Cyan +COLOR_07="#3A7458" # Magenta +COLOR_08="#828282" # Light gray + +COLOR_09="#5C6370" # Dark gray +COLOR_10="#D0555F" # Light Red +COLOR_11="#119955" # AM77 Green +COLOR_12="#DFE048" # Light Yellow +COLOR_13="#4674B8" # Light Blue +COLOR_14="#ED86C9" # Light Cyan +COLOR_15="#70D2A4" # Light Magenta +COLOR_16="#DFDFDF" # White + +BACKGROUND_COLOR="#282a36" # Background Color +FOREGROUND_COLOR="#94A3A5" # Foreground Color (text) +CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color +PROFILE_NAME="nighty" +# ============================================= + + + + + + + +# =============================================================== # +# | Apply Colors +# ===============================================================|# +function gogh_colors () { + echo "" + echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" + echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" + echo "" +} + +function curlsource() { + f=$(mktemp -t curlsource) + curl -o "$f" -s -L "$1" + source "$f" + rm -f "$f" +} + +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +PARENT_PATH="$(dirname "$SCRIPT_PATH")" + +gogh_colors + +if [ -e $PARENT_PATH"/apply-colors.sh" ] +then + source $PARENT_PATH"/apply-colors.sh" +else + if [ $(uname) = "Darwin" ]; then + # OSX ships with curl and ancient bash + # Note: here, sourcing directly from curl does not work + curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + else + # Linux ships with wget + source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + fi +fi From 422b6eb52299d127d663ebf1e5b92299b9f2d455 Mon Sep 17 00:00:00 2001 From: Mayccoll Date: Tue, 16 Oct 2018 16:39:41 -0500 Subject: [PATCH 3/5] Update gogh.sh --- gogh.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gogh.sh b/gogh.sh index fb909b7..2580120 100755 --- a/gogh.sh +++ b/gogh.sh @@ -95,6 +95,7 @@ declare -a THEMES=( 'neutron.sh' 'nightlion-v1.sh' 'nightlion-v2.sh' + 'nighty.sh' 'nord-light.sh' 'nord.sh' 'novel.sh' From f552f8653e6806ed2ca182550a80e039cfdb8f20 Mon Sep 17 00:00:00 2001 From: Mohamed Amine Griche Date: Tue, 16 Oct 2018 22:18:25 +0200 Subject: [PATCH 4/5] Adding the nighty theme --- themes/nighty.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 themes/nighty.sh diff --git a/themes/nighty.sh b/themes/nighty.sh new file mode 100644 index 0000000..ed67207 --- /dev/null +++ b/themes/nighty.sh @@ -0,0 +1,68 @@ +#!/usr/bin/env bash + +# ====================CONFIG THIS =============================== # +COLOR_01="#373D48" # Black +COLOR_02="#9B3E46" # Red +COLOR_03="#095B32" # Green +COLOR_04="#808020" # Yellow +COLOR_05="#1D3E6F" # Blue +COLOR_06="#823065" # Cyan +COLOR_07="#3A7458" # Magenta +COLOR_08="#828282" # Light gray + +COLOR_09="#5C6370" # Dark gray +COLOR_10="#D0555F" # Light Red +COLOR_11="#119955" # AM77 Green +COLOR_12="#DFE048" # Light Yellow +COLOR_13="#4674B8" # Light Blue +COLOR_14="#ED86C9" # Light Cyan +COLOR_15="#70D2A4" # Light Magenta +COLOR_16="#DFDFDF" # White + +BACKGROUND_COLOR="#282a36" # Background Color +FOREGROUND_COLOR="#94A3A5" # Foreground Color (text) +CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color +PROFILE_NAME="nighty" +# ============================================= + + + + + + + +# =============================================================== # +# | Apply Colors +# ===============================================================|# +function gogh_colors () { + echo "" + echo -e "\033[0;30m█████\\033[0m\033[0;31m█████\\033[0m\033[0;32m█████\\033[0m\033[0;33m█████\\033[0m\033[0;34m█████\\033[0m\033[0;35m█████\\033[0m\033[0;36m█████\\033[0m\033[0;37m█████\\033[0m" + echo -e "\033[0m\033[1;30m█████\\033[0m\033[1;31m█████\\033[0m\033[1;32m█████\\033[0m\033[1;33m█████\\033[0m\033[1;34m█████\\033[0m\033[1;35m█████\\033[0m\033[1;36m█████\\033[0m\033[1;37m█████\\033[0m" + echo "" +} + +function curlsource() { + f=$(mktemp -t curlsource) + curl -o "$f" -s -L "$1" + source "$f" + rm -f "$f" +} + +SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +PARENT_PATH="$(dirname "$SCRIPT_PATH")" + +gogh_colors + +if [ -e $PARENT_PATH"/apply-colors.sh" ] +then + source $PARENT_PATH"/apply-colors.sh" +else + if [ $(uname) = "Darwin" ]; then + # OSX ships with curl and ancient bash + # Note: here, sourcing directly from curl does not work + curlsource https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh + else + # Linux ships with wget + source <(wget -O - https://raw.githubusercontent.com/Mayccoll/Gogh/master/apply-colors.sh) + fi +fi From fa0fed4bb1bf77086ee8552256cdc11f3beee3b7 Mon Sep 17 00:00:00 2001 From: Mohamed Amine Griche Date: Wed, 17 Oct 2018 13:11:35 +0200 Subject: [PATCH 5/5] Updating the bg && fg colors in the nighty theme. --- themes/nighty.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/nighty.sh b/themes/nighty.sh index ed67207..8286732 100644 --- a/themes/nighty.sh +++ b/themes/nighty.sh @@ -19,8 +19,8 @@ COLOR_14="#ED86C9" # Light Cyan COLOR_15="#70D2A4" # Light Magenta COLOR_16="#DFDFDF" # White -BACKGROUND_COLOR="#282a36" # Background Color -FOREGROUND_COLOR="#94A3A5" # Foreground Color (text) +BACKGROUND_COLOR="#2F2F2F" # Background Color +FOREGROUND_COLOR="#DFDFDF" # Foreground Color (text) CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color PROFILE_NAME="nighty" # =============================================