From 1f86472c67cde73f31126b735e377c40faaf4b08 Mon Sep 17 00:00:00 2001 From: Douglas Muratore Date: Thu, 15 Aug 2024 22:51:00 -0300 Subject: [PATCH 1/5] add iceberg-zed-theme --- .gitmodules | 4 ++++ extensions.toml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/.gitmodules b/.gitmodules index 5f0d622e1..0ec3fd8c3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1029,3 +1029,7 @@ [submodule "extensions/zedwaita"] path = extensions/zedwaita url = https://github.com/someone13574/zed-adwaita-theme.git + +[submodule "extensions/iceberg-zed-theme"] + path = extensions/iceberg-zed-theme + url = https://github.com/EFDos/iceberg-zed-theme diff --git a/extensions.toml b/extensions.toml index f6139ed0c..135140d99 100644 --- a/extensions.toml +++ b/extensions.toml @@ -1172,3 +1172,8 @@ version = "0.0.4" submodule = "extensions/zed" path = "extensions/zig" version = "0.2.0" + +[iceberg-zed-theme] +submodule = "extensions/iceberg-zed-theme" +path = "extensions/iceberg-zed-theme" +version = "0.2.10" From 52bf6f43cdebe289d1b32b75fcb744febb4c7ace Mon Sep 17 00:00:00 2001 From: Douglas Muratore Date: Thu, 15 Aug 2024 23:00:54 -0300 Subject: [PATCH 2/5] sort extensions --- .gitmodules | 8 ++++---- extensions.toml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0ec3fd8c3..caec79da4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -382,6 +382,10 @@ path = extensions/http url = https://github.com/tie304/zed-http.git +[submodule "extensions/iceberg-zed-theme"] + path = extensions/iceberg-zed-theme + url = https://github.com/EFDos/iceberg-zed-theme + [submodule "extensions/indigo"] path = extensions/indigo url = https://github.com/p3rception/Indigo-zed.git @@ -1029,7 +1033,3 @@ [submodule "extensions/zedwaita"] path = extensions/zedwaita url = https://github.com/someone13574/zed-adwaita-theme.git - -[submodule "extensions/iceberg-zed-theme"] - path = extensions/iceberg-zed-theme - url = https://github.com/EFDos/iceberg-zed-theme diff --git a/extensions.toml b/extensions.toml index 135140d99..5500059cb 100644 --- a/extensions.toml +++ b/extensions.toml @@ -448,6 +448,11 @@ version = "0.1.2" submodule = "extensions/http" version = "0.0.1" +[iceberg-zed-theme] +submodule = "extensions/iceberg-zed-theme" +path = "extensions/iceberg-zed-theme" +version = "0.2.10" + [indigo] submodule = "extensions/indigo" version = "0.1.2" @@ -1172,8 +1177,3 @@ version = "0.0.4" submodule = "extensions/zed" path = "extensions/zig" version = "0.2.0" - -[iceberg-zed-theme] -submodule = "extensions/iceberg-zed-theme" -path = "extensions/iceberg-zed-theme" -version = "0.2.10" From 448de72bba70bbfbca409c8089567ff508740d0f Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Tue, 20 Aug 2024 12:30:43 -0400 Subject: [PATCH 3/5] Remove old submodule --- .gitmodules | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index caec79da4..5f0d622e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -382,10 +382,6 @@ path = extensions/http url = https://github.com/tie304/zed-http.git -[submodule "extensions/iceberg-zed-theme"] - path = extensions/iceberg-zed-theme - url = https://github.com/EFDos/iceberg-zed-theme - [submodule "extensions/indigo"] path = extensions/indigo url = https://github.com/p3rception/Indigo-zed.git From 2d041ff06dac0f66ac22f0c7f63746557d1391b0 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Tue, 20 Aug 2024 12:31:33 -0400 Subject: [PATCH 4/5] Re-add submodule --- .gitmodules | 4 ++++ extensions.toml | 5 ++--- extensions/iceberg | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) create mode 160000 extensions/iceberg diff --git a/.gitmodules b/.gitmodules index 5f0d622e1..82b5c4e45 100644 --- a/.gitmodules +++ b/.gitmodules @@ -382,6 +382,10 @@ path = extensions/http url = https://github.com/tie304/zed-http.git +[submodule "extensions/iceberg"] + path = extensions/iceberg + url = https://github.com/EFDos/iceberg-zed-theme.git + [submodule "extensions/indigo"] path = extensions/indigo url = https://github.com/p3rception/Indigo-zed.git diff --git a/extensions.toml b/extensions.toml index 662af409d..81d796b26 100644 --- a/extensions.toml +++ b/extensions.toml @@ -448,9 +448,8 @@ version = "0.1.2" submodule = "extensions/http" version = "0.0.1" -[iceberg-zed-theme] -submodule = "extensions/iceberg-zed-theme" -path = "extensions/iceberg-zed-theme" +[iceberg] +submodule = "extensions/iceberg" version = "0.2.10" [indigo] diff --git a/extensions/iceberg b/extensions/iceberg new file mode 160000 index 000000000..4b6549813 --- /dev/null +++ b/extensions/iceberg @@ -0,0 +1 @@ +Subproject commit 4b654981389eb5f64442e6ef6b606bb3273a7c5d From eb499b93134c7433e983cb97421a6fdd1a0ca556 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 26 Aug 2024 11:20:03 -0400 Subject: [PATCH 5/5] Bump submodule --- extensions/iceberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/iceberg b/extensions/iceberg index 4b6549813..e748af4e7 160000 --- a/extensions/iceberg +++ b/extensions/iceberg @@ -1 +1 @@ -Subproject commit 4b654981389eb5f64442e6ef6b606bb3273a7c5d +Subproject commit e748af4e74c46db7cf5f7434a6258c962f60586e