Merge pull request #239 from zellij-org/x-colors

X colors
zellij-org · May 2, 2021 · 98d9eac · 98d9eac
2 parents 099861f + ce1f81b
commit 98d9eac
Show file tree

Hide file tree

Showing 23 changed files with 686 additions and 233 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,7 +36,10 @@ lazy_static = "1.4.0"
 wasmer = "1.0.0"
 wasmer-wasi = "1.0.0"
 interprocess = "1.0.1"
+xrdb = "0.1.1"
+colors-transform = "0.2.5"
 zellij-tile = { path = "zellij-tile/", version = "1.1.0" }
+zellij-tile-extra = { path = "zellij-tile-extra/", version="1.0.0" }
 
 [dependencies.async-std]
 version = "1.3.0"
@@ -52,6 +55,7 @@ structopt = "0.3"
 [workspace]
 members = [
     "zellij-tile",
+    "zellij-tile-extra",
     "default-plugins/status-bar",
     "default-plugins/strider",
     "default-plugins/tab-bar",

diff --git a/Makefile.toml b/Makefile.toml
@@ -108,7 +108,7 @@ args = ["install", "cross"]
 [tasks.publish]
 clear = true
 workspace = false
-dependencies = ["build-plugins-release", "wasm-opt-plugins", "build-release", "publish-zellij-tile"]
+dependencies = ["build-plugins-release", "wasm-opt-plugins", "build-release", "publish-zellij-tile", "publish-zellij-tile-extra"]
 run_task = "publish-zellij"
 
 [tasks.publish-zellij-tile]
@@ -117,6 +117,12 @@ cwd = "zellij-tile"
 command = "cargo"
 args = ["publish"]
 
+[tasks.publish-zellij-tile-extra]
+ignore_errors = true
+cwd = "zellij-tile-extra"
+command = "cargo"
+args = ["publish"]
+
 [tasks.publish-zellij]
 command = "cargo"
 args = ["publish"]
diff --git a/default-plugins/status-bar/Cargo.toml b/default-plugins/status-bar/Cargo.toml
@@ -9,3 +9,4 @@ license = "MIT"
 colored = "2"
 ansi_term = "0.12"
 zellij-tile = { path = "../../zellij-tile" }
+zellij-tile-extra = { path = "../../zellij-tile-extra" }