Merge branch 'master' of github.com:ChristianChiarulli/LunarVim into stable

1 files changed, 9 insertions, 2 deletions

diff --git a/lua/default-config.lua b/lua/default-config.lua
index fcf33799..9d785a4d 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -78,7 +78,6 @@ O = {
     symbol_outline = { active = false },
     debug = { active = false },
     dap_install = { active = false },
-    lazygit = { active = false },
     lush = { active = false },
     diffview = { active = false },
     floatterm = { active = false },
@@ -86,7 +85,9 @@ O = {
     sanegx = { active = false },
   },
 
-  custom_plugins = {
+  user_which_key = {},
+
+  user_plugins = {
     -- use lv-config.lua for this not put here
   },
 
@@ -191,7 +192,13 @@ O = {
       },
     },
     svelte = {},
+
     php = {
+      format = {
+        format = {
+          default = "psr12",
+        },
+      },
       environment = {
         php_version = "7.4",
       },