move things

cosmic-utils · Nov 4, 2024 · 48a1e25 · 48a1e25
1 parent caa1c0c
commit 48a1e25
Show file tree

Hide file tree

Showing 42 changed files with 18 additions and 6,048 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,13 +3,11 @@ members = [
     "configurator",
     "configurator_schema",
     "configurator_utils",
-    "zconf2",
-    # "figment_schemars_bridge",
-    # "zconf",
-    # "zconf_derive",
-    # "zconf_derive_impl",
-    # "vexpe",
-    # "vtesting",
+    "zconf/zconf2",
+    # "zconf/figment_schemars_bridge",
+    # "zconf/zconf",
+    # "zconf/zconf_derive",
+    # "zconf/zconf_derive_impl",
 ]
 resolver = "2"
 
@@ -28,8 +26,8 @@ unused_imports = "allow"
 configurator_schema = { path = "configurator_schema" }
 configurator_utils = { path = "configurator_utils" }
 figment_schemars_bridge = { path = "figment_schemars_bridge" }
-zconf = { path = "zconf" }
-zconf2 = { path = "zconf2" }
+# zconf = { path = "zconf/zconf" }
+zconf2 = { path = "zconf/zconf2" }
 
 derive_more = { version = "1", features = ["unwrap"] }
 ron = "0.8"

diff --git a/README.md b/README.md
@@ -14,8 +14,6 @@ Currently, only 2 crates are relevant
 - configurator: the APP
 - configurator_schema: the crate client can use to generate a JSON schema that respect the [spec](./SPEC.md)
 
-zconf\* are just alternative to [cosmic-config](https://github.com/pop-os/libcosmic/tree/master/cosmic-config).
-
 # MVP todo
 
 - [x] Plug the config system of COSMIC

diff --git a/DEV.md → dev/DEV.md b/DEV.md → dev/DEV.md
diff --git a/NOTE.md → dev/NOTE.md b/NOTE.md → dev/NOTE.md
diff --git a/TODO.md → dev/TODO.md b/TODO.md → dev/TODO.md
diff --git a/vexpe/Cargo.toml b/vexpe/Cargo.toml
diff --git a/vexpe/config.json b/vexpe/config.json
diff --git a/vexpe/config2.json b/vexpe/config2.json
diff --git a/vexpe/merge1.json b/vexpe/merge1.json
diff --git a/vexpe/merge2.json b/vexpe/merge2.json
diff --git a/vexpe/path b/vexpe/path
diff --git a/vexpe/schema.json b/vexpe/schema.json
diff --git a/vexpe/src/expe_serde1.rs b/vexpe/src/expe_serde1.rs
diff --git a/vexpe/src/expe_serde2.rs b/vexpe/src/expe_serde2.rs