Merge branch 'rolling'

3 files changed, 20 insertions, 29 deletions

diff --git a/lua/lvim/core/autocmds.lua b/lua/lvim/core/autocmds.lua
index 804d7790..e10a42db 100644
--- a/lua/lvim/core/autocmds.lua
+++ b/lua/lvim/core/autocmds.lua
@@ -34,14 +34,7 @@ function M.load_augroups()
         "setlocal formatoptions-=c formatoptions-=r formatoptions-=o",
       },
     },
-    _filetypechanges = {
-      { "BufWinEnter", ".tf", "setlocal filetype=terraform" },
-      { "BufRead", "*.tf", "setlocal filetype=terraform" },
-      { "BufNewFile", "*.tf", "setlocal filetype=terraform" },
-      { "BufWinEnter", ".zsh", "setlocal filetype=sh" },
-      { "BufRead", "*.zsh", "setlocal filetype=sh" },
-      { "BufNewFile", "*.zsh", "setlocal filetype=sh" },
-    },
+    _filetypechanges = {},
     _git = {
       { "FileType", "gitcommit", "setlocal wrap" },
       { "FileType", "gitcommit", "setlocal spell" },
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index 52ad1c01..853869b1 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -5,24 +5,24 @@ local commit = {
   cmp_nvim_lsp = "b4251f0fca1daeb6db5d60a23ca81507acf858c2",
   cmp_path = "4d58224e315426e5ac4c5b218ca86cab85f80c79",
   comment = "90df2f87c0b17193d073d1f72cea2e528e5b162d",
-  dapinstall = "dd09e9dd3a6e29f02ac171515b8a089fb82bb425",
+  dapinstall = "568d946a99edb6780912cb39ca68c368516cd853",
   dashboard_nvim = "d82ddae95fd4dc4c3b7bbe87f09b1840fbf20ecb",
   fixcursorhold = "0e4e22d21975da60b0fd2d302285b3b603f9f71e",
   friendly_snippets = "9f04462bcabfd108341a6e47ed742b09a6a5b975",
-  gitsigns = "c18fc65c77abf95ac2e7783b9e7455a7a2fab26c",
+  gitsigns = "7aad5257fa043b9acf3d40ae064a1685003254da",
   lua_dev = "03a44ec6a54b0a025a633978e8541584a02e46d9",
-  lualine = "fd8fa5ddd823e15721ddec560ea61e7372e746a7",
-  luasnip = "ed0140696fa99ea072bc485c87d22a396c477db3",
-  nlsp_settings = "97125eeb68a412f11885dffe5fdcc3a26d36c58d",
-  null_ls = "48ac5bcd4d766b371d91024d10c7c83fb909e388",
-  nvim_autopairs = "5348e4a778ebdf42126a54fb5a933a98612df6cb",
-  nvim_cmp = "9f6d2b42253dda8db950ab38795978e5420a93aa",
-  nvim_dap = "3f1514d020f9d73a458ac04f42d27e5b284c0e48",
-  nvim_lsp_installer = "2e81b1d86f90c8a05d7f875599818612bd68e1a7",
-  nvim_lspconfig = "c7081e00fa8100ee099c16e375f3e5e838cbf1db",
+  lualine = "bc5c2f5658821f98e55013eb3bec9d540c420470",
+  luasnip = "79662d8bb61bbee6af88bf559d9ed41c28eb5b88",
+  nlsp_settings = "1d74d46627204bb9bc32787b6d1360874ce9ae1d",
+  null_ls = "288c4582f62f04944412acaed098fc16a1818464",
+  nvim_autopairs = "c027bbb7eb417ad0be7d5263b66c1638e971e36b",
+  nvim_cmp = "ce0a3581e0fa6e3072bf06a97919d3e214ff00e6",
+  nvim_dap = "3499eb4368fa5835de761b4f6cd53f7bf0bd02f7",
+  nvim_lsp_installer = "a744a2a1c7fb9830b156a57a1327a6593f9b5bf8",
+  nvim_lspconfig = "2c70b7b0095b4bbe55aaf0dc27a2581d1cafe491",
   nvim_notify = "15f52efacd169ea26b0f4070451d3ea53f98cd5a",
   nvim_tree = "0a2f6b0b6ba558a88c77a6b262af647760e6eca8",
-  nvim_treesitter = "a7c0c1764b0b583d0597108dd7d48bc5c0f98c81",
+  nvim_treesitter = "ed6143940c37c5c18625d46c071563a3b4338e72",
   nvim_ts_context_commentstring = "097df33c9ef5bbd3828105e4bee99965b758dc3f",
   nvim_web_devicons = "ac71ca88b1136e1ecb2aefef4948130f31aa40d1",
   packer = "851c62c5ecd3b5adc91665feda8f977e104162a5",
@@ -30,10 +30,10 @@ local commit = {
   popup = "b7404d35d5d3548a82149238289fa71f7f6de4ac",
   project = "71d0e23dcfc43cfd6bb2a97dc5a7de1ab47a6538",
   structlog = "6f1403a192791ff1fa7ac845a73de9e860f781f1",
-  telescope = "f06dd06bb1143caa779e492ca37e5f985f0c6157",
+  telescope = "015a35626d5a293dc9c19dc2bb301f25850961f6",
   telescope_fzf_native = "b8662b076175e75e6497c59f3e2799b879d7b954",
   toggleterm = "463843d1ba0288eedaf834872c3eca114d45bddf",
-  which_key = "312c386ee0eafc925c27869d2be9c11ebdb807eb",
+  which_key = "387fd676d3f9b419d38890820f6e262dc0fadb46",
 }
 
 return {
@@ -177,10 +177,8 @@ return {
 
   -- Whichkey
   {
-    -- "folke/which-key.nvim",
-    -- commit = commit.which_key,
-    "zeertzjq/which-key.nvim",
-    branch = "patch-1",
+    "folke/which-key.nvim",
+    commit = commit.which_key,
     config = function()
       require("lvim.core.which-key").setup()
     end,
diff --git a/utils/installer/install_bin.sh b/utils/installer/install_bin.sh
index 4c649b44..cda02473 100755
--- a/utils/installer/install_bin.sh
+++ b/utils/installer/install_bin.sh
@@ -24,9 +24,9 @@ function setup_shim() {
 
   cp "$src" "$dst"
 
-  sed -e s"@RUNTIME_DIR_VAR@\"${LUNARVIM_RUNTIME_DIR}\"@"g \
-    -e s"@CONFIG_DIR_VAR@\"${LUNARVIM_CONFIG_DIR}\"@"g \
-    -e s"@CACHE_DIR_VAR@\"${LUNARVIM_CACHE_DIR}\"@"g "$src" \
+  sed -e s"#RUNTIME_DIR_VAR#\"${LUNARVIM_RUNTIME_DIR}\"#"g \
+    -e s"#CONFIG_DIR_VAR#\"${LUNARVIM_CONFIG_DIR}\"#"g \
+    -e s"#CACHE_DIR_VAR#\"${LUNARVIM_CACHE_DIR}\"#"g "$src" \
     | tee "$dst" >/dev/null
 
   chmod u+x "$dst"