From c41022ff7fad62821f620d3e2ee22ada5e2faa38 Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 28 Feb 2019 18:27:19 -0700 Subject: [PATCH 01/42] Issue #330: MacOS Mojave Dock Crash --- pywal/wallpaper.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py index e648d5a..3ab38af 100644 --- a/pywal/wallpaper.py +++ b/pywal/wallpaper.py @@ -109,7 +109,18 @@ def set_mac_wallpaper(img): """Set the wallpaper on macOS.""" db_file = "Library/Application Support/Dock/desktoppicture.db" db_path = os.path.join(HOME, db_file) - subprocess.call(["sqlite3", db_path, "update data set value = '%s'" % img]) + img_dir, _ = os.path.split(img); + + #Clear the existing picture data and write the image paths + sql = "delete from data; " + sql += "insert into data values(\"%s\"); " % img_dir + sql += "insert into data values(\"%s\"); " % img + + #Set all monitors/workspaces to the selected image + sql += "update preferences set data_id=2 where key=1 or key=2 or key=3; " + sql += "update preferences set data_id=1 where key=10 or key=20 or key=30;" + + subprocess.call(["sqlite3", db_path, sql]) # Kill the dock to fix issues with cached wallpapers. # macOS caches wallpapers and if a wallpaper is set that shares From 59929df445c8b198bf055ee0fa10fc49466c1d91 Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 28 Feb 2019 18:44:42 -0700 Subject: [PATCH 02/42] pylint check --- pywal/wallpaper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py index 3ab38af..32573df 100644 --- a/pywal/wallpaper.py +++ b/pywal/wallpaper.py @@ -109,10 +109,10 @@ def set_mac_wallpaper(img): """Set the wallpaper on macOS.""" db_file = "Library/Application Support/Dock/desktoppicture.db" db_path = os.path.join(HOME, db_file) - img_dir, _ = os.path.split(img); + img_dir, _ = os.path.split(img) #Clear the existing picture data and write the image paths - sql = "delete from data; " + sql = "delete from data; " sql += "insert into data values(\"%s\"); " % img_dir sql += "insert into data values(\"%s\"); " % img From f538f55ea3e3e8a62c7134b582eb5e00e8eb69f8 Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 28 Feb 2019 18:47:58 -0700 Subject: [PATCH 03/42] comment spacing --- pywal/wallpaper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py index 32573df..e711713 100644 --- a/pywal/wallpaper.py +++ b/pywal/wallpaper.py @@ -111,12 +111,12 @@ def set_mac_wallpaper(img): db_path = os.path.join(HOME, db_file) img_dir, _ = os.path.split(img) - #Clear the existing picture data and write the image paths + # Clear the existing picture data and write the image paths sql = "delete from data; " sql += "insert into data values(\"%s\"); " % img_dir sql += "insert into data values(\"%s\"); " % img - #Set all monitors/workspaces to the selected image + # Set all monitors/workspaces to the selected image sql += "update preferences set data_id=2 where key=1 or key=2 or key=3; " sql += "update preferences set data_id=1 where key=10 or key=20 or key=30;" From e2cea2808c46cb85e3f5fb51b607a09addacb9bc Mon Sep 17 00:00:00 2001 From: rob Date: Wed, 6 Mar 2019 22:19:28 -0700 Subject: [PATCH 04/42] Issue #382 - transparent iTerm2 cursor --- pywal/sequences.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pywal/sequences.py b/pywal/sequences.py index b42c3b7..b5028bc 100644 --- a/pywal/sequences.py +++ b/pywal/sequences.py @@ -11,7 +11,7 @@ from . import util def set_special(index, color, iterm_name="h", alpha=100): """Convert a hex color to a special sequence.""" - if OS == "Darwin": + if OS == "Darwin" and iterm_name: return "\033]P%s%s\033\\" % (iterm_name, color.strip("#")) if index in [11, 708] and alpha != "100": @@ -51,16 +51,16 @@ def create_sequences(colors, vte_fix=False): set_special(10, colors["special"]["foreground"], "g"), set_special(11, colors["special"]["background"], "h", alpha), set_special(12, colors["special"]["cursor"], "l"), - set_special(13, colors["special"]["foreground"], "l"), - set_special(17, colors["special"]["foreground"], "l"), - set_special(19, colors["special"]["background"], "l"), + set_special(13, colors["special"]["foreground"], "j"), + set_special(17, colors["special"]["foreground"], "k"), + set_special(19, colors["special"]["background"], "m"), set_color(232, colors["special"]["background"]), set_color(256, colors["special"]["foreground"]) ]) if not vte_fix: sequences.extend( - set_special(708, colors["special"]["background"], "l", alpha) + set_special(708, colors["special"]["background"], "", alpha) ) if OS == "Darwin": From c1f8b7bb98f3c829b18eb8d93aba4209fa2e5043 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 13 Mar 2019 15:30:39 +0200 Subject: [PATCH 05/42] colors.sh: Fix quoting issue. Closes #392 --- pywal/templates/colors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pywal/templates/colors.sh b/pywal/templates/colors.sh index b607b93..5f27883 100644 --- a/pywal/templates/colors.sh +++ b/pywal/templates/colors.sh @@ -1,6 +1,6 @@ # Shell variables # Generated by 'wal' -wallpaper='{wallpaper}' +wallpaper="{wallpaper}" # Special background='{background}' From e10337c838d088e3a8075c3f2771574bbf001a5d Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Thu, 14 Mar 2019 20:20:33 +0100 Subject: [PATCH 06/42] Print found directories TODO: Move to different method, since this way lower depth images are preferred --- pywal/image.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pywal/image.py b/pywal/image.py index 897f443..63ab209 100644 --- a/pywal/image.py +++ b/pywal/image.py @@ -31,7 +31,10 @@ def get_random_image(img_dir): images.remove(current_wall) elif not images: - logging.error("No images found in directory.") + logging.error("No images found in directory, picking random directory.") + logging.info("Found dirs: {}".format([dir_file.name for dir_file in + os.scandir(img_dir)])) + sys.exit(1) random.shuffle(images) @@ -59,7 +62,7 @@ def get_next_image(img_dir): return os.path.join(img_dir, image) -def get(img, cache_dir=CACHE_DIR, iterative=False): +def get(img, cache_dir=CACHE_DIR, iterative=False, recursive=False): """Validate image input.""" if os.path.isfile(img): wal_img = img From e0c30a34a08feb2d8a0aa1b9f1019c27df6837fe Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Fri, 15 Mar 2019 09:11:32 +0100 Subject: [PATCH 07/42] Basic functionality --- pywal/image.py | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/pywal/image.py b/pywal/image.py index 63ab209..d535b67 100644 --- a/pywal/image.py +++ b/pywal/image.py @@ -12,6 +12,22 @@ from . import util from . import wallpaper +def get_image_dir_recursive(img_dir): + """Get all images in a directory recursively.""" + current_wall = wallpaper.get() + current_wall = os.path.basename(current_wall) + + file_types = (".png", ".jpg", ".jpeg", ".jpe", ".gif") + + images = [] + for path, subdirs, files in os.walk(img_dir): + for name in files: + print(os.path.join(path, name)) + images.append(os.path.join(path, name)) + + return images, current_wall + + def get_image_dir(img_dir): """Get all images in a directory.""" current_wall = wallpaper.get() @@ -31,16 +47,29 @@ def get_random_image(img_dir): images.remove(current_wall) elif not images: - logging.error("No images found in directory, picking random directory.") - logging.info("Found dirs: {}".format([dir_file.name for dir_file in - os.scandir(img_dir)])) - + logging.error("No images found in directory.") sys.exit(1) random.shuffle(images) return os.path.join(img_dir, images[0]) +def get_random_image_recursive(img_dir): + """Pick a random image file from a directory recursively.""" + images, current_wall = get_image_dir_recursive(img_dir) + + if len(images) > 2 and current_wall in images: + images.remove(current_wall) + + elif not images: + logging.error("No images found in directory.") + sys.exit(1) + + print(images) + random.shuffle(images) + return os.path.join("", images[0]) + + def get_next_image(img_dir): """Get the next image in a dir.""" images, current_wall = get_image_dir(img_dir) @@ -64,6 +93,7 @@ def get_next_image(img_dir): def get(img, cache_dir=CACHE_DIR, iterative=False, recursive=False): """Validate image input.""" + recursive = True # TODO: Remove if os.path.isfile(img): wal_img = img @@ -72,7 +102,10 @@ def get(img, cache_dir=CACHE_DIR, iterative=False, recursive=False): wal_img = get_next_image(img) else: - wal_img = get_random_image(img) + if recursive: + wal_img = get_random_image_recursive(img) + else: + wal_img = get_random_image(img) else: logging.error("No valid image file found.") From 8b6ca5cbabc0cd982b72d4aede5639e663b5cdea Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Fri, 15 Mar 2019 09:15:42 +0100 Subject: [PATCH 08/42] Check file ending --- pywal/image.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pywal/image.py b/pywal/image.py index d535b67..a3ddd8a 100644 --- a/pywal/image.py +++ b/pywal/image.py @@ -22,8 +22,8 @@ def get_image_dir_recursive(img_dir): images = [] for path, subdirs, files in os.walk(img_dir): for name in files: - print(os.path.join(path, name)) - images.append(os.path.join(path, name)) + if name.lower().endswith(file_types): + images.append(os.path.join(path, name)) return images, current_wall From b91ecad12bad39a41611b41f5db436a2cf4f34d7 Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Fri, 15 Mar 2019 09:38:32 +0100 Subject: [PATCH 09/42] Fix current wallpaper reuse --- pywal/image.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pywal/image.py b/pywal/image.py index a3ddd8a..ecd46ff 100644 --- a/pywal/image.py +++ b/pywal/image.py @@ -22,9 +22,10 @@ def get_image_dir_recursive(img_dir): images = [] for path, subdirs, files in os.walk(img_dir): for name in files: - if name.lower().endswith(file_types): + if name.lower().endswith(file_types) and not name.endswith(current_wall): images.append(os.path.join(path, name)) + return images, current_wall @@ -58,10 +59,7 @@ def get_random_image_recursive(img_dir): """Pick a random image file from a directory recursively.""" images, current_wall = get_image_dir_recursive(img_dir) - if len(images) > 2 and current_wall in images: - images.remove(current_wall) - - elif not images: + if not images: logging.error("No images found in directory.") sys.exit(1) From 3a95122157071c44f521210858a5c6bacfe9c3bb Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Fri, 15 Mar 2019 09:49:21 +0100 Subject: [PATCH 10/42] Iterative images recursively --- pywal/image.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pywal/image.py b/pywal/image.py index ecd46ff..71a12f0 100644 --- a/pywal/image.py +++ b/pywal/image.py @@ -22,9 +22,10 @@ def get_image_dir_recursive(img_dir): images = [] for path, subdirs, files in os.walk(img_dir): for name in files: - if name.lower().endswith(file_types) and not name.endswith(current_wall): - images.append(os.path.join(path, name)) - + if name.lower().endswith(file_types): + if name.endswith(current_wall): + current_wall = os.path.join(path, name) + images.append(os.path.join(path, name)) return images, current_wall @@ -59,18 +60,24 @@ def get_random_image_recursive(img_dir): """Pick a random image file from a directory recursively.""" images, current_wall = get_image_dir_recursive(img_dir) + if len(images) > 2 and current_wall in images: + images.remove(current_wall) + if not images: logging.error("No images found in directory.") sys.exit(1) - print(images) random.shuffle(images) return os.path.join("", images[0]) -def get_next_image(img_dir): +def get_next_image(img_dir, recursive): """Get the next image in a dir.""" - images, current_wall = get_image_dir(img_dir) + if recursive: + images, current_wall = get_image_dir_recursive(img_dir) + else: + images, current_wall = get_image_dir(img_dir) + images.sort(key=lambda img: [int(x) if x.isdigit() else x for x in re.split('([0-9]+)', img)]) @@ -86,7 +93,7 @@ def get_next_image(img_dir): except IndexError: image = images[0] - return os.path.join(img_dir, image) + return os.path.join(img_dir if not recursive else "", image) def get(img, cache_dir=CACHE_DIR, iterative=False, recursive=False): @@ -97,7 +104,7 @@ def get(img, cache_dir=CACHE_DIR, iterative=False, recursive=False): elif os.path.isdir(img): if iterative: - wal_img = get_next_image(img) + wal_img = get_next_image(img, recursive) else: if recursive: From 31f23088d70622ea5411e63a8449fc03dc0cade1 Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Fri, 15 Mar 2019 10:06:04 +0100 Subject: [PATCH 11/42] Add recursive argument to cli --- pywal/__main__.py | 8 +++++++- pywal/image.py | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pywal/__main__.py b/pywal/__main__.py index 2e50ca9..b7a7aad 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -53,6 +53,11 @@ def get_args(): "flag is used: Go through the images in order " "instead of shuffled.") + arg.add_argument("--recursive", action="store_true", + help="When pywal is given a directory as input and this " + "flag is used: Search for images recursively in " + "subdirectories instead of the root only.") + arg.add_argument("--saturate", metavar="0.0-1.0", help="Set the color saturation.") @@ -159,7 +164,8 @@ def parse_args(parser): util.Color.alpha_num = args.a if args.i: - image_file = image.get(args.i, iterative=args.iterative) + image_file = image.get(args.i, iterative=args.iterative, + recursive=args.recursive) colors_plain = colors.get(image_file, args.l, args.backend, sat=args.saturate) diff --git a/pywal/image.py b/pywal/image.py index 71a12f0..8e55a7b 100644 --- a/pywal/image.py +++ b/pywal/image.py @@ -98,7 +98,6 @@ def get_next_image(img_dir, recursive): def get(img, cache_dir=CACHE_DIR, iterative=False, recursive=False): """Validate image input.""" - recursive = True # TODO: Remove if os.path.isfile(img): wal_img = img From 44339e5f3e2bcbcbcafa8fe0332f89c118ba12a2 Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Fri, 15 Mar 2019 10:12:13 +0100 Subject: [PATCH 12/42] Remove redundant method --- pywal/image.py | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/pywal/image.py b/pywal/image.py index 8e55a7b..d894189 100644 --- a/pywal/image.py +++ b/pywal/image.py @@ -41,9 +41,12 @@ def get_image_dir(img_dir): if img.name.lower().endswith(file_types)], current_wall -def get_random_image(img_dir): +def get_random_image(img_dir, recursive): """Pick a random image file from a directory.""" - images, current_wall = get_image_dir(img_dir) + if recursive: + images, current_wall = get_image_dir_recursive(img_dir) + else: + images, current_wall = get_image_dir(img_dir) if len(images) > 2 and current_wall in images: images.remove(current_wall) @@ -53,22 +56,7 @@ def get_random_image(img_dir): sys.exit(1) random.shuffle(images) - return os.path.join(img_dir, images[0]) - - -def get_random_image_recursive(img_dir): - """Pick a random image file from a directory recursively.""" - images, current_wall = get_image_dir_recursive(img_dir) - - if len(images) > 2 and current_wall in images: - images.remove(current_wall) - - if not images: - logging.error("No images found in directory.") - sys.exit(1) - - random.shuffle(images) - return os.path.join("", images[0]) + return os.path.join(img_dir if not recursive else "", images[0]) def get_next_image(img_dir, recursive): @@ -106,10 +94,7 @@ def get(img, cache_dir=CACHE_DIR, iterative=False, recursive=False): wal_img = get_next_image(img, recursive) else: - if recursive: - wal_img = get_random_image_recursive(img) - else: - wal_img = get_random_image(img) + wal_img = get_random_image(img, recursive) else: logging.error("No valid image file found.") From bbc5a33394c024afe120c0959dd9cb8e01636321 Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Fri, 15 Mar 2019 10:34:45 +0100 Subject: [PATCH 13/42] Fix indentation --- pywal/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pywal/__main__.py b/pywal/__main__.py index b7a7aad..e38cb3f 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -165,7 +165,7 @@ def parse_args(parser): if args.i: image_file = image.get(args.i, iterative=args.iterative, - recursive=args.recursive) + recursive=args.recursive) colors_plain = colors.get(image_file, args.l, args.backend, sat=args.saturate) From d5a1532f184f6b33b7622f3258f63cb0c7f82a15 Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Fri, 15 Mar 2019 10:36:26 +0100 Subject: [PATCH 14/42] Fix unused variable --- pywal/image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pywal/image.py b/pywal/image.py index d894189..6ef74fc 100644 --- a/pywal/image.py +++ b/pywal/image.py @@ -20,7 +20,7 @@ def get_image_dir_recursive(img_dir): file_types = (".png", ".jpg", ".jpeg", ".jpe", ".gif") images = [] - for path, subdirs, files in os.walk(img_dir): + for path, _, files in os.walk(img_dir): for name in files: if name.lower().endswith(file_types): if name.endswith(current_wall): From afa3ff125924334a5d0276efda7932fd7d5b8603 Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Fri, 15 Mar 2019 10:40:35 +0100 Subject: [PATCH 15/42] Try to fix indentation again --- pywal/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pywal/__main__.py b/pywal/__main__.py index e38cb3f..72da80d 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -165,7 +165,7 @@ def parse_args(parser): if args.i: image_file = image.get(args.i, iterative=args.iterative, - recursive=args.recursive) + recursive=args.recursive) colors_plain = colors.get(image_file, args.l, args.backend, sat=args.saturate) From 0878cc7fadbbb601f51d267a1be75d47c41cae1b Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Fri, 15 Mar 2019 10:43:32 +0100 Subject: [PATCH 16/42] Finally fix indendation --- pywal/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pywal/__main__.py b/pywal/__main__.py index 72da80d..de992b7 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -165,7 +165,7 @@ def parse_args(parser): if args.i: image_file = image.get(args.i, iterative=args.iterative, - recursive=args.recursive) + recursive=args.recursive) colors_plain = colors.get(image_file, args.l, args.backend, sat=args.saturate) From 2f3a492ed2d464c8be2835473c4c91af6301e5f1 Mon Sep 17 00:00:00 2001 From: Elliott Saille Date: Thu, 21 Mar 2019 14:55:04 -0500 Subject: [PATCH 17/42] Add support for setting wallpaper in xfce > 4.12 --- pywal/wallpaper.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py index e711713..e9fa23e 100644 --- a/pywal/wallpaper.py +++ b/pywal/wallpaper.py @@ -2,6 +2,7 @@ import ctypes import logging import os +import re import shutil import subprocess import urllib.parse @@ -39,10 +40,21 @@ def get_desktop_env(): return None -def xfconf(path, img): +def xfconf(img): """Call xfconf to set the wallpaper on XFCE.""" - util.disown(["xfconf-query", "--channel", "xfce4-desktop", - "--property", path, "--set", img]) + xfconf_re = re.compile( + r"^/backdrop/screen\d/monitor(?:0|\w*)/" + r"(?:(?:image-path|last-image)|workspace\d/last-image)$", + flags=re.M + ) + xfconf_data = subprocess.check_output( + ["xfconf-query", "--channel", "xfce4-desktop", "--list"], + stderr=subprocess.DEVNULL + ).decode('utf8') + paths = xfconf_re.findall(xfconf_data) + for path in paths: + util.disown(["xfconf-query", "--channel", "xfce4-desktop", + "--property", path, "--set", img]) def set_wm_wallpaper(img): @@ -75,9 +87,7 @@ def set_desktop_wallpaper(desktop, img): desktop = str(desktop).lower() if "xfce" in desktop or "xubuntu" in desktop: - # XFCE requires two commands since they differ between versions. - xfconf("/backdrop/screen0/monitor0/image-path", img) - xfconf("/backdrop/screen0/monitor0/workspace0/last-image", img) + xfconf(img) elif "muffin" in desktop or "cinnamon" in desktop: util.disown(["gsettings", "set", From 3ffd44185b8243091ec22ab64bab235c72c51377 Mon Sep 17 00:00:00 2001 From: djent- Date: Fri, 22 Mar 2019 17:44:26 -0400 Subject: [PATCH 18/42] Fix changing kitty's colors. Kitty must be run with -1 or --single-instance to affect all open kitty windows. Only works when wal is run from kitty. --- pywal/reload.py | 4 ++-- pywal/templates/colors-kitty.conf | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pywal/reload.py b/pywal/reload.py index de96090..720b0f4 100644 --- a/pywal/reload.py +++ b/pywal/reload.py @@ -56,8 +56,8 @@ def bspwm(): def kitty(): """ Reload kitty colors. """ - if shutil.which("kitty") and util.get_pid("kitty"): - util.disown(["kitty", "@", "set-colors", "--all"]) + if shutil.which("kitty") and util.get_pid("kitty") and os.getenv('TERM') == 'xterm-kitty': + subprocess.call(["kitty", "@", "set-colors", "--all", os.path.join(CACHE_DIR, "colors-kitty.conf")]) def polybar(): diff --git a/pywal/templates/colors-kitty.conf b/pywal/templates/colors-kitty.conf index f744418..c9324e0 100644 --- a/pywal/templates/colors-kitty.conf +++ b/pywal/templates/colors-kitty.conf @@ -2,6 +2,11 @@ foreground {foreground} background {background} cursor {cursor} +active_tab_foreground {foreground} +active_tab_background {background} +inactive_tab_foreground {background} +inactive_tab_background {foreground} + color0 {color0} color8 {color8} color1 {color1} From 961695a47afd62625243b01132a5ef8aed22ec9c Mon Sep 17 00:00:00 2001 From: djent- Date: Fri, 22 Mar 2019 18:01:19 -0400 Subject: [PATCH 19/42] Add color config for internal window borders --- pywal/templates/colors-kitty.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pywal/templates/colors-kitty.conf b/pywal/templates/colors-kitty.conf index c9324e0..e9b5bbf 100644 --- a/pywal/templates/colors-kitty.conf +++ b/pywal/templates/colors-kitty.conf @@ -7,6 +7,10 @@ active_tab_background {background} inactive_tab_foreground {background} inactive_tab_background {foreground} +active_border_color {foreground} +inactive_border_color {background} +bell_border_color {color1} + color0 {color0} color8 {color8} color1 {color1} From efa7c86ec5f9b0f5df0d361fe1f8b7a9076b65de Mon Sep 17 00:00:00 2001 From: Will Eccles Date: Thu, 4 Apr 2019 16:32:50 -0400 Subject: [PATCH 20/42] fixed pidof on mac os --- pywal/util.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pywal/util.py b/pywal/util.py index a158da9..e4b146a 100644 --- a/pywal/util.py +++ b/pywal/util.py @@ -8,6 +8,7 @@ import os import shutil import subprocess import sys +import platform class Color: @@ -183,7 +184,11 @@ def get_pid(name): return False try: - subprocess.check_output(["pidof", "-s", name]) + if platform.system() != 'Darwin': + subprocess.check_output(["pidof", "-s", name]) + else: + subprocess.check_output(["pidof", name]) + except subprocess.CalledProcessError: return False From 256f9761e5ea42e768637692d7db111110e2a370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Gouv=C3=AAa=20=28K2=29?= Date: Tue, 30 Apr 2019 18:23:39 -0300 Subject: [PATCH 21/42] adds base16-snazzy colorscheme --- pywal/colorschemes/dark/base16-snazzy.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 pywal/colorschemes/dark/base16-snazzy.json diff --git a/pywal/colorschemes/dark/base16-snazzy.json b/pywal/colorschemes/dark/base16-snazzy.json new file mode 100644 index 0000000..269c3fc --- /dev/null +++ b/pywal/colorschemes/dark/base16-snazzy.json @@ -0,0 +1 @@ +{"special":{"background":"#282a36","foreground":"#eff0eb","cursor":"#9aedfe"},"colors":{"color0":"#33303b","color1":"#ff5c57","color2":"#5af78e","color3":"#f3f99d","color4":"#57c7ff","color5":"#ff6ac1","color6":"#9aedfe","color7":"#eff0eb","color8":"#4f4b58","color9":"#ff5c57","color10":"#5af78e","color11":"#f3f99d","color12":"#57c7ff","color13":"#ff6ac1","color14":"#9aedfe","color15":"#eff0eb"}} From 04413ee2852165f2137c0cbfc2ea73fc62e48bfb Mon Sep 17 00:00:00 2001 From: Djent- Date: Thu, 2 May 2019 13:33:55 -0700 Subject: [PATCH 22/42] Switch kitty tab colors to make more sense --- pywal/templates/colors-kitty.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pywal/templates/colors-kitty.conf b/pywal/templates/colors-kitty.conf index e9b5bbf..19359b0 100644 --- a/pywal/templates/colors-kitty.conf +++ b/pywal/templates/colors-kitty.conf @@ -2,10 +2,10 @@ foreground {foreground} background {background} cursor {cursor} -active_tab_foreground {foreground} -active_tab_background {background} -inactive_tab_foreground {background} -inactive_tab_background {foreground} +active_tab_foreground {background} +active_tab_background {foreground} +inactive_tab_foreground {foreground} +inactive_tab_background {background} active_border_color {foreground} inactive_border_color {background} From b78bf719e697e1e272f2aa0856724d6ce2ac1d98 Mon Sep 17 00:00:00 2001 From: Djent- Date: Thu, 2 May 2019 14:14:48 -0700 Subject: [PATCH 23/42] Shorten lines for Travis CI --- pywal/reload.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pywal/reload.py b/pywal/reload.py index 720b0f4..5e3c3f8 100644 --- a/pywal/reload.py +++ b/pywal/reload.py @@ -56,8 +56,13 @@ def bspwm(): def kitty(): """ Reload kitty colors. """ - if shutil.which("kitty") and util.get_pid("kitty") and os.getenv('TERM') == 'xterm-kitty': - subprocess.call(["kitty", "@", "set-colors", "--all", os.path.join(CACHE_DIR, "colors-kitty.conf")]) + if (shutil.which("kitty") + and util.get_pid("kitty") + and os.getenv('TERM') == 'xterm-kitty'): + subprocess.call([ + "kitty", "@", "set-colors", "--all", + os.path.join(CACHE_DIR, "colors-kitty.conf") + ]) def polybar(): From b832581220073b01f21f1551892bde844bf57eac Mon Sep 17 00:00:00 2001 From: Djent- Date: Thu, 2 May 2019 14:22:20 -0700 Subject: [PATCH 24/42] Change indentation to appease pylint --- pywal/reload.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pywal/reload.py b/pywal/reload.py index 5e3c3f8..13e0ca8 100644 --- a/pywal/reload.py +++ b/pywal/reload.py @@ -57,10 +57,10 @@ def bspwm(): def kitty(): """ Reload kitty colors. """ if (shutil.which("kitty") - and util.get_pid("kitty") - and os.getenv('TERM') == 'xterm-kitty'): + and util.get_pid("kitty") + and os.getenv('TERM') == 'xterm-kitty'): subprocess.call([ - "kitty", "@", "set-colors", "--all", + "kitty", "@", "set-colors", "--all", os.path.join(CACHE_DIR, "colors-kitty.conf") ]) From 33aa30925b40cb074315d799fb38b1d3edcbd23e Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 14 Jul 2019 13:01:53 +0200 Subject: [PATCH 25/42] Added a stylus template --- pywal/templates/colors.styl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pywal/templates/colors.styl diff --git a/pywal/templates/colors.styl b/pywal/templates/colors.styl new file mode 100644 index 0000000..b805669 --- /dev/null +++ b/pywal/templates/colors.styl @@ -0,0 +1,24 @@ +// Stylus Variables +// Generated by 'wal' +$wallpaper = "{wallpaper}" + +$background = {background} +$foregroud = {foreground} +$cursor = {cursor} + +$color0 = {color0} +$color1 = {color1} +$color2 = {color2} +$color3 = {color3} +$color4 = {color4} +$color5 = {color5} +$color6 = {color6} +$color7 = {color7} +$color8 = {color8} +$color9 = {color9} +$color10 = {color10} +$color11 = {color11} +$color12 = {color12} +$color13 = {color13} +$color14 = {color14} +$color15 = {color15} From 182dfbb877a5a8843c924559ba847fd5180c7a4b Mon Sep 17 00:00:00 2001 From: dithpri Date: Sat, 24 Aug 2019 04:04:34 +0200 Subject: [PATCH 26/42] Remove duplicate color entries in dkeg colorschemes --- pywal/colorschemes/dark/dkeg-5725.json | 2 +- pywal/colorschemes/dark/dkeg-amiox.json | 2 +- pywal/colorschemes/dark/dkeg-bark.json | 2 +- pywal/colorschemes/dark/dkeg-blend.json | 2 +- pywal/colorschemes/dark/dkeg-blok.json | 2 +- pywal/colorschemes/dark/dkeg-bluetype.json | 2 +- pywal/colorschemes/dark/dkeg-blumune.json | 2 +- pywal/colorschemes/dark/dkeg-book.json | 2 +- pywal/colorschemes/dark/dkeg-branch.json | 2 +- pywal/colorschemes/dark/dkeg-brownstone.json | 2 +- pywal/colorschemes/dark/dkeg-bulb.json | 2 +- pywal/colorschemes/dark/dkeg-chaires.json | 2 +- pywal/colorschemes/dark/dkeg-coco.json | 2 +- pywal/colorschemes/dark/dkeg-corduroy.json | 2 +- pywal/colorschemes/dark/dkeg-depth.json | 2 +- pywal/colorschemes/dark/dkeg-designr.json | 2 +- pywal/colorschemes/dark/dkeg-diner.json | 2 +- pywal/colorschemes/dark/dkeg-escen.json | 2 +- pywal/colorschemes/dark/dkeg-fendr.json | 2 +- pywal/colorschemes/dark/dkeg-flapr.json | 2 +- pywal/colorschemes/dark/dkeg-forst.json | 2 +- pywal/colorschemes/dark/dkeg-fury.json | 2 +- pywal/colorschemes/dark/dkeg-harbing.json | 2 +- pywal/colorschemes/dark/dkeg-kit.json | 2 +- pywal/colorschemes/dark/dkeg-leaf.json | 2 +- pywal/colorschemes/dark/dkeg-link.json | 2 +- pywal/colorschemes/dark/dkeg-mattd.json | 2 +- pywal/colorschemes/dark/dkeg-novmbr.json | 2 +- pywal/colorschemes/dark/dkeg-owl.json | 2 +- pywal/colorschemes/dark/dkeg-paints.json | 2 +- pywal/colorschemes/dark/dkeg-parkd.json | 2 +- pywal/colorschemes/dark/dkeg-pastely.json | 2 +- pywal/colorschemes/dark/dkeg-petal.json | 2 +- pywal/colorschemes/dark/dkeg-poly.json | 2 +- pywal/colorschemes/dark/dkeg-prevail.json | 2 +- pywal/colorschemes/dark/dkeg-provrb.json | 2 +- pywal/colorschemes/dark/dkeg-raild.json | 2 +- pywal/colorschemes/dark/dkeg-relax.json | 2 +- pywal/colorschemes/dark/dkeg-scag.json | 2 +- pywal/colorschemes/dark/dkeg-scape.json | 2 +- pywal/colorschemes/dark/dkeg-shade.json | 2 +- pywal/colorschemes/dark/dkeg-simplicity.json | 2 +- pywal/colorschemes/dark/dkeg-skigh.json | 2 +- pywal/colorschemes/dark/dkeg-slate.json | 2 +- pywal/colorschemes/dark/dkeg-soundwave.json | 2 +- pywal/colorschemes/dark/dkeg-spire.json | 2 +- pywal/colorschemes/dark/dkeg-sprout.json | 2 +- pywal/colorschemes/dark/dkeg-squares.json | 2 +- pywal/colorschemes/dark/dkeg-stv.json | 2 +- pywal/colorschemes/dark/dkeg-subtle.json | 2 +- pywal/colorschemes/dark/dkeg-sundr.json | 2 +- pywal/colorschemes/dark/dkeg-tealights.json | 2 +- pywal/colorschemes/dark/dkeg-traffic.json | 2 +- pywal/colorschemes/dark/dkeg-transposet.json | 2 +- pywal/colorschemes/dark/dkeg-urban.json | 2 +- pywal/colorschemes/dark/dkeg-vans.json | 2 +- pywal/colorschemes/dark/dkeg-victory.json | 2 +- pywal/colorschemes/dark/dkeg-view.json | 2 +- pywal/colorschemes/dark/dkeg-wintry.json | 2 +- 59 files changed, 59 insertions(+), 59 deletions(-) diff --git a/pywal/colorschemes/dark/dkeg-5725.json b/pywal/colorschemes/dark/dkeg-5725.json index 136a6bf..53e6e78 100644 --- a/pywal/colorschemes/dark/dkeg-5725.json +++ b/pywal/colorschemes/dark/dkeg-5725.json @@ -1 +1 @@ -{"special":{"background":"#353234","foreground":"#c29f6f","cursor":"#363334"},"colors":{"color0":"#353234","color1":"#97544d","color2":"#97a293","color3":"#c29f6f","color4":"#5e606c","color5":"#7a6054","color6":"#78746c","color7":"#c3c1b8","color7":"#c3c1b8","color8":"#5c575b","color9":"#97544d","color10":"#97a293","color11":"#c29f6f","color12":"#5e606c","color13":"#7a6054","color14":"#78746c","color15":"#c3c1b8","color15":"#c3c1b8"}} \ No newline at end of file +{"special":{"background":"#353234","foreground":"#c29f6f","cursor":"#363334"},"colors":{"color0":"#353234","color1":"#97544d","color2":"#97a293","color3":"#c29f6f","color4":"#5e606c","color5":"#7a6054","color6":"#78746c","color7":"#c3c1b8","color8":"#5c575b","color9":"#97544d","color10":"#97a293","color11":"#c29f6f","color12":"#5e606c","color13":"#7a6054","color14":"#78746c","color15":"#c3c1b8"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-amiox.json b/pywal/colorschemes/dark/dkeg-amiox.json index a35afc1..eb44344 100644 --- a/pywal/colorschemes/dark/dkeg-amiox.json +++ b/pywal/colorschemes/dark/dkeg-amiox.json @@ -1 +1 @@ -{"special":{"background":"#262020","foreground":"#aa9a71","cursor":"#b1a89c"},"colors":{"color0":"#262020","color1":"#925633","color2":"#55634f","color3":"#aa9a71","color4":"#5e6676","color5":"#57464d","color6":"#47676e","color7":"#b1a89c","color7":"#b1a89c","color8":"#514c4c","color9":"#925633","color10":"#55634f","color11":"#aa9a71","color12":"#5e6676","color13":"#57464d","color14":"#47676e","color15":"#b1a89c","color15":"#c8c1b9"}} \ No newline at end of file +{"special":{"background":"#262020","foreground":"#aa9a71","cursor":"#b1a89c"},"colors":{"color0":"#262020","color1":"#925633","color2":"#55634f","color3":"#aa9a71","color4":"#5e6676","color5":"#57464d","color6":"#47676e","color7":"#b1a89c","color8":"#514c4c","color9":"#925633","color10":"#55634f","color11":"#aa9a71","color12":"#5e6676","color13":"#57464d","color14":"#47676e","color15":"#c8c1b9"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-bark.json b/pywal/colorschemes/dark/dkeg-bark.json index 1dd332e..18f4ff7 100644 --- a/pywal/colorschemes/dark/dkeg-bark.json +++ b/pywal/colorschemes/dark/dkeg-bark.json @@ -1 +1 @@ -{"special":{"background":"#30272b","foreground":"#978341","cursor":"#bcb8ba"},"colors":{"color0":"#30272b","color1":"#925633","color2":"#697234","color3":"#978341","color4":"#5e6676","color5":"#694e63","color6":"#47676e","color7":"#bcb8ba","color7":"#bcb8ba","color8":"#443c40","color9":"#925633","color10":"#697234","color11":"#978341","color12":"#5e6676","color13":"#694e63","color14":"#47676e","color15":"#bcb8ba","color15":"#bcb8ba"}} \ No newline at end of file +{"special":{"background":"#30272b","foreground":"#978341","cursor":"#bcb8ba"},"colors":{"color0":"#30272b","color1":"#925633","color2":"#697234","color3":"#978341","color4":"#5e6676","color5":"#694e63","color6":"#47676e","color7":"#bcb8ba","color8":"#443c40","color9":"#925633","color10":"#697234","color11":"#978341","color12":"#5e6676","color13":"#694e63","color14":"#47676e","color15":"#bcb8ba"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-blend.json b/pywal/colorschemes/dark/dkeg-blend.json index e863b33..1fbfa78 100644 --- a/pywal/colorschemes/dark/dkeg-blend.json +++ b/pywal/colorschemes/dark/dkeg-blend.json @@ -1 +1 @@ -{"special":{"background":"#272725","foreground":"#bc9f67","cursor":"#282826"},"colors":{"color0":"#272725","color1":"#7d5151","color2":"#959c4f","color3":"#a78749","color4":"#455563","color5":"#9f908d","color6":"#4a5e5b","color7":"#f2f2f2","color7":"#f2f2f2","color8":"#4f4f4b","color9":"#7d5151","color10":"#959c4f","color11":"#a78749","color12":"#455563","color13":"#9f908d","color14":"#4a5e5b","color15":"#f2f2f2","color15":"#ffffff"}} \ No newline at end of file +{"special":{"background":"#272725","foreground":"#bc9f67","cursor":"#282826"},"colors":{"color0":"#272725","color1":"#7d5151","color2":"#959c4f","color3":"#a78749","color4":"#455563","color5":"#9f908d","color6":"#4a5e5b","color7":"#f2f2f2","color8":"#4f4f4b","color9":"#7d5151","color10":"#959c4f","color11":"#a78749","color12":"#455563","color13":"#9f908d","color14":"#4a5e5b","color15":"#ffffff"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-blok.json b/pywal/colorschemes/dark/dkeg-blok.json index de2d386..3f1215d 100644 --- a/pywal/colorschemes/dark/dkeg-blok.json +++ b/pywal/colorschemes/dark/dkeg-blok.json @@ -1 +1 @@ -{"special":{"background":"#2c2a2b","foreground":"#baad8a","cursor":"#bab9ba"},"colors":{"color0":"#2c2a2b","color1":"#a67979","color2":"#809f7b","color3":"#baad8a","color4":"#6d7575","color5":"#7d6969","color6":"#7b9899","color7":"#bab9ba","color7":"#bab9ba","color8":"#545253","color9":"#a67979","color10":"#809f7b","color11":"#baad8a","color12":"#6d7575","color13":"#7d6969","color14":"#7b9899","color15":"#bab9ba","color15":"#bab9ba"}} \ No newline at end of file +{"special":{"background":"#2c2a2b","foreground":"#baad8a","cursor":"#bab9ba"},"colors":{"color0":"#2c2a2b","color1":"#a67979","color2":"#809f7b","color3":"#baad8a","color4":"#6d7575","color5":"#7d6969","color6":"#7b9899","color7":"#bab9ba","color8":"#545253","color9":"#a67979","color10":"#809f7b","color11":"#baad8a","color12":"#6d7575","color13":"#7d6969","color14":"#7b9899","color15":"#bab9ba"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-bluetype.json b/pywal/colorschemes/dark/dkeg-bluetype.json index 6e16caf..e060a03 100644 --- a/pywal/colorschemes/dark/dkeg-bluetype.json +++ b/pywal/colorschemes/dark/dkeg-bluetype.json @@ -1 +1 @@ -{"special":{"background":"#272a2a","foreground":"#80807e","cursor":"#eaeaed"},"colors":{"color0":"#272a2a","color1":"#b05f5f","color2":"#b05f5f","color3":"#88aa55","color4":"#88aa55","color5":"#ccb05f","color6":"#ccb05f","color7":"#556973","color7":"#556973","color8":"#484c4e","color9":"#b05f5f","color10":"#b05f5f","color11":"#88aa55","color12":"#88aa55","color13":"#ccb05f","color14":"#ccb05f","color15":"#556973","color15":"#f6f7f8"}} \ No newline at end of file +{"special":{"background":"#272a2a","foreground":"#80807e","cursor":"#eaeaed"},"colors":{"color0":"#272a2a","color1":"#b05f5f","color2":"#b05f5f","color3":"#88aa55","color4":"#88aa55","color5":"#ccb05f","color6":"#ccb05f","color7":"#556973","color8":"#484c4e","color9":"#b05f5f","color10":"#b05f5f","color11":"#88aa55","color12":"#88aa55","color13":"#ccb05f","color14":"#ccb05f","color15":"#f6f7f8"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-blumune.json b/pywal/colorschemes/dark/dkeg-blumune.json index acf973a..eb63fd0 100644 --- a/pywal/colorschemes/dark/dkeg-blumune.json +++ b/pywal/colorschemes/dark/dkeg-blumune.json @@ -1 +1 @@ -{"special":{"background":"#1c1f23","foreground":"#7e6b5f","cursor":"#202428"},"colors":{"color0":"#1c1f23","color1":"#234640","color2":"#555552","color3":"#7e6b5f","color4":"#384758","color5":"#444d4d","color6":"#415459","color7":"#ccc7bf","color7":"#ccc7bf","color8":"#33383f","color9":"#234640","color10":"#555552","color11":"#7e6b5f","color12":"#384758","color13":"#444d4d","color14":"#415459","color15":"#ccc7bf","color15":"#e3e0db"}} \ No newline at end of file +{"special":{"background":"#1c1f23","foreground":"#7e6b5f","cursor":"#202428"},"colors":{"color0":"#1c1f23","color1":"#234640","color2":"#555552","color3":"#7e6b5f","color4":"#384758","color5":"#444d4d","color6":"#415459","color7":"#ccc7bf","color8":"#33383f","color9":"#234640","color10":"#555552","color11":"#7e6b5f","color12":"#384758","color13":"#444d4d","color14":"#415459","color15":"#e3e0db"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-book.json b/pywal/colorschemes/dark/dkeg-book.json index d054225..506e2e4 100644 --- a/pywal/colorschemes/dark/dkeg-book.json +++ b/pywal/colorschemes/dark/dkeg-book.json @@ -1 +1 @@ -{"special":{"background":"#2b2b28","foreground":"#937b5a","cursor":"#2c2c29"},"colors":{"color0":"#2b2b28","color1":"#993f3c","color2":"#78855e","color3":"#937b5a","color4":"#415265","color5":"#885458","color6":"#646666","color7":"#c4c3c0","color7":"#c4c3c0","color8":"#c4c3c0","color9":"#993f3c","color10":"#78855e","color11":"#937b5a","color12":"#415265","color13":"#885458","color14":"#646666","color15":"#c4c3c0","color15":"#c4c3c0"}} \ No newline at end of file +{"special":{"background":"#2b2b28","foreground":"#937b5a","cursor":"#2c2c29"},"colors":{"color0":"#2b2b28","color1":"#993f3c","color2":"#78855e","color3":"#937b5a","color4":"#415265","color5":"#885458","color6":"#646666","color7":"#c4c3c0","color8":"#c4c3c0","color9":"#993f3c","color10":"#78855e","color11":"#937b5a","color12":"#415265","color13":"#885458","color14":"#646666","color15":"#c4c3c0"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-branch.json b/pywal/colorschemes/dark/dkeg-branch.json index bf4e6c0..be2dce3 100644 --- a/pywal/colorschemes/dark/dkeg-branch.json +++ b/pywal/colorschemes/dark/dkeg-branch.json @@ -1 +1 @@ -{"special":{"background":"#32221a","foreground":"#d29b5a","cursor":"#cfc1a9"},"colors":{"color0":"#32221a","color1":"#c2562d","color2":"#96a65e","color3":"#d29b5a","color4":"#3b8e8c","color5":"#c47e5b","color6":"#639a90","color7":"#cfc1a9","color7":"#cfc1a9","color8":"#564a45","color9":"#c2562d","color10":"#96a65e","color11":"#d29b5a","color12":"#3b8e8c","color13":"#c47e5b","color14":"#639a90","color15":"#cfc1a9","color15":"#cfc1a9"}} \ No newline at end of file +{"special":{"background":"#32221a","foreground":"#d29b5a","cursor":"#cfc1a9"},"colors":{"color0":"#32221a","color1":"#c2562d","color2":"#96a65e","color3":"#d29b5a","color4":"#3b8e8c","color5":"#c47e5b","color6":"#639a90","color7":"#cfc1a9","color8":"#564a45","color9":"#c2562d","color10":"#96a65e","color11":"#d29b5a","color12":"#3b8e8c","color13":"#c47e5b","color14":"#639a90","color15":"#cfc1a9"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-brownstone.json b/pywal/colorschemes/dark/dkeg-brownstone.json index 5a87153..4060387 100644 --- a/pywal/colorschemes/dark/dkeg-brownstone.json +++ b/pywal/colorschemes/dark/dkeg-brownstone.json @@ -1 +1 @@ -{"special":{"background":"#272825","foreground":"#7e744d","cursor":"#282926"},"colors":{"color0":"#272825","color1":"#674839","color2":"#6e794f","color3":"#7e744d","color4":"#3b474e","color5":"#554c41","color6":"#495355","color7":"#b0b0af","color7":"#b0b0af","color8":"#b0b0af","color9":"#674839","color10":"#6e794f","color11":"#7e744d","color12":"#3b474e","color13":"#554c41","color14":"#495355","color15":"#b0b0af","color15":"#c7c7c7"}} \ No newline at end of file +{"special":{"background":"#272825","foreground":"#7e744d","cursor":"#282926"},"colors":{"color0":"#272825","color1":"#674839","color2":"#6e794f","color3":"#7e744d","color4":"#3b474e","color5":"#554c41","color6":"#495355","color7":"#b0b0af","color8":"#b0b0af","color9":"#674839","color10":"#6e794f","color11":"#7e744d","color12":"#3b474e","color13":"#554c41","color14":"#495355","color15":"#c7c7c7"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-bulb.json b/pywal/colorschemes/dark/dkeg-bulb.json index fba6e23..484cab6 100644 --- a/pywal/colorschemes/dark/dkeg-bulb.json +++ b/pywal/colorschemes/dark/dkeg-bulb.json @@ -1 +1 @@ -{"special":{"background":"#2c292b","foreground":"#c8a168","cursor":"#312e30"},"colors":{"color0":"#2c292b","color1":"#ab6d4e","color2":"#88885d","color3":"#c8a168","color4":"#45626e","color5":"#7c5545","color6":"#456e66","color7":"#c3b495","color7":"#c3b495","color8":"#c3b495","color9":"#ab6d4e","color10":"#88885d","color11":"#c8a168","color12":"#45626e","color13":"#7c5545","color14":"#456e66","color15":"#c3b495","color15":"#c3b495"}} \ No newline at end of file +{"special":{"background":"#2c292b","foreground":"#c8a168","cursor":"#312e30"},"colors":{"color0":"#2c292b","color1":"#ab6d4e","color2":"#88885d","color3":"#c8a168","color4":"#45626e","color5":"#7c5545","color6":"#456e66","color7":"#c3b495","color8":"#c3b495","color9":"#ab6d4e","color10":"#88885d","color11":"#c8a168","color12":"#45626e","color13":"#7c5545","color14":"#456e66","color15":"#c3b495"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-chaires.json b/pywal/colorschemes/dark/dkeg-chaires.json index 915c1c9..c3858e1 100644 --- a/pywal/colorschemes/dark/dkeg-chaires.json +++ b/pywal/colorschemes/dark/dkeg-chaires.json @@ -1 +1 @@ -{"special":{"background":"#383844","foreground":"#cba264","cursor":"#cdc5b7"},"colors":{"color0":"#383844","color1":"#a7664a","color2":"#6e8c6e","color3":"#cba264","color4":"#535f6b","color5":"#775a62","color6":"#576e68","color7":"#cdc5b7","color7":"#cdc5b7","color8":"#4f4f60","color9":"#a7664a","color10":"#6e8c6e","color11":"#cba264","color12":"#535f6b","color13":"#775a62","color14":"#576e68","color15":"#cdc5b7","color15":"#cdc5b7"}} \ No newline at end of file +{"special":{"background":"#383844","foreground":"#cba264","cursor":"#cdc5b7"},"colors":{"color0":"#383844","color1":"#a7664a","color2":"#6e8c6e","color3":"#cba264","color4":"#535f6b","color5":"#775a62","color6":"#576e68","color7":"#cdc5b7","color8":"#4f4f60","color9":"#a7664a","color10":"#6e8c6e","color11":"#cba264","color12":"#535f6b","color13":"#775a62","color14":"#576e68","color15":"#cdc5b7"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-coco.json b/pywal/colorschemes/dark/dkeg-coco.json index 13b4cee..6ae177b 100644 --- a/pywal/colorschemes/dark/dkeg-coco.json +++ b/pywal/colorschemes/dark/dkeg-coco.json @@ -1 +1 @@ -{"special":{"background":"#1f1d1d","foreground":"#856237","cursor":"#ccbaad"},"colors":{"color0":"#1f1d1d","color1":"#6b4747","color2":"#8d7138","color3":"#856237","color4":"#3c3c49","color5":"#3c342e","color6":"#5d5a4b","color7":"#ccbaad","color7":"#ccbaad","color8":"#4a4a4a","color9":"#6b4747","color10":"#8d7138","color11":"#856237","color12":"#3c3c49","color13":"#3c342e","color14":"#5d5a4b","color15":"#ccbaad","color15":"#eae2dc"}} \ No newline at end of file +{"special":{"background":"#1f1d1d","foreground":"#856237","cursor":"#ccbaad"},"colors":{"color0":"#1f1d1d","color1":"#6b4747","color2":"#8d7138","color3":"#856237","color4":"#3c3c49","color5":"#3c342e","color6":"#5d5a4b","color7":"#ccbaad","color8":"#4a4a4a","color9":"#6b4747","color10":"#8d7138","color11":"#856237","color12":"#3c3c49","color13":"#3c342e","color14":"#5d5a4b","color15":"#eae2dc"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-corduroy.json b/pywal/colorschemes/dark/dkeg-corduroy.json index 95188f1..93336d9 100644 --- a/pywal/colorschemes/dark/dkeg-corduroy.json +++ b/pywal/colorschemes/dark/dkeg-corduroy.json @@ -1 +1 @@ -{"special":{"background":"#27201d","foreground":"#987f4b","cursor":"#b7afa4"},"colors":{"color0":"#27201d","color1":"#663c23","color2":"#5c5933","color3":"#987f4b","color4":"#4b484b","color5":"#9c8065","color6":"#685a50","color7":"#b7afa4","color7":"#b7afa4","color8":"#3c3633","color9":"#663c23","color10":"#5c5933","color11":"#987f4b","color12":"#4b484b","color13":"#9c8065","color14":"#685a50","color15":"#b7afa4","color15":"#b7afa4"}} \ No newline at end of file +{"special":{"background":"#27201d","foreground":"#987f4b","cursor":"#b7afa4"},"colors":{"color0":"#27201d","color1":"#663c23","color2":"#5c5933","color3":"#987f4b","color4":"#4b484b","color5":"#9c8065","color6":"#685a50","color7":"#b7afa4","color8":"#3c3633","color9":"#663c23","color10":"#5c5933","color11":"#987f4b","color12":"#4b484b","color13":"#9c8065","color14":"#685a50","color15":"#b7afa4"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-depth.json b/pywal/colorschemes/dark/dkeg-depth.json index 7bc4850..5ea9210 100644 --- a/pywal/colorschemes/dark/dkeg-depth.json +++ b/pywal/colorschemes/dark/dkeg-depth.json @@ -1 +1 @@ -{"special":{"background":"#2c2833","foreground":"#b7a16c","cursor":"#dbd7b8"},"colors":{"color0":"#2c2833","color1":"#bf6257","color2":"#82a37c","color3":"#b7a16c","color4":"#6d6a80","color5":"#825969","color6":"#938e8f","color7":"#dbd7b8","color7":"#dbd7b8","color8":"#4e4955","color9":"#bf6257","color10":"#82a37c","color11":"#b7a16c","color12":"#6d6a80","color13":"#825969","color14":"#938e8f","color15":"#dbd7b8","color15":"#dbd7b8"}} \ No newline at end of file +{"special":{"background":"#2c2833","foreground":"#b7a16c","cursor":"#dbd7b8"},"colors":{"color0":"#2c2833","color1":"#bf6257","color2":"#82a37c","color3":"#b7a16c","color4":"#6d6a80","color5":"#825969","color6":"#938e8f","color7":"#dbd7b8","color8":"#4e4955","color9":"#bf6257","color10":"#82a37c","color11":"#b7a16c","color12":"#6d6a80","color13":"#825969","color14":"#938e8f","color15":"#dbd7b8"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-designr.json b/pywal/colorschemes/dark/dkeg-designr.json index d82100a..2c90b63 100644 --- a/pywal/colorschemes/dark/dkeg-designr.json +++ b/pywal/colorschemes/dark/dkeg-designr.json @@ -1 +1 @@ -{"special":{"background":"#242e32","foreground":"#ac8d6e","cursor":"#c4c4b5"},"colors":{"color0":"#242e32","color1":"#a66959","color2":"#769070","color3":"#ac8d6e","color4":"#607a86","color5":"#8a757e","color6":"#60867f","color7":"#c4c4b5","color7":"#c4c4b5","color8":"#35444b","color9":"#a66959","color10":"#769070","color11":"#ac8d6e","color12":"#607a86","color13":"#8a757e","color14":"#60867f","color15":"#c4c4b5","color15":"#c4c4b5"}} \ No newline at end of file +{"special":{"background":"#242e32","foreground":"#ac8d6e","cursor":"#c4c4b5"},"colors":{"color0":"#242e32","color1":"#a66959","color2":"#769070","color3":"#ac8d6e","color4":"#607a86","color5":"#8a757e","color6":"#60867f","color7":"#c4c4b5","color8":"#35444b","color9":"#a66959","color10":"#769070","color11":"#ac8d6e","color12":"#607a86","color13":"#8a757e","color14":"#60867f","color15":"#c4c4b5"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-diner.json b/pywal/colorschemes/dark/dkeg-diner.json index 245edcb..44347bc 100644 --- a/pywal/colorschemes/dark/dkeg-diner.json +++ b/pywal/colorschemes/dark/dkeg-diner.json @@ -1 +1 @@ -{"special":{"background":"#2e3738","foreground":"#b8af97","cursor":"#aba599"},"colors":{"color0":"#2e3738","color1":"#9c7f5d","color2":"#8e958f","color3":"#b8af97","color4":"#828882","color5":"#bb9a7f","color6":"#9daba2","color7":"#aba599","color7":"#aba599","color8":"#485152","color9":"#9c7f5d","color10":"#8e958f","color11":"#b8af97","color12":"#828882","color13":"#bb9a7f","color14":"#9daba2","color15":"#aba599","color15":"#aba599"}} \ No newline at end of file +{"special":{"background":"#2e3738","foreground":"#b8af97","cursor":"#aba599"},"colors":{"color0":"#2e3738","color1":"#9c7f5d","color2":"#8e958f","color3":"#b8af97","color4":"#828882","color5":"#bb9a7f","color6":"#9daba2","color7":"#aba599","color8":"#485152","color9":"#9c7f5d","color10":"#8e958f","color11":"#b8af97","color12":"#828882","color13":"#bb9a7f","color14":"#9daba2","color15":"#aba599"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-escen.json b/pywal/colorschemes/dark/dkeg-escen.json index 74bfa30..ce05702 100644 --- a/pywal/colorschemes/dark/dkeg-escen.json +++ b/pywal/colorschemes/dark/dkeg-escen.json @@ -1 +1 @@ -{"special":{"background":"#1c2319","foreground":"#be9e61","cursor":"#bcbebb"},"colors":{"color0":"#1c2319","color1":"#c14d38","color2":"#a0ce52","color3":"#be9e61","color4":"#4c7e89","color5":"#814d61","color6":"#79a69d","color7":"#bcbebb","color7":"#bcbebb","color8":"#35422f","color9":"#c14d38","color10":"#a0ce52","color11":"#be9e61","color12":"#4c7e89","color13":"#814d61","color14":"#79a69d","color15":"#bcbebb","color15":"#bcbebb"}} \ No newline at end of file +{"special":{"background":"#1c2319","foreground":"#be9e61","cursor":"#bcbebb"},"colors":{"color0":"#1c2319","color1":"#c14d38","color2":"#a0ce52","color3":"#be9e61","color4":"#4c7e89","color5":"#814d61","color6":"#79a69d","color7":"#bcbebb","color8":"#35422f","color9":"#c14d38","color10":"#a0ce52","color11":"#be9e61","color12":"#4c7e89","color13":"#814d61","color14":"#79a69d","color15":"#bcbebb"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-fendr.json b/pywal/colorschemes/dark/dkeg-fendr.json index b1d6f28..02b90e9 100644 --- a/pywal/colorschemes/dark/dkeg-fendr.json +++ b/pywal/colorschemes/dark/dkeg-fendr.json @@ -1 +1 @@ -{"special":{"background":"#262c1b","foreground":"#d6caaa","cursor":"#c1c5bd"},"colors":{"color0":"#262c1b","color1":"#7f5545","color2":"#677c54","color3":"#bba772","color4":"#6e6a5b","color5":"#92887e","color6":"#7c7562","color7":"#cccdbd","color7":"#cccdbd","color8":"#474c3e","color9":"#7f5545","color10":"#677c54","color11":"#bba772","color12":"#6e6a5b","color13":"#92887e","color14":"#7c7562","color15":"#cccdbd","color15":"#e0e1d7"}} \ No newline at end of file +{"special":{"background":"#262c1b","foreground":"#d6caaa","cursor":"#c1c5bd"},"colors":{"color0":"#262c1b","color1":"#7f5545","color2":"#677c54","color3":"#bba772","color4":"#6e6a5b","color5":"#92887e","color6":"#7c7562","color7":"#cccdbd","color8":"#474c3e","color9":"#7f5545","color10":"#677c54","color11":"#bba772","color12":"#6e6a5b","color13":"#92887e","color14":"#7c7562","color15":"#e0e1d7"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-flapr.json b/pywal/colorschemes/dark/dkeg-flapr.json index 1cb3b32..eb5f2bd 100644 --- a/pywal/colorschemes/dark/dkeg-flapr.json +++ b/pywal/colorschemes/dark/dkeg-flapr.json @@ -1 +1 @@ -{"special":{"background":"#2f2832","foreground":"#9a8e80","cursor":"#302833"},"colors":{"color0":"#2f2832","color1":"#885d50","color2":"#747965","color3":"#9a8e80","color4":"#4a4e5a","color5":"#76675b","color6":"#59555c","color7":"#bcb5b5","color7":"#bcb5b5","color8":"#4a3f4e","color9":"#885d50","color10":"#747965","color11":"#9a8e80","color12":"#4a4e5a","color13":"#76675b","color14":"#59555c","color15":"#bcb5b5","color15":"#dddada"}} \ No newline at end of file +{"special":{"background":"#2f2832","foreground":"#9a8e80","cursor":"#302833"},"colors":{"color0":"#2f2832","color1":"#885d50","color2":"#747965","color3":"#9a8e80","color4":"#4a4e5a","color5":"#76675b","color6":"#59555c","color7":"#bcb5b5","color8":"#4a3f4e","color9":"#885d50","color10":"#747965","color11":"#9a8e80","color12":"#4a4e5a","color13":"#76675b","color14":"#59555c","color15":"#dddada"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-forst.json b/pywal/colorschemes/dark/dkeg-forst.json index f681485..83da877 100644 --- a/pywal/colorschemes/dark/dkeg-forst.json +++ b/pywal/colorschemes/dark/dkeg-forst.json @@ -1 +1 @@ -{"special":{"background":"#161f14","foreground":"#806420","cursor":"#172015"},"colors":{"color0":"#161f14","color1":"#744425","color2":"#50703f","color3":"#806420","color4":"#56535d","color5":"#71532f","color6":"#45605d","color7":"#aca173","color7":"#aca173","color8":"#2d352b","color9":"#744425","color10":"#50703f","color11":"#806420","color12":"#56535d","color13":"#71532f","color14":"#45605d","color15":"#aca173","color15":"#aca173"}} \ No newline at end of file +{"special":{"background":"#161f14","foreground":"#806420","cursor":"#172015"},"colors":{"color0":"#161f14","color1":"#744425","color2":"#50703f","color3":"#806420","color4":"#56535d","color5":"#71532f","color6":"#45605d","color7":"#aca173","color8":"#2d352b","color9":"#744425","color10":"#50703f","color11":"#806420","color12":"#56535d","color13":"#71532f","color14":"#45605d","color15":"#aca173"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-fury.json b/pywal/colorschemes/dark/dkeg-fury.json index 7a4e94d..b44d8cc 100644 --- a/pywal/colorschemes/dark/dkeg-fury.json +++ b/pywal/colorschemes/dark/dkeg-fury.json @@ -1 +1 @@ -{"special":{"background":"#1e1e1e","foreground":"#4c6640","cursor":"#9e9e91"},"colors":{"color0":"#1e1e1e","color1":"#98442f","color2":"#9d8554","color3":"#4c6640","color4":"#4c596b","color5":"#7b6072","color6":"#385853","color7":"#9e9e91","color7":"#9e9e91","color8":"#363636","color9":"#98442f","color10":"#9d8554","color11":"#4c6640","color12":"#4c596b","color13":"#7b6072","color14":"#385853","color15":"#9e9e91","color15":"#9e9e91"}} \ No newline at end of file +{"special":{"background":"#1e1e1e","foreground":"#4c6640","cursor":"#9e9e91"},"colors":{"color0":"#1e1e1e","color1":"#98442f","color2":"#9d8554","color3":"#4c6640","color4":"#4c596b","color5":"#7b6072","color6":"#385853","color7":"#9e9e91","color8":"#363636","color9":"#98442f","color10":"#9d8554","color11":"#4c6640","color12":"#4c596b","color13":"#7b6072","color14":"#385853","color15":"#9e9e91"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-harbing.json b/pywal/colorschemes/dark/dkeg-harbing.json index 1cfe34e..907da48 100644 --- a/pywal/colorschemes/dark/dkeg-harbing.json +++ b/pywal/colorschemes/dark/dkeg-harbing.json @@ -1 +1 @@ -{"special":{"background":"#322b26","foreground":"#d7b18a","cursor":"#c8b49d"},"colors":{"color0":"#322b26","color1":"#bd6151","color2":"#6e9383","color3":"#d7b18a","color4":"#8a8f94","color5":"#bd9a81","color6":"#91a1a5","color7":"#c8b49d","color7":"#c8b49d","color8":"#63554c","color9":"#bd6151","color10":"#6e9383","color11":"#d7b18a","color12":"#8a8f94","color13":"#bd9a81","color14":"#91a1a5","color15":"#c8b49d","color15":"#c8b49d"}} \ No newline at end of file +{"special":{"background":"#322b26","foreground":"#d7b18a","cursor":"#c8b49d"},"colors":{"color0":"#322b26","color1":"#bd6151","color2":"#6e9383","color3":"#d7b18a","color4":"#8a8f94","color5":"#bd9a81","color6":"#91a1a5","color7":"#c8b49d","color8":"#63554c","color9":"#bd6151","color10":"#6e9383","color11":"#d7b18a","color12":"#8a8f94","color13":"#bd9a81","color14":"#91a1a5","color15":"#c8b49d"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-kit.json b/pywal/colorschemes/dark/dkeg-kit.json index bf60d7e..45586e4 100644 --- a/pywal/colorschemes/dark/dkeg-kit.json +++ b/pywal/colorschemes/dark/dkeg-kit.json @@ -1 +1 @@ -{"special":{"background":"#272733","foreground":"#dabe72","cursor":"#cac5b7"},"colors":{"color0":"#272733","color1":"#d65f2f","color2":"#aabf7f","color3":"#dabe72","color4":"#5e7e9b","color5":"#bf6c68","color6":"#5a7273","color7":"#cac5b7","color7":"#cac5b7","color8":"#48485e","color9":"#d65f2f","color10":"#aabf7f","color11":"#dabe72","color12":"#5e7e9b","color13":"#bf6c68","color14":"#5a7273","color15":"#cac5b7","color15":"#d5d1c6"}} \ No newline at end of file +{"special":{"background":"#272733","foreground":"#dabe72","cursor":"#cac5b7"},"colors":{"color0":"#272733","color1":"#d65f2f","color2":"#aabf7f","color3":"#dabe72","color4":"#5e7e9b","color5":"#bf6c68","color6":"#5a7273","color7":"#cac5b7","color8":"#48485e","color9":"#d65f2f","color10":"#aabf7f","color11":"#dabe72","color12":"#5e7e9b","color13":"#bf6c68","color14":"#5a7273","color15":"#d5d1c6"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-leaf.json b/pywal/colorschemes/dark/dkeg-leaf.json index 11bbe6d..2b2b7d5 100644 --- a/pywal/colorschemes/dark/dkeg-leaf.json +++ b/pywal/colorschemes/dark/dkeg-leaf.json @@ -1 +1 @@ -{"special":{"background":"#303728","foreground":"#d4b06c","cursor":"#b9bcb7"},"colors":{"color0":"#303728","color1":"#d06e5c","color2":"#abbb52","color3":"#d4b06c","color4":"#4c7e89","color5":"#814d61","color6":"#79a69d","color7":"#b9bcb7","color7":"#b9bcb7","color8":"#505847","color9":"#d06e5c","color10":"#abbb52","color11":"#d4b06c","color12":"#4c7e89","color13":"#814d61","color14":"#79a69d","color15":"#b9bcb7","color15":"#b9bcb7"}} \ No newline at end of file +{"special":{"background":"#303728","foreground":"#d4b06c","cursor":"#b9bcb7"},"colors":{"color0":"#303728","color1":"#d06e5c","color2":"#abbb52","color3":"#d4b06c","color4":"#4c7e89","color5":"#814d61","color6":"#79a69d","color7":"#b9bcb7","color8":"#505847","color9":"#d06e5c","color10":"#abbb52","color11":"#d4b06c","color12":"#4c7e89","color13":"#814d61","color14":"#79a69d","color15":"#b9bcb7"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-link.json b/pywal/colorschemes/dark/dkeg-link.json index 0135693..88d7b79 100644 --- a/pywal/colorschemes/dark/dkeg-link.json +++ b/pywal/colorschemes/dark/dkeg-link.json @@ -1 +1 @@ -{"special":{"background":"#222222","foreground":"#c5c5b2","cursor":"#242424"},"colors":{"color0":"#222222","color1":"#4d4d4d","color2":"#8a8c84","color3":"#c5c5b2","color4":"#5d5d5d","color5":"#707070","color6":"#898989","color7":"#c2c2c2","color7":"#c2c2c2","color8":"#484848","color9":"#4d4d4d","color10":"#8a8c84","color11":"#c5c5b2","color12":"#5d5d5d","color13":"#707070","color14":"#898989","color15":"#c2c2c2","color15":"#f1f1f1"}} \ No newline at end of file +{"special":{"background":"#222222","foreground":"#c5c5b2","cursor":"#242424"},"colors":{"color0":"#222222","color1":"#4d4d4d","color2":"#8a8c84","color3":"#c5c5b2","color4":"#5d5d5d","color5":"#707070","color6":"#898989","color7":"#c2c2c2","color8":"#484848","color9":"#4d4d4d","color10":"#8a8c84","color11":"#c5c5b2","color12":"#5d5d5d","color13":"#707070","color14":"#898989","color15":"#f1f1f1"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-mattd.json b/pywal/colorschemes/dark/dkeg-mattd.json index 92897c3..708c6a6 100644 --- a/pywal/colorschemes/dark/dkeg-mattd.json +++ b/pywal/colorschemes/dark/dkeg-mattd.json @@ -1 +1 @@ -{"special":{"background":"#20201f","foreground":"#799c6a","cursor":"#b0b0a2"},"colors":{"color0":"#20201f","color1":"#996140","color2":"#9d8554","color3":"#799c6a","color4":"#5f656a","color5":"#7b6064","color6":"#566e6b","color7":"#b0b0a2","color7":"#b0b0a2","color8":"#3a3a38","color9":"#996140","color10":"#9d8554","color11":"#799c6a","color12":"#5f656a","color13":"#7b6064","color14":"#566e6b","color15":"#b0b0a2","color15":"#d3d3cb"}} \ No newline at end of file +{"special":{"background":"#20201f","foreground":"#799c6a","cursor":"#b0b0a2"},"colors":{"color0":"#20201f","color1":"#996140","color2":"#9d8554","color3":"#799c6a","color4":"#5f656a","color5":"#7b6064","color6":"#566e6b","color7":"#b0b0a2","color8":"#3a3a38","color9":"#996140","color10":"#9d8554","color11":"#799c6a","color12":"#5f656a","color13":"#7b6064","color14":"#566e6b","color15":"#d3d3cb"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-novmbr.json b/pywal/colorschemes/dark/dkeg-novmbr.json index f688df0..efca9e6 100644 --- a/pywal/colorschemes/dark/dkeg-novmbr.json +++ b/pywal/colorschemes/dark/dkeg-novmbr.json @@ -1 +1 @@ -{"special":{"background":"#241d1a","foreground":"#cca75f","cursor":"#251e1b"},"colors":{"color0":"#241d1a","color1":"#9f6434","color2":"#9dac5f","color3":"#cca75f","color4":"#2f7d7c","color5":"#b5896e","color6":"#52877f","color7":"#c7b8ac","color7":"#c7b8ac","color8":"#50413a","color9":"#9f6434","color10":"#9dac5f","color11":"#cca75f","color12":"#2f7d7c","color13":"#b5896e","color14":"#52877f","color15":"#c7b8ac","color15":"#c7b8ac"}} \ No newline at end of file +{"special":{"background":"#241d1a","foreground":"#cca75f","cursor":"#251e1b"},"colors":{"color0":"#241d1a","color1":"#9f6434","color2":"#9dac5f","color3":"#cca75f","color4":"#2f7d7c","color5":"#b5896e","color6":"#52877f","color7":"#c7b8ac","color8":"#50413a","color9":"#9f6434","color10":"#9dac5f","color11":"#cca75f","color12":"#2f7d7c","color13":"#b5896e","color14":"#52877f","color15":"#c7b8ac"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-owl.json b/pywal/colorschemes/dark/dkeg-owl.json index b78631f..097c9c0 100644 --- a/pywal/colorschemes/dark/dkeg-owl.json +++ b/pywal/colorschemes/dark/dkeg-owl.json @@ -1 +1 @@ -{"special":{"background":"#2f2b2c","foreground":"#cacaca","cursor":"#dedede"},"colors":{"color0":"#2f2b2c","color1":"#5a5a5a","color2":"#989898","color3":"#cacaca","color4":"#656565","color5":"#b1b1b1","color6":"#7f7f7f","color7":"#dedede","color7":"#dedede","color8":"#504c4e","color9":"#5a5a5a","color10":"#989898","color11":"#cacaca","color12":"#656565","color13":"#b1b1b1","color14":"#7f7f7f","color15":"#dedede","color15":"#FFFFFF"}} \ No newline at end of file +{"special":{"background":"#2f2b2c","foreground":"#cacaca","cursor":"#dedede"},"colors":{"color0":"#2f2b2c","color1":"#5a5a5a","color2":"#989898","color3":"#cacaca","color4":"#656565","color5":"#b1b1b1","color6":"#7f7f7f","color7":"#dedede","color8":"#504c4e","color9":"#5a5a5a","color10":"#989898","color11":"#cacaca","color12":"#656565","color13":"#b1b1b1","color14":"#7f7f7f","color15":"#FFFFFF"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-paints.json b/pywal/colorschemes/dark/dkeg-paints.json index 3a53063..2ff749e 100644 --- a/pywal/colorschemes/dark/dkeg-paints.json +++ b/pywal/colorschemes/dark/dkeg-paints.json @@ -1 +1 @@ -{"special":{"background":"#2f2a2a","foreground":"#b2885d","cursor":"#332e2e"},"colors":{"color0":"#2f2a2a","color1":"#854340","color2":"#668c71","color3":"#b2885d","color4":"#41647b","color5":"#915556","color6":"#477578","color7":"#c9c8c8","color7":"#c9c8c8","color8":"#c9c8c8","color9":"#854340","color10":"#668c71","color11":"#b2885d","color12":"#41647b","color13":"#915556","color14":"#477578","color15":"#c9c8c8","color15":"#c9c8c8"}} \ No newline at end of file +{"special":{"background":"#2f2a2a","foreground":"#b2885d","cursor":"#332e2e"},"colors":{"color0":"#2f2a2a","color1":"#854340","color2":"#668c71","color3":"#b2885d","color4":"#41647b","color5":"#915556","color6":"#477578","color7":"#c9c8c8","color8":"#c9c8c8","color9":"#854340","color10":"#668c71","color11":"#b2885d","color12":"#41647b","color13":"#915556","color14":"#477578","color15":"#c9c8c8"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-parkd.json b/pywal/colorschemes/dark/dkeg-parkd.json index bbebdd3..00fc0a0 100644 --- a/pywal/colorschemes/dark/dkeg-parkd.json +++ b/pywal/colorschemes/dark/dkeg-parkd.json @@ -1 +1 @@ -{"special":{"background":"#2b2428","foreground":"#b29d6a","cursor":"#c2b7aa"},"colors":{"color0":"#2b2428","color1":"#89453c","color2":"#59713f","color3":"#b29d6a","color4":"#464e59","color5":"#614e44","color6":"#4f545b","color7":"#c2b7aa","color7":"#c2b7aa","color8":"#413c40","color9":"#89453c","color10":"#59713f","color11":"#b29d6a","color12":"#464e59","color13":"#614e44","color14":"#4f545b","color15":"#c2b7aa","color15":"#c2b7aa"}} \ No newline at end of file +{"special":{"background":"#2b2428","foreground":"#b29d6a","cursor":"#c2b7aa"},"colors":{"color0":"#2b2428","color1":"#89453c","color2":"#59713f","color3":"#b29d6a","color4":"#464e59","color5":"#614e44","color6":"#4f545b","color7":"#c2b7aa","color8":"#413c40","color9":"#89453c","color10":"#59713f","color11":"#b29d6a","color12":"#464e59","color13":"#614e44","color14":"#4f545b","color15":"#c2b7aa"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-pastely.json b/pywal/colorschemes/dark/dkeg-pastely.json index d2850d4..34af5f9 100644 --- a/pywal/colorschemes/dark/dkeg-pastely.json +++ b/pywal/colorschemes/dark/dkeg-pastely.json @@ -1 +1 @@ -{"special":{"background":"#2c2c2e","foreground":"#87835d","cursor":"#2e2e30"},"colors":{"color0":"#2c2c2e","color1":"#645446","color2":"#59674f","color3":"#87835d","color4":"#4d554f","color5":"#70614f","color6":"#666755","color7":"#aba786","color7":"#aba786","color8":"#aba786","color9":"#645446","color10":"#59674f","color11":"#87835d","color12":"#4d554f","color13":"#70614f","color14":"#666755","color15":"#aba786","color15":"#c4c1aa"}} \ No newline at end of file +{"special":{"background":"#2c2c2e","foreground":"#87835d","cursor":"#2e2e30"},"colors":{"color0":"#2c2c2e","color1":"#645446","color2":"#59674f","color3":"#87835d","color4":"#4d554f","color5":"#70614f","color6":"#666755","color7":"#aba786","color8":"#aba786","color9":"#645446","color10":"#59674f","color11":"#87835d","color12":"#4d554f","color13":"#70614f","color14":"#666755","color15":"#c4c1aa"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-petal.json b/pywal/colorschemes/dark/dkeg-petal.json index 0b3ef0c..76541a6 100644 --- a/pywal/colorschemes/dark/dkeg-petal.json +++ b/pywal/colorschemes/dark/dkeg-petal.json @@ -1 +1 @@ -{"special":{"background":"#22211f","foreground":"#827834","cursor":"#252422"},"colors":{"color0":"#22211f","color1":"#785326","color2":"#516941","color3":"#827834","color4":"#42514f","color5":"#6a5632","color6":"#4e5d4d","color7":"#b4b399","color7":"#b4b399","color8":"#b4b399","color9":"#785326","color10":"#516941","color11":"#827834","color12":"#42514f","color13":"#6a5632","color14":"#4e5d4d","color15":"#b4b399","color15":"#c9c9b6"}} \ No newline at end of file +{"special":{"background":"#22211f","foreground":"#827834","cursor":"#252422"},"colors":{"color0":"#22211f","color1":"#785326","color2":"#516941","color3":"#827834","color4":"#42514f","color5":"#6a5632","color6":"#4e5d4d","color7":"#b4b399","color8":"#b4b399","color9":"#785326","color10":"#516941","color11":"#827834","color12":"#42514f","color13":"#6a5632","color14":"#4e5d4d","color15":"#c9c9b6"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-poly.json b/pywal/colorschemes/dark/dkeg-poly.json index 48dcca3..0b1a834 100644 --- a/pywal/colorschemes/dark/dkeg-poly.json +++ b/pywal/colorschemes/dark/dkeg-poly.json @@ -1 +1 @@ -{"special":{"background":"#231c0d","foreground":"#aead5d","cursor":"#a5a39d"},"colors":{"color0":"#231c0d","color1":"#a47b3d","color2":"#7b9764","color3":"#aead5d","color4":"#628e8f","color5":"#ad9d52","color6":"#709681","color7":"#a5a39d","color7":"#a5a39d","color8":"#3f392a","color9":"#a47b3d","color10":"#7b9764","color11":"#aead5d","color12":"#628e8f","color13":"#ad9d52","color14":"#709681","color15":"#a5a39d","color15":"#a5a39d"}} \ No newline at end of file +{"special":{"background":"#231c0d","foreground":"#aead5d","cursor":"#a5a39d"},"colors":{"color0":"#231c0d","color1":"#a47b3d","color2":"#7b9764","color3":"#aead5d","color4":"#628e8f","color5":"#ad9d52","color6":"#709681","color7":"#a5a39d","color8":"#3f392a","color9":"#a47b3d","color10":"#7b9764","color11":"#aead5d","color12":"#628e8f","color13":"#ad9d52","color14":"#709681","color15":"#a5a39d"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-prevail.json b/pywal/colorschemes/dark/dkeg-prevail.json index 4e0f231..fb99828 100644 --- a/pywal/colorschemes/dark/dkeg-prevail.json +++ b/pywal/colorschemes/dark/dkeg-prevail.json @@ -1 +1 @@ -{"special":{"background":"#263139","foreground":"#dac99d","cursor":"#28343c"},"colors":{"color0":"#263139","color1":"#f36f62","color2":"#c5e19c","color3":"#ccb478","color4":"#4c7e89","color5":"#814d61","color6":"#79a69d","color7":"#c4c4b5","color7":"#c4c4b5","color8":"#455867","color9":"#f36f62","color10":"#c5e19c","color11":"#ccb478","color12":"#4c7e89","color13":"#814d61","color14":"#79a69d","color15":"#c4c4b5","color15":"#dbdbd1"}} \ No newline at end of file +{"special":{"background":"#263139","foreground":"#dac99d","cursor":"#28343c"},"colors":{"color0":"#263139","color1":"#f36f62","color2":"#c5e19c","color3":"#ccb478","color4":"#4c7e89","color5":"#814d61","color6":"#79a69d","color7":"#c4c4b5","color8":"#455867","color9":"#f36f62","color10":"#c5e19c","color11":"#ccb478","color12":"#4c7e89","color13":"#814d61","color14":"#79a69d","color15":"#dbdbd1"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-provrb.json b/pywal/colorschemes/dark/dkeg-provrb.json index 5ccf893..3969bcf 100644 --- a/pywal/colorschemes/dark/dkeg-provrb.json +++ b/pywal/colorschemes/dark/dkeg-provrb.json @@ -1 +1 @@ -{"special":{"background":"#322f30","foreground":"#8d7766","cursor":"#353233"},"colors":{"color0":"#322f30","color1":"#654c51","color2":"#7f8281","color3":"#8d7766","color4":"#5b697e","color5":"#7b6b75","color6":"#7d8592","color7":"#c0bfbf","color7":"#c0bfbf","color8":"#c0bfbf","color9":"#654c51","color10":"#7f8281","color11":"#8d7766","color12":"#5b697e","color13":"#7b6b75","color14":"#7d8592","color15":"#c0bfbf","color15":"#dfdfdf"}} \ No newline at end of file +{"special":{"background":"#322f30","foreground":"#8d7766","cursor":"#353233"},"colors":{"color0":"#322f30","color1":"#654c51","color2":"#7f8281","color3":"#8d7766","color4":"#5b697e","color5":"#7b6b75","color6":"#7d8592","color7":"#c0bfbf","color8":"#c0bfbf","color9":"#654c51","color10":"#7f8281","color11":"#8d7766","color12":"#5b697e","color13":"#7b6b75","color14":"#7d8592","color15":"#dfdfdf"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-raild.json b/pywal/colorschemes/dark/dkeg-raild.json index d9e99d9..0294284 100644 --- a/pywal/colorschemes/dark/dkeg-raild.json +++ b/pywal/colorschemes/dark/dkeg-raild.json @@ -1 +1 @@ -{"special":{"background":"#282623","foreground":"#ad8b67","cursor":"#2b2825"},"colors":{"color0":"#282623","color1":"#935334","color2":"#66604d","color3":"#ad8b67","color4":"#504b44","color5":"#634737","color6":"#505349","color7":"#bcbba4","color7":"#bcbba4","color8":"#43403b","color9":"#935334","color10":"#66604d","color11":"#ad8b67","color12":"#504b44","color13":"#634737","color14":"#505349","color15":"#bcbba4","color15":"#dbdace"}} \ No newline at end of file +{"special":{"background":"#282623","foreground":"#ad8b67","cursor":"#2b2825"},"colors":{"color0":"#282623","color1":"#935334","color2":"#66604d","color3":"#ad8b67","color4":"#504b44","color5":"#634737","color6":"#505349","color7":"#bcbba4","color8":"#43403b","color9":"#935334","color10":"#66604d","color11":"#ad8b67","color12":"#504b44","color13":"#634737","color14":"#505349","color15":"#dbdace"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-relax.json b/pywal/colorschemes/dark/dkeg-relax.json index ce881fc..315b0cb 100644 --- a/pywal/colorschemes/dark/dkeg-relax.json +++ b/pywal/colorschemes/dark/dkeg-relax.json @@ -1 +1 @@ -{"special":{"background":"#322835","foreground":"#b08960","cursor":"#332836"},"colors":{"color0":"#322835","color1":"#674f4a","color2":"#67786d","color3":"#b08960","color4":"#5e6d79","color5":"#7d6969","color6":"#6a7a76","color7":"#ccbfb3","color7":"#ccbfb3","color8":"#4b3f4e","color9":"#674f4a","color10":"#67786d","color11":"#b08960","color12":"#5e6d79","color13":"#7d6969","color14":"#6a7a76","color15":"#ccbfb3","color15":"#ccbfb3"}} \ No newline at end of file +{"special":{"background":"#322835","foreground":"#b08960","cursor":"#332836"},"colors":{"color0":"#322835","color1":"#674f4a","color2":"#67786d","color3":"#b08960","color4":"#5e6d79","color5":"#7d6969","color6":"#6a7a76","color7":"#ccbfb3","color8":"#4b3f4e","color9":"#674f4a","color10":"#67786d","color11":"#b08960","color12":"#5e6d79","color13":"#7d6969","color14":"#6a7a76","color15":"#ccbfb3"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-scag.json b/pywal/colorschemes/dark/dkeg-scag.json index 80068b8..5e6d1ea 100644 --- a/pywal/colorschemes/dark/dkeg-scag.json +++ b/pywal/colorschemes/dark/dkeg-scag.json @@ -1 +1 @@ -{"special":{"background":"#252326","foreground":"#7a8648","cursor":"#c4bbb0"},"colors":{"color0":"#252326","color1":"#93503e","color2":"#9d8554","color3":"#7a8648","color4":"#5f656a","color5":"#7b6064","color6":"#566e6b","color7":"#c4bbb0","color7":"#c4bbb0","color8":"#413f43","color9":"#93503e","color10":"#9d8554","color11":"#7a8648","color12":"#5f656a","color13":"#7b6064","color14":"#566e6b","color15":"#c4bbb0","color15":"#c4bbb0"}} \ No newline at end of file +{"special":{"background":"#252326","foreground":"#7a8648","cursor":"#c4bbb0"},"colors":{"color0":"#252326","color1":"#93503e","color2":"#9d8554","color3":"#7a8648","color4":"#5f656a","color5":"#7b6064","color6":"#566e6b","color7":"#c4bbb0","color8":"#413f43","color9":"#93503e","color10":"#9d8554","color11":"#7a8648","color12":"#5f656a","color13":"#7b6064","color14":"#566e6b","color15":"#c4bbb0"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-scape.json b/pywal/colorschemes/dark/dkeg-scape.json index 87973c6..388329b 100644 --- a/pywal/colorschemes/dark/dkeg-scape.json +++ b/pywal/colorschemes/dark/dkeg-scape.json @@ -1 +1 @@ -{"special":{"background":"#282423","foreground":"#987f4b","cursor":"#b7afa4"},"colors":{"color0":"#282423","color1":"#925633","color2":"#757c60","color3":"#987f4b","color4":"#515962","color5":"#685054","color6":"#506168","color7":"#b7afa4","color7":"#b7afa4","color8":"#3f3d3c","color9":"#925633","color10":"#757c60","color11":"#987f4b","color12":"#515962","color13":"#685054","color14":"#506168","color15":"#b7afa4","color15":"#b7afa4"}} \ No newline at end of file +{"special":{"background":"#282423","foreground":"#987f4b","cursor":"#b7afa4"},"colors":{"color0":"#282423","color1":"#925633","color2":"#757c60","color3":"#987f4b","color4":"#515962","color5":"#685054","color6":"#506168","color7":"#b7afa4","color8":"#3f3d3c","color9":"#925633","color10":"#757c60","color11":"#987f4b","color12":"#515962","color13":"#685054","color14":"#506168","color15":"#b7afa4"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-shade.json b/pywal/colorschemes/dark/dkeg-shade.json index 7b77506..0e0d7a2 100644 --- a/pywal/colorschemes/dark/dkeg-shade.json +++ b/pywal/colorschemes/dark/dkeg-shade.json @@ -1 +1 @@ -{"special":{"background":"#2c2c2c","foreground":"#d0c57a","cursor":"#ededb7"},"colors":{"color0":"#2c2c2c","color1":"#c77369","color2":"#93988a","color3":"#d0c57a","color4":"#747f89","color5":"#825969","color6":"#938e8f","color7":"#ddddb5","color7":"#ddddb5","color8":"#4e4e4e","color9":"#c77369","color10":"#93988a","color11":"#d0c57a","color12":"#747f89","color13":"#825969","color14":"#938e8f","color15":"#ddddb5","color15":"#ededb7"}} \ No newline at end of file +{"special":{"background":"#2c2c2c","foreground":"#d0c57a","cursor":"#ededb7"},"colors":{"color0":"#2c2c2c","color1":"#c77369","color2":"#93988a","color3":"#d0c57a","color4":"#747f89","color5":"#825969","color6":"#938e8f","color7":"#ddddb5","color8":"#4e4e4e","color9":"#c77369","color10":"#93988a","color11":"#d0c57a","color12":"#747f89","color13":"#825969","color14":"#938e8f","color15":"#ededb7"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-simplicity.json b/pywal/colorschemes/dark/dkeg-simplicity.json index 31d249e..f0dce87 100644 --- a/pywal/colorschemes/dark/dkeg-simplicity.json +++ b/pywal/colorschemes/dark/dkeg-simplicity.json @@ -1 +1 @@ -{"special":{"background":"#28282C","foreground":"#A18673","cursor":"#F3F3F3"},"colors":{"color0":"#28282C","color1":"#BF5C56","color2":"#BF5C56","color3":"#97B19C","color4":"#97B19C","color5":"#D7BD8A","color6":"#D7BD8A","color7":"#545F72","color7":"#545F72","color8":"#404047","color9":"#BF5C56","color10":"#BF5C56","color11":"#97B19C","color12":"#97B19C","color13":"#D7BD8A","color14":"#D7BD8A","color15":"#545F72","color15":"#F4F4F2"}} \ No newline at end of file +{"special":{"background":"#28282C","foreground":"#A18673","cursor":"#F3F3F3"},"colors":{"color0":"#28282C","color1":"#BF5C56","color2":"#BF5C56","color3":"#97B19C","color4":"#97B19C","color5":"#D7BD8A","color6":"#D7BD8A","color7":"#545F72","color8":"#404047","color9":"#BF5C56","color10":"#BF5C56","color11":"#97B19C","color12":"#97B19C","color13":"#D7BD8A","color14":"#D7BD8A","color15":"#F4F4F2"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-skigh.json b/pywal/colorschemes/dark/dkeg-skigh.json index b7938e9..7c4dc75 100644 --- a/pywal/colorschemes/dark/dkeg-skigh.json +++ b/pywal/colorschemes/dark/dkeg-skigh.json @@ -1 +1 @@ -{"special":{"background":"#252a32","foreground":"#b39580","cursor":"#272c34"},"colors":{"color0":"#252a32","color1":"#876058","color2":"#6f7f71","color3":"#b39580","color4":"#546780","color5":"#84787d","color6":"#556f86","color7":"#bab7b5","color7":"#bab7b5","color8":"#bab7b5","color9":"#876058","color10":"#6f7f71","color11":"#b39580","color12":"#546780","color13":"#84787d","color14":"#556f86","color15":"#bab7b5","color15":"#dfdedd"}} \ No newline at end of file +{"special":{"background":"#252a32","foreground":"#b39580","cursor":"#272c34"},"colors":{"color0":"#252a32","color1":"#876058","color2":"#6f7f71","color3":"#b39580","color4":"#546780","color5":"#84787d","color6":"#556f86","color7":"#bab7b5","color8":"#bab7b5","color9":"#876058","color10":"#6f7f71","color11":"#b39580","color12":"#546780","color13":"#84787d","color14":"#556f86","color15":"#dfdedd"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-slate.json b/pywal/colorschemes/dark/dkeg-slate.json index 9a9a4bb..9bc8854 100644 --- a/pywal/colorschemes/dark/dkeg-slate.json +++ b/pywal/colorschemes/dark/dkeg-slate.json @@ -1 +1 @@ -{"special":{"background":"#242a2b","foreground":"#8d8150","cursor":"#242b2c"},"colors":{"color0":"#242a2b","color1":"#674839","color2":"#6e794f","color3":"#8d8150","color4":"#3b474e","color5":"#554c41","color6":"#495355","color7":"#939381","color7":"#939381","color8":"#939381","color9":"#674839","color10":"#6e794f","color11":"#8d8150","color12":"#3b474e","color13":"#554c41","color14":"#495355","color15":"#939381","color15":"#abab9c"}} \ No newline at end of file +{"special":{"background":"#242a2b","foreground":"#8d8150","cursor":"#242b2c"},"colors":{"color0":"#242a2b","color1":"#674839","color2":"#6e794f","color3":"#8d8150","color4":"#3b474e","color5":"#554c41","color6":"#495355","color7":"#939381","color8":"#939381","color9":"#674839","color10":"#6e794f","color11":"#8d8150","color12":"#3b474e","color13":"#554c41","color14":"#495355","color15":"#abab9c"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-soundwave.json b/pywal/colorschemes/dark/dkeg-soundwave.json index e0f6637..0cc759c 100644 --- a/pywal/colorschemes/dark/dkeg-soundwave.json +++ b/pywal/colorschemes/dark/dkeg-soundwave.json @@ -1 +1 @@ -{"special":{"background":"#29231f","foreground":"#aa8f5f","cursor":"#bcb7aa"},"colors":{"color0":"#29231f","color1":"#675141","color2":"#625438","color3":"#aa8f5f","color4":"#6e6051","color5":"#514540","color6":"#5e4e3c","color7":"#bcb7aa","color7":"#bcb7aa","color8":"#514b49","color9":"#675141","color10":"#625438","color11":"#aa8f5f","color12":"#6e6051","color13":"#514540","color14":"#5e4e3c","color15":"#bcb7aa","color15":"#dedbd5"}} \ No newline at end of file +{"special":{"background":"#29231f","foreground":"#aa8f5f","cursor":"#bcb7aa"},"colors":{"color0":"#29231f","color1":"#675141","color2":"#625438","color3":"#aa8f5f","color4":"#6e6051","color5":"#514540","color6":"#5e4e3c","color7":"#bcb7aa","color8":"#514b49","color9":"#675141","color10":"#625438","color11":"#aa8f5f","color12":"#6e6051","color13":"#514540","color14":"#5e4e3c","color15":"#dedbd5"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-spire.json b/pywal/colorschemes/dark/dkeg-spire.json index 5f823ff..77668fb 100644 --- a/pywal/colorschemes/dark/dkeg-spire.json +++ b/pywal/colorschemes/dark/dkeg-spire.json @@ -1 +1 @@ -{"special":{"background":"#262f33","foreground":"#948d65","cursor":"#b5b699"},"colors":{"color0":"#262f33","color1":"#804f4e","color2":"#68786c","color3":"#948d65","color4":"#47575f","color5":"#74636a","color6":"#526562","color7":"#b5b699","color7":"#b5b699","color8":"#464c50","color9":"#804f4e","color10":"#68786c","color11":"#948d65","color12":"#47575f","color13":"#74636a","color14":"#526562","color15":"#b5b699","color15":"#cbcbb7"}} \ No newline at end of file +{"special":{"background":"#262f33","foreground":"#948d65","cursor":"#b5b699"},"colors":{"color0":"#262f33","color1":"#804f4e","color2":"#68786c","color3":"#948d65","color4":"#47575f","color5":"#74636a","color6":"#526562","color7":"#b5b699","color8":"#464c50","color9":"#804f4e","color10":"#68786c","color11":"#948d65","color12":"#47575f","color13":"#74636a","color14":"#526562","color15":"#cbcbb7"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-sprout.json b/pywal/colorschemes/dark/dkeg-sprout.json index 560d970..1a1f867 100644 --- a/pywal/colorschemes/dark/dkeg-sprout.json +++ b/pywal/colorschemes/dark/dkeg-sprout.json @@ -1 +1 @@ -{"special":{"background":"#2d3144","foreground":"#96915d","cursor":"#cfccbe"},"colors":{"color0":"#2d3144","color1":"#8d6d5c","color2":"#6d806d","color3":"#96915d","color4":"#68758d","color5":"#8a747b","color6":"#8d97a8","color7":"#cfccbe","color7":"#cfccbe","color8":"#525a69","color9":"#8d6d5c","color10":"#6d806d","color11":"#96915d","color12":"#68758d","color13":"#8a747b","color14":"#8d97a8","color15":"#cfccbe","color15":"#f0efeb"}} \ No newline at end of file +{"special":{"background":"#2d3144","foreground":"#96915d","cursor":"#cfccbe"},"colors":{"color0":"#2d3144","color1":"#8d6d5c","color2":"#6d806d","color3":"#96915d","color4":"#68758d","color5":"#8a747b","color6":"#8d97a8","color7":"#cfccbe","color8":"#525a69","color9":"#8d6d5c","color10":"#6d806d","color11":"#96915d","color12":"#68758d","color13":"#8a747b","color14":"#8d97a8","color15":"#f0efeb"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-squares.json b/pywal/colorschemes/dark/dkeg-squares.json index feab321..978bcd6 100644 --- a/pywal/colorschemes/dark/dkeg-squares.json +++ b/pywal/colorschemes/dark/dkeg-squares.json @@ -1 +1 @@ -{"special":{"background":"#27201f","foreground":"#978341","cursor":"#bebcbc"},"colors":{"color0":"#27201f","color1":"#9b5208","color2":"#75922c","color3":"#978341","color4":"#5e6676","color5":"#824219","color6":"#4e7479","color7":"#bebcbc","color7":"#bebcbc","color8":"#3b3436","color9":"#9b5208","color10":"#75922c","color11":"#978341","color12":"#5e6676","color13":"#824219","color14":"#4e7479","color15":"#bebcbc","color15":"#bebcbc"}} \ No newline at end of file +{"special":{"background":"#27201f","foreground":"#978341","cursor":"#bebcbc"},"colors":{"color0":"#27201f","color1":"#9b5208","color2":"#75922c","color3":"#978341","color4":"#5e6676","color5":"#824219","color6":"#4e7479","color7":"#bebcbc","color8":"#3b3436","color9":"#9b5208","color10":"#75922c","color11":"#978341","color12":"#5e6676","color13":"#824219","color14":"#4e7479","color15":"#bebcbc"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-stv.json b/pywal/colorschemes/dark/dkeg-stv.json index 4567879..b4f424a 100644 --- a/pywal/colorschemes/dark/dkeg-stv.json +++ b/pywal/colorschemes/dark/dkeg-stv.json @@ -1 +1 @@ -{"special":{"background":"#2c373d","foreground":"#baad8a","cursor":"#c4c0bb"},"colors":{"color0":"#2c373d","color1":"#a67979","color2":"#809f7b","color3":"#baad8a","color4":"#6d7575","color5":"#8e7d79","color6":"#7b9899","color7":"#c4c0bb","color7":"#c4c0bb","color8":"#4d5459","color9":"#a67979","color10":"#809f7b","color11":"#baad8a","color12":"#6d7575","color13":"#8e7d79","color14":"#7b9899","color15":"#c4c0bb","color15":"#c4c0bb"}} \ No newline at end of file +{"special":{"background":"#2c373d","foreground":"#baad8a","cursor":"#c4c0bb"},"colors":{"color0":"#2c373d","color1":"#a67979","color2":"#809f7b","color3":"#baad8a","color4":"#6d7575","color5":"#8e7d79","color6":"#7b9899","color7":"#c4c0bb","color8":"#4d5459","color9":"#a67979","color10":"#809f7b","color11":"#baad8a","color12":"#6d7575","color13":"#8e7d79","color14":"#7b9899","color15":"#c4c0bb"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-subtle.json b/pywal/colorschemes/dark/dkeg-subtle.json index df48caa..a7d245f 100644 --- a/pywal/colorschemes/dark/dkeg-subtle.json +++ b/pywal/colorschemes/dark/dkeg-subtle.json @@ -1 +1 @@ -{"special":{"background":"#2c2c35","foreground":"#6b925a","cursor":"#2d2d36"},"colors":{"color0":"#2c2c35","color1":"#b56550","color2":"#b79b58","color3":"#6b925a","color4":"#6e747b","color5":"#96787d","color6":"#7b8889","color7":"#b4ada4","color7":"#b4ada4","color8":"#45454d","color9":"#b56550","color10":"#b79b58","color11":"#6b925a","color12":"#6e747b","color13":"#96787d","color14":"#7b8889","color15":"#b4ada4","color15":"#b4ada4"}} \ No newline at end of file +{"special":{"background":"#2c2c35","foreground":"#6b925a","cursor":"#2d2d36"},"colors":{"color0":"#2c2c35","color1":"#b56550","color2":"#b79b58","color3":"#6b925a","color4":"#6e747b","color5":"#96787d","color6":"#7b8889","color7":"#b4ada4","color8":"#45454d","color9":"#b56550","color10":"#b79b58","color11":"#6b925a","color12":"#6e747b","color13":"#96787d","color14":"#7b8889","color15":"#b4ada4"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-sundr.json b/pywal/colorschemes/dark/dkeg-sundr.json index f400a74..061b695 100644 --- a/pywal/colorschemes/dark/dkeg-sundr.json +++ b/pywal/colorschemes/dark/dkeg-sundr.json @@ -1 +1 @@ -{"special":{"background":"#2b2320","foreground":"#aa9375","cursor":"#2e2522"},"colors":{"color0":"#2b2320","color1":"#734948","color2":"#768157","color3":"#aa9375","color4":"#585b63","color5":"#6f5a56","color6":"#7d8486","color7":"#bab1a1","color7":"#bab1a1","color8":"#bab1a1","color9":"#734948","color10":"#768157","color11":"#aa9375","color12":"#585b63","color13":"#6f5a56","color14":"#7d8486","color15":"#bab1a1","color15":"#bab1a1"}} \ No newline at end of file +{"special":{"background":"#2b2320","foreground":"#aa9375","cursor":"#2e2522"},"colors":{"color0":"#2b2320","color1":"#734948","color2":"#768157","color3":"#aa9375","color4":"#585b63","color5":"#6f5a56","color6":"#7d8486","color7":"#bab1a1","color8":"#bab1a1","color9":"#734948","color10":"#768157","color11":"#aa9375","color12":"#585b63","color13":"#6f5a56","color14":"#7d8486","color15":"#bab1a1"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-tealights.json b/pywal/colorschemes/dark/dkeg-tealights.json index 2403348..8e2b0e3 100644 --- a/pywal/colorschemes/dark/dkeg-tealights.json +++ b/pywal/colorschemes/dark/dkeg-tealights.json @@ -1 +1 @@ -{"special":{"background":"#25231b","foreground":"#988871","cursor":"#26241c"},"colors":{"color0":"#25231b","color1":"#8e2f34","color2":"#55654a","color3":"#988871","color4":"#848f89","color5":"#9f8c7c","color6":"#9cb4a6","color7":"#c4c1b0","color7":"#c4c1b0","color8":"#423f31","color9":"#8e2f34","color10":"#55654a","color11":"#988871","color12":"#848f89","color13":"#9f8c7c","color14":"#9cb4a6","color15":"#c4c1b0","color15":"#d8d4c5"}} \ No newline at end of file +{"special":{"background":"#25231b","foreground":"#988871","cursor":"#26241c"},"colors":{"color0":"#25231b","color1":"#8e2f34","color2":"#55654a","color3":"#988871","color4":"#848f89","color5":"#9f8c7c","color6":"#9cb4a6","color7":"#c4c1b0","color8":"#423f31","color9":"#8e2f34","color10":"#55654a","color11":"#988871","color12":"#848f89","color13":"#9f8c7c","color14":"#9cb4a6","color15":"#d8d4c5"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-traffic.json b/pywal/colorschemes/dark/dkeg-traffic.json index 9c03c8d..f103fc3 100644 --- a/pywal/colorschemes/dark/dkeg-traffic.json +++ b/pywal/colorschemes/dark/dkeg-traffic.json @@ -1 +1 @@ -{"special":{"background":"#272c30","foreground":"#c79e84","cursor":"#cfb9a8"},"colors":{"color0":"#272c30","color1":"#934e46","color2":"#637268","color3":"#c79e84","color4":"#515e67","color5":"#715f5e","color6":"#5c6f7d","color7":"#cfb9a8","color7":"#cfb9a8","color8":"#414a51","color9":"#934e46","color10":"#637268","color11":"#c79e84","color12":"#515e67","color13":"#715f5e","color14":"#5c6f7d","color15":"#cfb9a8","color15":"#ddcec2"}} \ No newline at end of file +{"special":{"background":"#272c30","foreground":"#c79e84","cursor":"#cfb9a8"},"colors":{"color0":"#272c30","color1":"#934e46","color2":"#637268","color3":"#c79e84","color4":"#515e67","color5":"#715f5e","color6":"#5c6f7d","color7":"#cfb9a8","color8":"#414a51","color9":"#934e46","color10":"#637268","color11":"#c79e84","color12":"#515e67","color13":"#715f5e","color14":"#5c6f7d","color15":"#ddcec2"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-transposet.json b/pywal/colorschemes/dark/dkeg-transposet.json index 8740011..08235e9 100644 --- a/pywal/colorschemes/dark/dkeg-transposet.json +++ b/pywal/colorschemes/dark/dkeg-transposet.json @@ -1 +1 @@ -{"special":{"background":"#2a2725","foreground":"#bdac8c","cursor":"#2b2927"},"colors":{"color0":"#2a2725","color1":"#8e6f64","color2":"#849385","color3":"#bdac8c","color4":"#4c5467","color5":"#757580","color6":"#64697f","color7":"#b8b2a7","color7":"#b8b2a7","color8":"#474543","color9":"#8e6f64","color10":"#849385","color11":"#bdac8c","color12":"#4c5467","color13":"#757580","color14":"#64697f","color15":"#b8b2a7","color15":"#b8b2a7"}} \ No newline at end of file +{"special":{"background":"#2a2725","foreground":"#bdac8c","cursor":"#2b2927"},"colors":{"color0":"#2a2725","color1":"#8e6f64","color2":"#849385","color3":"#bdac8c","color4":"#4c5467","color5":"#757580","color6":"#64697f","color7":"#b8b2a7","color8":"#474543","color9":"#8e6f64","color10":"#849385","color11":"#bdac8c","color12":"#4c5467","color13":"#757580","color14":"#64697f","color15":"#b8b2a7"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-urban.json b/pywal/colorschemes/dark/dkeg-urban.json index 4ec2101..5ac97b3 100644 --- a/pywal/colorschemes/dark/dkeg-urban.json +++ b/pywal/colorschemes/dark/dkeg-urban.json @@ -1 +1 @@ -{"special":{"background":"#312e39","foreground":"#ae835a","cursor":"#33303b"},"colors":{"color0":"#312e39","color1":"#87404f","color2":"#74934e","color3":"#ae835a","color4":"#615772","color5":"#783e57","color6":"#554757","color7":"#c0a79a","color7":"#c0a79a","color8":"#4f4b58","color9":"#87404f","color10":"#74934e","color11":"#ae835a","color12":"#615772","color13":"#783e57","color14":"#554757","color15":"#c0a79a","color15":"#c0a79a"}} \ No newline at end of file +{"special":{"background":"#312e39","foreground":"#ae835a","cursor":"#33303b"},"colors":{"color0":"#312e39","color1":"#87404f","color2":"#74934e","color3":"#ae835a","color4":"#615772","color5":"#783e57","color6":"#554757","color7":"#c0a79a","color8":"#4f4b58","color9":"#87404f","color10":"#74934e","color11":"#ae835a","color12":"#615772","color13":"#783e57","color14":"#554757","color15":"#c0a79a"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-vans.json b/pywal/colorschemes/dark/dkeg-vans.json index d287a21..0bcb6a7 100644 --- a/pywal/colorschemes/dark/dkeg-vans.json +++ b/pywal/colorschemes/dark/dkeg-vans.json @@ -1 +1 @@ -{"special":{"background":"#2b2c33","foreground":"#e8dfcd","cursor":"#303139"},"colors":{"color0":"#2b2c33","color1":"#b16c7f","color2":"#92ab75","color3":"#bdab77","color4":"#485476","color5":"#746081","color6":"#636f7d","color7":"#d9c1a9","color7":"#d9c1a9","color8":"#d9c1a9","color9":"#b16c7f","color10":"#92ab75","color11":"#bdab77","color12":"#485476","color13":"#746081","color14":"#636f7d","color15":"#d9c1a9","color15":"#e9dbce"}} \ No newline at end of file +{"special":{"background":"#2b2c33","foreground":"#e8dfcd","cursor":"#303139"},"colors":{"color0":"#2b2c33","color1":"#b16c7f","color2":"#92ab75","color3":"#bdab77","color4":"#485476","color5":"#746081","color6":"#636f7d","color7":"#d9c1a9","color8":"#d9c1a9","color9":"#b16c7f","color10":"#92ab75","color11":"#bdab77","color12":"#485476","color13":"#746081","color14":"#636f7d","color15":"#e9dbce"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-victory.json b/pywal/colorschemes/dark/dkeg-victory.json index 0a2c7f1..3399587 100644 --- a/pywal/colorschemes/dark/dkeg-victory.json +++ b/pywal/colorschemes/dark/dkeg-victory.json @@ -1 +1 @@ -{"special":{"background":"#2d2d33","foreground":"#a29474","cursor":"#303036"},"colors":{"color0":"#2d2d33","color1":"#9c6647","color2":"#708684","color3":"#a29474","color4":"#697284","color5":"#796a70","color6":"#47676e","color7":"#c4c4b5","color7":"#c4c4b5","color8":"#44444a","color9":"#9c6647","color10":"#708684","color11":"#a29474","color12":"#697284","color13":"#796a70","color14":"#47676e","color15":"#c4c4b5","color15":"#c4c4b5"}} \ No newline at end of file +{"special":{"background":"#2d2d33","foreground":"#a29474","cursor":"#303036"},"colors":{"color0":"#2d2d33","color1":"#9c6647","color2":"#708684","color3":"#a29474","color4":"#697284","color5":"#796a70","color6":"#47676e","color7":"#c4c4b5","color8":"#44444a","color9":"#9c6647","color10":"#708684","color11":"#a29474","color12":"#697284","color13":"#796a70","color14":"#47676e","color15":"#c4c4b5"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-view.json b/pywal/colorschemes/dark/dkeg-view.json index 0e5c7b8..f85fe85 100644 --- a/pywal/colorschemes/dark/dkeg-view.json +++ b/pywal/colorschemes/dark/dkeg-view.json @@ -1 +1 @@ -{"special":{"background":"#2a2d34","foreground":"#86733b","cursor":"#2e3239"},"colors":{"color0":"#2a2d34","color1":"#a2462e","color2":"#5e713d","color3":"#86733b","color4":"#394c5d","color5":"#855646","color6":"#6e727d","color7":"#cababa","color7":"#cababa","color8":"#414550","color9":"#a2462e","color10":"#5e713d","color11":"#86733b","color12":"#394c5d","color13":"#855646","color14":"#6e727d","color15":"#cababa","color15":"#cababa"}} \ No newline at end of file +{"special":{"background":"#2a2d34","foreground":"#86733b","cursor":"#2e3239"},"colors":{"color0":"#2a2d34","color1":"#a2462e","color2":"#5e713d","color3":"#86733b","color4":"#394c5d","color5":"#855646","color6":"#6e727d","color7":"#cababa","color8":"#414550","color9":"#a2462e","color10":"#5e713d","color11":"#86733b","color12":"#394c5d","color13":"#855646","color14":"#6e727d","color15":"#cababa"}} \ No newline at end of file diff --git a/pywal/colorschemes/dark/dkeg-wintry.json b/pywal/colorschemes/dark/dkeg-wintry.json index ea57a71..d652bc3 100644 --- a/pywal/colorschemes/dark/dkeg-wintry.json +++ b/pywal/colorschemes/dark/dkeg-wintry.json @@ -1 +1 @@ -{"special":{"background":"#37273a","foreground":"#b3a67d","cursor":"#c3bec3"},"colors":{"color0":"#37273a","color1":"#9c595c","color2":"#8ba07a","color3":"#b3a67d","color4":"#7B6677","color5":"#83466D","color6":"#899079","color7":"#c3bec3","color7":"#c3bec3","color8":"#5e5261","color9":"#9c595c","color10":"#8ba07a","color11":"#b3a67d","color12":"#7B6677","color13":"#83466D","color14":"#899079","color15":"#c3bec3","color15":"#c3bec3"}} \ No newline at end of file +{"special":{"background":"#37273a","foreground":"#b3a67d","cursor":"#c3bec3"},"colors":{"color0":"#37273a","color1":"#9c595c","color2":"#8ba07a","color3":"#b3a67d","color4":"#7B6677","color5":"#83466D","color6":"#899079","color7":"#c3bec3","color8":"#5e5261","color9":"#9c595c","color10":"#8ba07a","color11":"#b3a67d","color12":"#7B6677","color13":"#83466D","color14":"#899079","color15":"#c3bec3"}} \ No newline at end of file From 70c45f580e4c8223dbf66d53be551d8db2cc2f0a Mon Sep 17 00:00:00 2001 From: black Date: Tue, 10 Sep 2019 05:47:47 +0000 Subject: [PATCH 27/42] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index a6ccef4..0e14f97 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@

Generate and change color-schemes on the fly.

- From 1bd5542beb1d43d49549675c1040167f8874722e Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Tue, 10 Sep 2019 18:09:43 +0200 Subject: [PATCH 28/42] Make wal -R understand the -l flag, add -d flag https://github.com/dylanaraps/pywal/issues/441 --- pywal/__main__.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pywal/__main__.py b/pywal/__main__.py index de992b7..af0770c 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -76,6 +76,9 @@ def get_args(): arg.add_argument("-l", action="store_true", help="Generate a light colorscheme.") + arg.add_argument("-d", action="store_true", + help="Generate a dark colorscheme. Default.") + arg.add_argument("-n", action="store_true", help="Skip setting the wallpaper.") @@ -175,6 +178,17 @@ def parse_args(parser): if args.R: colors_plain = theme.file(os.path.join(CACHE_DIR, "colors.json")) + if args.l: + f = open(os.path.join(CACHE_DIR, "wal")) + cached_wallpaper = f.read() + colors_plain = colors.get(cached_wallpaper, True, args.backend, + sat=args.saturate) + elif args.d: + f = open(os.path.join(CACHE_DIR, "wal")) + cached_wallpaper = f.read() + colors_plain = colors.get(cached_wallpaper, False, args.backend, + sat=args.saturate) + if args.b: args.b = "#%s" % (args.b.strip("#")) colors_plain["special"]["background"] = args.b From f44ca5da87408549a560867811955270615bedd0 Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Tue, 10 Sep 2019 20:31:42 +0200 Subject: [PATCH 29/42] Fix filename --- pywal/__main__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pywal/__main__.py b/pywal/__main__.py index af0770c..cfcafe4 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -179,13 +179,13 @@ def parse_args(parser): colors_plain = theme.file(os.path.join(CACHE_DIR, "colors.json")) if args.l: - f = open(os.path.join(CACHE_DIR, "wal")) - cached_wallpaper = f.read() + wallpaper_cache = open(os.path.join(CACHE_DIR, "wal")) + cached_wallpaper = wallpaper_cache.read() colors_plain = colors.get(cached_wallpaper, True, args.backend, sat=args.saturate) elif args.d: - f = open(os.path.join(CACHE_DIR, "wal")) - cached_wallpaper = f.read() + wallpaper_cache = open(os.path.join(CACHE_DIR, "wal")) + cached_wallpaper = wallpaper_cache.read() colors_plain = colors.get(cached_wallpaper, False, args.backend, sat=args.saturate) From fefcd53fcf1476afce442e207197eef99c5e97aa Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Wed, 11 Sep 2019 09:35:31 +0200 Subject: [PATCH 30/42] Use util.read_file instead of inline file reading --- pywal/__main__.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pywal/__main__.py b/pywal/__main__.py index cfcafe4..cb0523c 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -179,14 +179,12 @@ def parse_args(parser): colors_plain = theme.file(os.path.join(CACHE_DIR, "colors.json")) if args.l: - wallpaper_cache = open(os.path.join(CACHE_DIR, "wal")) - cached_wallpaper = wallpaper_cache.read() - colors_plain = colors.get(cached_wallpaper, True, args.backend, + cached_wallpaper = util.read_file(os.path.join(CACHE_DIR, "wal")) + colors_plain = colors.get(cached_wallpaper[0], True, args.backend, sat=args.saturate) elif args.d: - wallpaper_cache = open(os.path.join(CACHE_DIR, "wal")) - cached_wallpaper = wallpaper_cache.read() - colors_plain = colors.get(cached_wallpaper, False, args.backend, + cached_wallpaper = util.read_file(os.path.join(CACHE_DIR, "wal")) + colors_plain = colors.get(cached_wallpaper[0], False, args.backend, sat=args.saturate) if args.b: From bab56a88a899ac4a96aadbbb0975289046e617df Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Wed, 11 Sep 2019 19:40:34 +0200 Subject: [PATCH 31/42] Use separate flag for last used wallpaper --- pywal/__main__.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pywal/__main__.py b/pywal/__main__.py index cb0523c..0f0f077 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -76,9 +76,6 @@ def get_args(): arg.add_argument("-l", action="store_true", help="Generate a light colorscheme.") - arg.add_argument("-d", action="store_true", - help="Generate a dark colorscheme. Default.") - arg.add_argument("-n", action="store_true", help="Skip setting the wallpaper.") @@ -104,6 +101,9 @@ def get_args(): arg.add_argument("-v", action="store_true", help="Print \"wal\" version.") + arg.add_argument("-w", action="store_true", + help="Use last used wallpaper for color generation.") + arg.add_argument("-e", action="store_true", help="Skip reloading gtk/xrdb/i3/sway/polybar") @@ -141,6 +141,7 @@ def parse_args_exit(parser): if not args.i and \ not args.theme and \ not args.R and \ + not args.w and \ not args.backend: parser.error("No input specified.\n" "--backend, --theme, -i or -R are required.") @@ -178,14 +179,10 @@ def parse_args(parser): if args.R: colors_plain = theme.file(os.path.join(CACHE_DIR, "colors.json")) - if args.l: - cached_wallpaper = util.read_file(os.path.join(CACHE_DIR, "wal")) - colors_plain = colors.get(cached_wallpaper[0], True, args.backend, - sat=args.saturate) - elif args.d: - cached_wallpaper = util.read_file(os.path.join(CACHE_DIR, "wal")) - colors_plain = colors.get(cached_wallpaper[0], False, args.backend, - sat=args.saturate) + if args.w: + cached_wallpaper = util.read_file(os.path.join(CACHE_DIR, "wal")) + colors_plain = colors.get(cached_wallpaper[0], args.l, args.backend, + sat=args.saturate) if args.b: args.b = "#%s" % (args.b.strip("#")) From 609fab9bfbe2deaad4e6689cd71fcc6173239647 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 27 Sep 2019 20:36:04 +0300 Subject: [PATCH 32/42] misc: fix lint --- pywal/backends/colorthief.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pywal/backends/colorthief.py b/pywal/backends/colorthief.py index bcb9e39..aae5bd0 100644 --- a/pywal/backends/colorthief.py +++ b/pywal/backends/colorthief.py @@ -25,7 +25,7 @@ def gen_colors(img): if len(raw_colors) >= 8: break - elif i == 10: + if i == 10: logging.error("ColorThief couldn't generate a suitable palette.") sys.exit(1) From 56c60ca2e6c66da452c29515065701e6d272f756 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 27 Sep 2019 20:36:52 +0300 Subject: [PATCH 33/42] misc: fix lint --- pywal/backends/wal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pywal/backends/wal.py b/pywal/backends/wal.py index a75fdc5..f05db41 100644 --- a/pywal/backends/wal.py +++ b/pywal/backends/wal.py @@ -43,7 +43,7 @@ def gen_colors(img): if len(raw_colors) > 16: break - elif i == 19: + if i == 19: logging.error("Imagemagick couldn't generate a suitable palette.") sys.exit(1) From 445b8fcbb6ce5225089afe6909a96d0c3d901889 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 27 Sep 2019 20:37:23 +0300 Subject: [PATCH 34/42] misc: fix lint --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8345388..1df1801 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,12 @@ """wal - setup.py""" import setuptools +import sys try: import pywal except ImportError: print("error: pywal requires Python 3.5 or greater.") - quit(1) + sys.exit(1) LONG_DESC = open('README.md').read() VERSION = pywal.__version__ From 030dfe015df2ccf1862e5d846d1585c6e3f8449f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 27 Sep 2019 20:40:28 +0300 Subject: [PATCH 35/42] misc: fix lint --- pywal/reload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pywal/reload.py b/pywal/reload.py index 13e0ca8..e43d635 100644 --- a/pywal/reload.py +++ b/pywal/reload.py @@ -26,7 +26,7 @@ def xrdb(xrdb_files=None): if shutil.which("xrdb") and OS != "Darwin": for file in xrdb_files: - subprocess.run(["xrdb", "-merge", "-quiet", file]) + subprocess.Popen(["xrdb", "-merge", "-quiet", file]) def gtk(): From a84b5ec2ab5c5b2dca1680b43e1dac2040f11a72 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 27 Sep 2019 20:44:51 +0300 Subject: [PATCH 36/42] misc: fix lint --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1df1801..2324707 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ """wal - setup.py""" -import setuptools import sys +import setuptools try: import pywal From 3bc9f104518c4b480591c16404a4c04ca4801a7a Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Tue, 1 Oct 2019 10:37:07 +0200 Subject: [PATCH 37/42] Save used theme in CACHE_DIR --- pywal/theme.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pywal/theme.py b/pywal/theme.py index fcd1dd1..423a4c5 100644 --- a/pywal/theme.py +++ b/pywal/theme.py @@ -6,7 +6,7 @@ import os import random import sys -from .settings import CONF_DIR, MODULE_DIR +from .settings import CACHE_DIR, CONF_DIR, MODULE_DIR from . import util @@ -116,6 +116,7 @@ def file(input_file, light=False): if os.path.isfile(theme_file): logging.info("Set theme to \033[1;37m%s\033[0m.", os.path.basename(theme_file)) + util.save_file(os.path.basename(theme_file), os.path.join(CACHE_DIR, "theme")) return parse(theme_file) logging.error("No %s colorscheme file found.", bri) From 3476989e6bd7a0526ff4dc4d592c8327a4c64f50 Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Tue, 1 Oct 2019 10:58:39 +0200 Subject: [PATCH 38/42] Print (last used) next to last used theme --- pywal/theme.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pywal/theme.py b/pywal/theme.py index 423a4c5..5c973da 100644 --- a/pywal/theme.py +++ b/pywal/theme.py @@ -19,12 +19,16 @@ def list_out(): user_themes = [theme.name.replace(".json", "") for theme in list_themes_user()] + last_used_theme = util.read_file(os.path.join(CACHE_DIR, + "last_used_theme"))[0].replace(".json", "") + if user_themes: print("\033[1;32mUser Themes\033[0m:") print(" -", "\n - ".join(sorted(user_themes))) print("\033[1;32mDark Themes\033[0m:") print(" -", "\n - ".join(sorted(dark_themes))) + print(" -", "\n - ".join(t + " (last used)" if t == last_used_theme else t for t in sorted(dark_themes))) print("\033[1;32mLight Themes\033[0m:") print(" -", "\n - ".join(sorted(ligh_themes))) @@ -116,7 +120,8 @@ def file(input_file, light=False): if os.path.isfile(theme_file): logging.info("Set theme to \033[1;37m%s\033[0m.", os.path.basename(theme_file)) - util.save_file(os.path.basename(theme_file), os.path.join(CACHE_DIR, "theme")) + util.save_file(os.path.basename(theme_file), os.path.join(CACHE_DIR, + "last_used_theme")) return parse(theme_file) logging.error("No %s colorscheme file found.", bri) From fe700cb77aab6df55de05704082576b19d7652b5 Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Tue, 1 Oct 2019 11:00:42 +0200 Subject: [PATCH 39/42] Do for all types of themes (dark, light, user) --- pywal/theme.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pywal/theme.py b/pywal/theme.py index 5c973da..04e4b2b 100644 --- a/pywal/theme.py +++ b/pywal/theme.py @@ -24,14 +24,16 @@ def list_out(): if user_themes: print("\033[1;32mUser Themes\033[0m:") - print(" -", "\n - ".join(sorted(user_themes))) + print(" -", "\n - ".join(t + " (last used)" if t == last_used_theme else t + for t in sorted(user_themes))) print("\033[1;32mDark Themes\033[0m:") - print(" -", "\n - ".join(sorted(dark_themes))) - print(" -", "\n - ".join(t + " (last used)" if t == last_used_theme else t for t in sorted(dark_themes))) + print(" -", "\n - ".join(t + " (last used)" if t == last_used_theme else t + for t in sorted(dark_themes))) print("\033[1;32mLight Themes\033[0m:") - print(" -", "\n - ".join(sorted(ligh_themes))) + print(" -", "\n - ".join(t + " (last used)" if t == last_used_theme else t + for t in sorted(ligh_themes))) print("\033[1;32mExtra\033[0m:") print(" - random (select a random dark theme)") From 0c32f4e9a920938120297a397c33ca3c655f697f Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Tue, 1 Oct 2019 11:18:37 +0200 Subject: [PATCH 40/42] Fix pylint --- pywal/theme.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pywal/theme.py b/pywal/theme.py index 04e4b2b..c053f18 100644 --- a/pywal/theme.py +++ b/pywal/theme.py @@ -19,21 +19,22 @@ def list_out(): user_themes = [theme.name.replace(".json", "") for theme in list_themes_user()] - last_used_theme = util.read_file(os.path.join(CACHE_DIR, - "last_used_theme"))[0].replace(".json", "") + + last_used_theme = util.read_file(os.path.join( + CACHE_DIR, "last_used_theme"))[0].replace(".json", "") if user_themes: print("\033[1;32mUser Themes\033[0m:") print(" -", "\n - ".join(t + " (last used)" if t == last_used_theme else t - for t in sorted(user_themes))) + for t in sorted(user_themes))) print("\033[1;32mDark Themes\033[0m:") print(" -", "\n - ".join(t + " (last used)" if t == last_used_theme else t - for t in sorted(dark_themes))) + for t in sorted(dark_themes))) print("\033[1;32mLight Themes\033[0m:") print(" -", "\n - ".join(t + " (last used)" if t == last_used_theme else t - for t in sorted(ligh_themes))) + for t in sorted(ligh_themes))) print("\033[1;32mExtra\033[0m:") print(" - random (select a random dark theme)") @@ -122,8 +123,8 @@ def file(input_file, light=False): if os.path.isfile(theme_file): logging.info("Set theme to \033[1;37m%s\033[0m.", os.path.basename(theme_file)) - util.save_file(os.path.basename(theme_file), os.path.join(CACHE_DIR, - "last_used_theme")) + util.save_file(os.path.basename(theme_file), + os.path.join(CACHE_DIR, "last_used_theme")) return parse(theme_file) logging.error("No %s colorscheme file found.", bri) From b6a11f6338daabd33ffbfadc3a4f15e7080214eb Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Tue, 1 Oct 2019 11:54:42 +0200 Subject: [PATCH 41/42] Fix line length for pylint --- pywal/theme.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pywal/theme.py b/pywal/theme.py index c053f18..2b14600 100644 --- a/pywal/theme.py +++ b/pywal/theme.py @@ -19,14 +19,13 @@ def list_out(): user_themes = [theme.name.replace(".json", "") for theme in list_themes_user()] - last_used_theme = util.read_file(os.path.join( CACHE_DIR, "last_used_theme"))[0].replace(".json", "") if user_themes: print("\033[1;32mUser Themes\033[0m:") - print(" -", "\n - ".join(t + " (last used)" if t == last_used_theme else t - for t in sorted(user_themes))) + print(" -", "\n - ".join(t + " (last used)" if t == last_used_theme + else t for t in sorted(user_themes))) print("\033[1;32mDark Themes\033[0m:") print(" -", "\n - ".join(t + " (last used)" if t == last_used_theme else t From 4cc2dda585a6e7f6fa8f801c2be42064204c71d8 Mon Sep 17 00:00:00 2001 From: Lorenz Leitner Date: Tue, 1 Oct 2019 16:54:53 +0200 Subject: [PATCH 42/42] Fix FileNotFoundError if theme has never been set --- pywal/theme.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pywal/theme.py b/pywal/theme.py index 2b14600..706ed31 100644 --- a/pywal/theme.py +++ b/pywal/theme.py @@ -19,8 +19,11 @@ def list_out(): user_themes = [theme.name.replace(".json", "") for theme in list_themes_user()] - last_used_theme = util.read_file(os.path.join( - CACHE_DIR, "last_used_theme"))[0].replace(".json", "") + try: + last_used_theme = util.read_file(os.path.join( + CACHE_DIR, "last_used_theme"))[0].replace(".json", "") + except FileNotFoundError: + last_used_theme = "" if user_themes: print("\033[1;32mUser Themes\033[0m:")