diff --git a/.gitmodules b/.gitmodules
index 9185de5..5fb31a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -94,3 +94,6 @@
 [submodule "pack/general/start/formatter.nvim"]
 	path = pack/general/start/formatter.nvim
 	url = https://github.com/mhartington/formatter.nvim
+[submodule "pack/general/start/firenvim"]
+	path = pack/general/opt/firenvim
+	url = https://github.com/glacambre/firenvim
diff --git a/init.lua b/init.lua
index 6f55eab..1701792 100644
--- a/init.lua
+++ b/init.lua
@@ -457,3 +457,8 @@ require("dap-go").setup()
 
 ---- web-devicons
 require("nvim-web-devicons").setup()
+
+---- firenvim
+if g.started_by_firenvim then
+	vim.cmd("packadd firenvim")
+end
diff --git a/pack/general/opt/firenvim b/pack/general/opt/firenvim
new file mode 160000
index 0000000..3c4babf
--- /dev/null
+++ b/pack/general/opt/firenvim
@@ -0,0 +1 @@
+Subproject commit 3c4babfa0a561d1dc3640a902e67ca0b8af70927