------- Generate themes.json -------

Merge pull request #314 from codeinred/nord-light
Increase Usability and Consistency of Nord Light
2023-08-10 21:12:46 +03:00 · 2021-11-02 14:32:04 +00:00 · 2021-11-02 09:24:05 -05:00 · 2021-11-02 09:23:27 -05:00 · 2021-11-02 09:22:05 -05:00 · 2021-11-02 09:21:22 -05:00
9 changed files with 210 additions and 10 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+data/themes.json binary
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Gogh
  :small_blue_diamond: <a href="http://mayccoll.github.io/Gogh"> Visit the Website </a> :small_blue_diamond:
 </div>

-## Color Scheme for Gnome Terminal, Pantheon Terminal, Tilix, and XFCE4 Terminal
+## Color scheme for your terminal

 Color Schemes For Ubuntu, Linux Mint, Elementary OS and all distributions that use Gnome Terminal, Pantheon Terminal, Tilix, or XFCE4 Terminal; initially inspired by Elementary OS Luna. Also works on iTerm for macOS. You can check out the themes [here](https://mayccoll.github.io/Gogh/).

@@ -17,8 +17,19 @@ Color Schemes For Ubuntu, Linux Mint, Elementary OS and all distributions that u

 ----

-<br/>
-<br/>
+## 💻 Terminals
+
+- Gnome - [Web](https://help.gnome.org/users/gnome-terminal/stable/)
+- Mintty - [Web](https://mintty.github.io/)
+- Mate - [Web](https://github.com/mate-desktop/mate-terminal)
+- Pantheon / Elementary - [Web](https://github.com/elementary/terminal)
+- Tilix - [Web](https://gnunn1.github.io/tilix-web/)
+- XFCE4 - [Web](https://docs.xfce.org/apps/terminal/start)
+- iTerm - [Web](https://iterm2.com/)
+- Cygwin - [Web](https://www.cygwin.com/)
+- Guake - [Web](https://sw.kovidgoyal.net/kitty/)
+- Foot - [Web](https://codeberg.org/dnkl/foot)
+- Kitty - [Web](https://sw.kovidgoyal.net/kitty/)

 ## ⚙️ Pre-Install

@@ -148,6 +159,11 @@ There is no blue without yellow and without orange.
 ## Author

 - Miguel D. Quintero - [Lanet.co](https://lanet.co)
+<form action="https://www.paypal.com/donate" method="post" target="_top">
+<input type="hidden" name="hosted_button_id" value="UCTBRYLUVKQ32" />
+<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" title="PayPal - The safer, easier way to pay online!" alt="Donate with PayPal button" />
+<img alt="" border="0" src="https://www.paypal.com/en_CO/i/scr/pixel.gif" width="1" height="1" />
+</form>

 <br/>
 <br/>
--- a/apply-colors.sh
+++ b/apply-colors.sh
@@ -57,6 +57,8 @@ if [[ -z "${TERMINAL:-}" ]]; then
    TERMINAL=$TERM_PROGRAM
  elif [[ "${OS#CYGWIN}" != "${OS}" ]]; then
    TERMINAL="mintty"
+  elif [[ "$TERM" = "xterm-kitty" ]]; then
+    TERMINAL="kitty"
  else
    # |
    # | Depending on how the script was invoked, we need
@@ -118,6 +120,16 @@ case "${TERMINAL}" in
    fi
    ;;

+  kitty )
+    if [[ -z "${KITTY_CONFIG_DIRECTORY:-}" ]]; then
+      KITTY_CONFIG_DIRECTORY="${HOME}/.config/kitty"
+    fi
+    CFGFILE="${KITTY_CONFIG_DIRECTORY}/kitty.conf"
+    if [[ ! -f "${CFGFILE}" ]]; then
+      printf '\n%s\n' "Error: Couldn't find an existing configuration file for Kitty."
+      exit 1
+    fi
+    ;;
 esac


@@ -476,6 +488,58 @@ apply_foot() {

 }

+apply_kitty() {
+  # |
+  # | Applying values on Kitty
+  # | ===========================================
+
+  echo "Patching kitty configuration file ($CFGFILE) with include of color theme file..."
+
+  COLOR_FILE="colors.conf"
+
+  if ! grep -q "^include $COLOR_FILE$" "$CFGFILE" ; then
+    echo "" >> "$CFGFILE"
+    echo "# Added by Gogh" >> "$CFGFILE"
+    echo "include $COLOR_FILE" >> "$CFGFILE"
+  fi
+
+  CFGFILE="${KITTY_CONFIG_DIRECTORY}/$COLOR_FILE"
+
+  echo "Updating color theme file ($CFGFILE) with theme..."
+
+  rm -f "$CFGFILE"
+
+  echo "# Color theme: $PROFILE_NAME" >> "$CFGFILE"
+  echo "# Auto-generated by Gogh (https://mayccoll.github.io/Gogh/)" >> "$CFGFILE"
+  echo "" >> "$CFGFILE"
+  echo "color0  $COLOR_01" >> "$CFGFILE"
+  echo "color1  $COLOR_02" >> "$CFGFILE"
+  echo "color2  $COLOR_03" >> "$CFGFILE"
+  echo "color3  $COLOR_04" >> "$CFGFILE"
+  echo "color4  $COLOR_05" >> "$CFGFILE"
+  echo "color5  $COLOR_06" >> "$CFGFILE"
+  echo "color6  $COLOR_07" >> "$CFGFILE"
+  echo "color7  $COLOR_08" >> "$CFGFILE"
+  echo "color8  $COLOR_09" >> "$CFGFILE"
+  echo "color9  $COLOR_10" >> "$CFGFILE"
+  echo "color10 $COLOR_11" >> "$CFGFILE"
+  echo "color11 $COLOR_12" >> "$CFGFILE"
+  echo "color12 $COLOR_13" >> "$CFGFILE"
+  echo "color13 $COLOR_14" >> "$CFGFILE"
+  echo "color14 $COLOR_15" >> "$CFGFILE"
+  echo "color15 $COLOR_16" >> "$CFGFILE"
+
+  echo "background $BACKGROUND_COLOR" >> "$CFGFILE"
+  echo "foreground $FOREGROUND_COLOR" >> "$CFGFILE"
+
+  [ -n "$HIGHLIGHT_FG_COLOR" ] && echo "selection_foreground $HIGHLIGHT_FG_COLOR" >> "$CFGFILE"
+  [ -n "$HIGHLIGHT_BG_COLOR" ] && echo "selection_background $HIGHLIGHT_BG_COLOR" >> "$CFGFILE"
+
+  echo "cursor $CURSOR_COLOR" >> "$CFGFILE"
+
+  echo "Done - please reopen your kitty terminal to see the changes"
+}
+
 apply_darwin() {
  # |
  # | Applying values on iTerm2
@@ -701,7 +765,7 @@ apply_xfce4-terminal() {
            else
                echo "${L_COLORPALETTE}" >> "${CONFFILE}"
            fi
-            
+
            if grep -q "^ColorCursor=" "${CONFFILE}"; then
                sed -i -r -e "s/^ColorCursor=.*/${L_COLORCURSOR}/" "${CONFFILE}"
            else
@@ -830,6 +894,10 @@ case "${TERMINAL}" in
    apply_foot
    ;;

+  kitty )
+    apply_kitty
+    ;;
+
  * )
    printf '%s\n'                                             \
    "Unsupported terminal!"                                   \
@@ -844,6 +912,7 @@ case "${TERMINAL}" in
    "   tilix"                                                \
    "   xfce4-terminal"                                       \
    "   foot"                                                 \
+    "   kitty"                                                \
    ""                                                        \
    "If you believe you have recieved this message in error," \
    "try manually setting \`TERMINAL', hint: ps -h -o comm -p \$PPID"
--- a/content/howto.md
+++ b/content/howto.md
@@ -15,7 +15,7 @@ Please feel free to use and create your own color schemes.

 - **The Script**

-https://github.com/Mayccoll/Gogh/blob/master/themes/_base.sh
+https://github.com/Mayccoll/Gogh/blob/master/_base.sh

 - **Variables**

--- a/data/themes.json
+++ b/data/themes.json
--- a/gogh.sh
+++ b/gogh.sh
@@ -24,6 +24,7 @@ declare -a THEMES=(
  'argonaut.sh'
  'arthur.sh'
  'atom.sh'
+  'aura.sh'
  'ayu-dark.sh'
  'ayu-light.sh'
  'ayu-mirage.sh'
@@ -34,6 +35,7 @@ declare -a THEMES=(
  'birds-of-paradise.sh'
  'blazer.sh'
  'bluloco-light.sh'
+  'bluloco-zsh-light.sh'
  'borland.sh'
  'broadcast.sh'
  'brogrammer.sh'
@@ -365,6 +367,8 @@ if [[ -z "${TERMINAL:-}" ]]; then
    TERMINAL=$TERM_PROGRAM
  elif [[ "${OS#CYGWIN}" != "${OS}" ]]; then
    TERMINAL="mintty"
+  elif [[ "$TERM" = "xterm-kitty" ]]; then
+    TERMINAL="kitty"
  else
    # |
    # | Depending on how the script was invoked, we need
--- a/themes/aura.sh
+++ b/themes/aura.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# ====================CONFIG THIS =============================== #
+export COLOR_01="#110f18"           # Black
+export COLOR_02="#ff6767"           # Red
+export COLOR_03="#61ffca"           # Green
+export COLOR_04="#ffca85"           # Yellow
+export COLOR_05="#a277ff"           # Blue
+export COLOR_06="#a277ff"           # Magenta
+export COLOR_07="#61ffca"           # Cyan
+export COLOR_08="#edecee"           # Light gray
+
+export COLOR_09="#6d6d6d"           # Dark gray
+export COLOR_10="#ffca85"           # Light Red
+export COLOR_11="#a277ff"           # Light Green
+export COLOR_12="#ffca85"           # Light Yellow
+export COLOR_13="#a277ff"           # Light Blue
+export COLOR_14="#a277ff"           # Light Magenta
+export COLOR_15="#61ffca"           # Light Cyan
+export COLOR_16="#edecee"           # White
+
+export BACKGROUND_COLOR="#15141B"   # Background Color
+export FOREGROUND_COLOR="#edecee"   # Foreground Color (text)
+export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color
+export PROFILE_NAME="Aura"
+# =============================================================== #
+
+
+
+
+
+
+
+# =============================================================== #
+# | Apply Colors
+# ===============================================================|#
+SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}"
+PARENT_PATH="$(dirname "${SCRIPT_PATH}")"
+
+# Allow developer to change url to forked url for easier testing
+# IMPORTANT: Make sure you export this variable if your main shell is not bash
+BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"}
+
+
+if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then
+  bash "${PARENT_PATH}/apply-colors.sh"
+else
+  if [[ "$(uname)" = "Darwin" ]]; then
+    # OSX ships with curl and ancient bash
+    bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")"
+  else
+    # Linux ships with wget
+    bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")"
+  fi
+fi
--- a/themes/bluloco-zsh-light.sh
+++ b/themes/bluloco-zsh-light.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# ====================CONFIG THIS =============================== #
+export COLOR_01="#e4e5f1"           # Black
+export COLOR_02="#d52753"           # Red
+export COLOR_03="#23974a"           # Green
+export COLOR_04="#df631c"           # Yellow
+export COLOR_05="#275fe4"           # Blue
+export COLOR_06="#823ff1"           # Magenta
+export COLOR_07="#27618d"           # Cyan
+export COLOR_08="#000000"           # Light gray
+
+export COLOR_09="#5794de"           # Dark gray
+export COLOR_10="#ff6480"           # Light Red
+export COLOR_11="#3cbc66"           # Light Green
+export COLOR_12="#c5a332"           # Light Yellow
+export COLOR_13="#0099e1"           # Light Blue
+export COLOR_14="#ce33c0"           # Light Magenta
+export COLOR_15="#6d93bb"           # Light Cyan
+export COLOR_16="#26272d"           # White
+
+export BACKGROUND_COLOR="#f9f9f9"   # Background Color
+export FOREGROUND_COLOR="#383a42"   # Foreground Color (text)
+export CURSOR_COLOR="$FOREGROUND_COLOR" # Cursor color
+export PROFILE_NAME="Bluloco Zsh Light"
+# =============================================================== #
+
+
+
+
+
+
+
+# =============================================================== #
+# | Apply Colors
+# ===============================================================|#
+SCRIPT_PATH="${SCRIPT_PATH:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}"
+PARENT_PATH="$(dirname "${SCRIPT_PATH}")"
+
+# Allow developer to change url to forked url for easier testing
+# IMPORTANT: Make sure you export this variable if your main shell is not bash
+BASE_URL=${BASE_URL:-"https://raw.githubusercontent.com/Mayccoll/Gogh/master"}
+
+
+if [[ -e "${PARENT_PATH}/apply-colors.sh" ]]; then
+  bash "${PARENT_PATH}/apply-colors.sh"
+else
+  if [[ "$(uname)" = "Darwin" ]]; then
+    # OSX ships with curl and ancient bash
+    bash -c "$(curl -so- "${BASE_URL}/apply-colors.sh")"
+  else
+    # Linux ships with wget
+    bash -c "$(wget -qO- "${BASE_URL}/apply-colors.sh")"
+  fi
+fi
--- a/themes/nord-light.sh
+++ b/themes/nord-light.sh
@@ -1,16 +1,16 @@
 #!/usr/bin/env bash

 # ====================CONFIG THIS =============================== #
-export COLOR_01="#353535" #black
+export COLOR_01="#003B4E" #black
 export COLOR_02="#E64569" #red
-export COLOR_03="#89D287" #green
+export COLOR_03="#069F5F" #green
 export COLOR_04="#DAB752" #yellow
 export COLOR_05="#439ECF" #blue
 export COLOR_06="#D961DC" #magenta
-export COLOR_07="#64AAAF" #cyan
+export COLOR_07="#00B1BE" #cyan
 export COLOR_08="#B3B3B3" #white

-export COLOR_09="#535353" #lightBlack
+export COLOR_09="#3E89A1" #lightBlack
 export COLOR_10="#E4859A" #lightRed
 export COLOR_11="#A2CCA1" #lightGreen
 export COLOR_12="#E1E387" #lightYellow
Author	SHA1	Message	Date
github-actions[bot]	673a98d53f	------- Generate themes.json -------	2021-11-02 14:32:04 +00:00
Mayccoll	75d6c13157	Merge pull request #314 from codeinred/nord-light Increase Usability and Consistency of Nord Light	2021-11-02 09:24:05 -05:00
Mayccoll	0d155a3a59	Merge pull request #313 from codeinred/attributes Mark data/themes.json as a binary file	2021-11-02 09:23:27 -05:00
Mayccoll	43df3054c8	Merge pull request #312 from codeinred/themes Create Bluloco Zsh Light theme	2021-11-02 09:22:05 -05:00
Mayccoll	9b365f4c6b	Merge pull request #311 from codeinred/docs Fix link to base script in howto docs	2021-11-02 09:21:22 -05:00
Alecto Irene Perez	29c2fd5088	Increase contrast of cyan Cyan is commonly used to display moved sections of text when viewing a git diff on the command line: the moved-from section is magenta, and the moved-to section is cyan. This commit increases the contrast of Cyan in the Nord Light theme to better cover these use cases, while still maintaining it's distinguishability as Cyan. Signed-off-by: Alecto Irene Perez <perez.cs@pm.me>	2021-11-02 00:16:43 -06:00
Alecto Irene Perez	f90dad51c3	Make Nord Light More Nord Update Nord Light theme to improve usability and make the black and grey colors a dark blue. Regarding usability: Prior to this change, it was extremely difficult to read green text with Nord Light because the green was such a light color that the text was hard to discern against the background. Green text is common in the output of commands like `git diff`, and many zsh themes use green text to indicate the existence of a command. This commit uses a darker green that's still in line with the theme. Regarding update to black and grey: using dark blue and blue-grey colors for Black and Grey respectively is more in line with the style choices made by the Nord theme. Signed-off-by: Alecto Irene Perez <perez.cs@pm.me>	2021-11-01 19:02:44 -06:00
Alecto Irene Perez	8332969b10	Mark data/themes.json as a binary file This adds a .gitattributes file that marks data/themes.json as binary. data/themes.json stores all it's data on a single line, and that entire line is marked as changed between commits. By marking it as binary, git displays diffs more accurately. NB: As an alternative to marking it as binary, we could also modify tools/generate.sh so that it doesn't generate the entire file on one line. This can be done by removing the `tr -d " \t\n\r"` portion of the script. Doing so would ensure that git only stored the sections of the themes.json file that changed when a theme was modified or added. Signed-off-by: Alecto Irene Perez <perez.cs@pm.me>	2021-11-01 17:28:20 -06:00
Alecto Irene Perez	3de6d70c35	Create Bluloco Zsh Light theme Creates the Bluloco Zsh Light theme. This theme is adjusts the Bluloco theme to increase the relative contrast of "Dark Grey" (color 9), which was previously almost white. This rendered autocompleted or greyed-out text nearly unreadable. Signed-off-by: Alecto Irene Perez <perez.cs@pm.me>	2021-11-01 16:59:32 -06:00
Alecto Irene Perez	10eb1487ee	Fix link to base script in howto docs This commit fixes a link to the _base script in the howto docs Signed-off-by: Alecto Irene Perez <perez.cs@pm.me>	2021-11-01 16:39:08 -06:00
github-actions[bot]	769b681828	------- Generate themes.json -------	2021-10-25 19:59:24 +00:00
Mayccoll	6f877c9031	Add aura to gogh list	2021-10-25 14:57:16 -05:00
Mayccoll	27900c1a64	Merge pull request #309 from r2binx/master Add Aura theme	2021-10-25 14:55:16 -05:00
Robin Härle	8f6f58602f	Add Aura theme	2021-10-24 19:54:57 +02:00
Miguelq	2f3a0b57c5	add list of terminals	2021-09-12 18:55:06 -05:00
Mayccoll	7866f8c1d9	Merge pull request #308 from z-nexx/kitty Added support for Kitty	2021-09-12 17:49:32 -05:00
z-nexx	e7e4780f54	Fixed comments in kitty config file header and optinal selection colors	2021-09-12 20:20:37 +02:00
z-nexx	851f840380	Added support for Kitty	2021-09-12 20:20:17 +02:00