From 7d59ae5e85f474be212d16de43d7fa30361a67a2 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Mon, 8 Jan 2018 18:31:58 +1100
Subject: [PATCH] gtk: Added oomox support.

---
 pywal/reload.py                | 10 +++++-----
 pywal/templates/colors-gtk2.rc | 19 -------------------
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 pywal/templates/colors-gtk2.rc

diff --git a/pywal/reload.py b/pywal/reload.py
index bbf1932..90afb1c 100644
--- a/pywal/reload.py
+++ b/pywal/reload.py
@@ -31,11 +31,11 @@ def xrdb(xrdb_files=None):
 
 def gtk():
     """Move gtkrc files to the correct location."""
-    theme_path = os.path.join(HOME, ".themes", "Flatabulous-wal")
-    gtk2_file = os.path.join(CACHE_DIR, "colors-gtk2.rc")
+    oomox_file = os.path.join(CACHE_DIR, "colors-oomox")
 
-    if os.path.isdir(theme_path):
-        shutil.copy(gtk2_file, os.path.join(theme_path, "gtk-2.0"))
+    if shutil.which("oomox-cli"):
+        print("reload: Waiting for oomox...")
+        subprocess.run(["oomox-cli", oomox_file], stdout=subprocess.DEVNULL)
 
     # Here we call a Python 2 script to reload the GTK themes.
     # This is done because the Python 3 GTK/Gdk libraries don't
@@ -79,8 +79,8 @@ def colors(cache_dir=CACHE_DIR):
 
 def env(xrdb_file=None):
     """Reload environment."""
-    gtk()
     xrdb(xrdb_file)
+    gtk()
     i3()
     sway()
     polybar()
diff --git a/pywal/templates/colors-gtk2.rc b/pywal/templates/colors-gtk2.rc
deleted file mode 100644
index c4c69b0..0000000
--- a/pywal/templates/colors-gtk2.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-gtk-color-scheme = "background: {background}"
-gtk-color-scheme = "foreground: {foreground}"
-
-gtk-color-scheme = "color0: {color0}"
-gtk-color-scheme = "color1: {color1}"
-gtk-color-scheme = "color2: {color2}"
-gtk-color-scheme = "color3: {color3}"
-gtk-color-scheme = "color4: {color4}"
-gtk-color-scheme = "color5: {color5}"
-gtk-color-scheme = "color6: {color6}"
-gtk-color-scheme = "color7: {color7}"
-gtk-color-scheme = "color8: {color8}"
-gtk-color-scheme = "color9: {color9}"
-gtk-color-scheme = "color10: {color10}"
-gtk-color-scheme = "color11: {color11}"
-gtk-color-scheme = "color12: {color12}"
-gtk-color-scheme = "color13: {color13}"
-gtk-color-scheme = "color14: {color14}"
-gtk-color-scheme = "color15: {color15}"