summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Araps <dylan.araps@gmail.com>2018-01-01 08:19:57 +1100
committerDylan Araps <dylan.araps@gmail.com>2018-01-01 08:19:57 +1100
commitea7320c4b7047171c4ec55f8e497d7d51464c6dc (patch)
tree4749a3fedfe09b1d0e8fa9013dd6a67664708cd8
parente59c7f866e64073a55cfcae893c6f8222911d590 (diff)
reload: Fix rofi bug.
-rw-r--r--pywal/reload.py2
-rw-r--r--pywal/templates/colors-rofi.Xresources15
2 files changed, 6 insertions, 11 deletions
diff --git a/pywal/reload.py b/pywal/reload.py
index 32fece3..93ef538 100644
--- a/pywal/reload.py
+++ b/pywal/reload.py
@@ -17,7 +17,7 @@ def xrdb(xrdb_files=None):
os.path.join(CACHE_DIR, "colors-rofi.Xresources")]
if shutil.which("xrdb") and OS != "Darwin":
- subprocess.Popen(["xrdb", "-merge", *xrdb_files],
+ subprocess.Popen(["xrdb", "-merge", "-nocpp", *xrdb_files],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL).wait()
diff --git a/pywal/templates/colors-rofi.Xresources b/pywal/templates/colors-rofi.Xresources
index 3bf3e87..191c894 100644
--- a/pywal/templates/colors-rofi.Xresources
+++ b/pywal/templates/colors-rofi.Xresources
@@ -1,10 +1,5 @@
-#define BG #FF{background.strip}
-#define HI #FF{color10.strip}
-#define FG {foreground}
-#define TX {background}
-
-! State: bg, fg, bg2, hlbg, hlfg
-rofi.color-normal: BG, FG, BG, HI, TX
-rofi.color-active: BG, FG, BG, HI, TX
-rofi.color-urgent: BG, HI, BG, HI, FG
-rofi.color-window: BG, BG, BG
+! Rofi
+rofi.color-normal: {background}, {foreground}, {background}, {color10}, {background}
+rofi.color-active: {background}, {foreground}, {background}, {color10}, {background}
+rofi.color-urgent: {background}, {color10}, {background}, {color10}, {foreground}
+rofi.color-window: {background}, {background}, {background}