From 48cdef38ead667698939fa2077febceb91d38be4 Mon Sep 17 00:00:00 2001
From: Phuntsok Drak-pa <phundrak@phundrak.fr>
Date: Sat, 21 Sep 2019 16:00:03 +0200
Subject: [PATCH] fixed some submodules madness

---
 .gitmodules                         | 17 ++++++++++-------
 config.fish                         |  2 +-
 spacemacs-layers/conlang-layer      |  1 -
 spacemacs-layers/conlanging         |  1 +
 spacemacs-layers/{w3m-layer => w3m} |  0
 tmux                                |  2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)
 delete mode 160000 spacemacs-layers/conlang-layer
 create mode 160000 spacemacs-layers/conlanging
 rename spacemacs-layers/{w3m-layer => w3m} (100%)

diff --git a/.gitmodules b/.gitmodules
index f646a68..41e12c6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,12 @@
-[submodule "spacemacs-layers/w3m-layer"]
-	path = spacemacs-layers/w3m-layer
-	url = git@github.com:venmos/w3m-layer.git
-[submodule "spacemacs-layers/conlang-layer"]
-	path = spacemacs-layers/conlang-layer
-	url = git@labs.phundrak.fr:phundrak/conlang-layer.git
+[submodule ".tmux"]
+	path = .tmux
+	url = https://github.com/gpakosz/.tmux.git
 [submodule "tmux"]
 	path = tmux
-	url = git@github.com:gpakosz/.tmux.git
+	url = https://github.com/gpakosz/.tmux.git
+[submodule "spacemacs-layers/conlanging"]
+	path = spacemacs-layers/conlanging
+	url = https://labs.phundrak.fr/phundrak/conlang-layer.git
+[submodule "spacemacs-layers/w3m"]
+	path = spacemacs-layers/w3m
+	url = https://github.com/venmos/w3m-layer.git
diff --git a/config.fish b/config.fish
index 306f7ba..6c20f44 100644
--- a/config.fish
+++ b/config.fish
@@ -18,4 +18,4 @@ if test "$TERM" = "dumb"
 end
 
 set -gx PATH $HOME/go/bin $HOME/.cargo/bin $HOME/.local/bin $HOME/.gem/ruby/2.6.0/bin $PATH
-set -gx PKG_CONFIG_PATH /usr/local/lib/pkgconfig/
+set -gx PKG_CONFIG_PATH /usr/local/lib/pkgconfig/ $PKG_CONFIG_PATH
diff --git a/spacemacs-layers/conlang-layer b/spacemacs-layers/conlang-layer
deleted file mode 160000
index 41fa05d..0000000
--- a/spacemacs-layers/conlang-layer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 41fa05d78259a6e2539c9a2e0ff174c64a58e62c
diff --git a/spacemacs-layers/conlanging b/spacemacs-layers/conlanging
new file mode 160000
index 0000000..bf43225
--- /dev/null
+++ b/spacemacs-layers/conlanging
@@ -0,0 +1 @@
+Subproject commit bf432256d4b2d2516f97689e265020d3f4a810a9
diff --git a/spacemacs-layers/w3m-layer b/spacemacs-layers/w3m
similarity index 100%
rename from spacemacs-layers/w3m-layer
rename to spacemacs-layers/w3m
diff --git a/tmux b/tmux
index 96007b3..01c91ba 160000
--- a/tmux
+++ b/tmux
@@ -1 +1 @@
-Subproject commit 96007b3464a429527defde1924198cf219808f3d
+Subproject commit 01c91ba5231eb2e7b32cc2f47ac9022efae87962