From 2e446dc14d49b1da00e6c8c1878873141e139e7e Mon Sep 17 00:00:00 2001
From: Dery Rahman Ahaddienata <dery.ra@gmail.com>
Date: Thu, 29 Jul 2021 20:41:50 +0700
Subject: Fix autocmd custom_groups not loaded (#1162)

---
 init.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'init.lua')

diff --git a/init.lua b/init.lua
index 7f06285d..719b384c 100644
--- a/init.lua
+++ b/init.lua
@@ -12,6 +12,7 @@ vim.cmd [[
 ]]
 -- vim.opt.rtp:append() instead of vim.cmd ?
 require "default-config"
+local autocmds = require "core.autocmds"
 require("settings").load_options()
 local status_ok, error = pcall(vim.cmd, "luafile ~/.config/lvim/lv-config.lua")
 if not status_ok then
@@ -19,7 +20,7 @@ if not status_ok then
   print(error)
 end
 require("settings").load_commands()
-require("core.autocmds").define_augroups(lvim.autocommands)
+autocmds.define_augroups(lvim.autocommands)
 
 require "keymappings"
 -- require("lsp").setup_default_bindings()
-- 
cgit v1.2.3


From 679b8b69fb0ee8c5249a416845054a1734815d43 Mon Sep 17 00:00:00 2001
From: Luc Sinet <Tastyep@users.noreply.github.com>
Date: Sat, 31 Jul 2021 14:47:31 +0200
Subject: [Refactor] Define keymapppings helpers in utils.keymap (#1176)

---
 init.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'init.lua')

diff --git a/init.lua b/init.lua
index 719b384c..92ec3d4b 100644
--- a/init.lua
+++ b/init.lua
@@ -22,8 +22,10 @@ end
 require("settings").load_commands()
 autocmds.define_augroups(lvim.autocommands)
 
-require "keymappings"
--- require("lsp").setup_default_bindings()
+local keymap = require "utils.keymap"
+local default_keymaps = require "keymappings"
+keymap.load(default_keymaps.keymaps, default_keymaps.opts)
+keymap.load(lvim.keys, default_keymaps.opts)
 
 local plugins = require "plugins"
 local plugin_loader = require("plugin-loader").init()
-- 
cgit v1.2.3


From 213e3961fa637e4dbe4ef1ea5fceadcb372e020e Mon Sep 17 00:00:00 2001
From: chaeing <smchae9@gmail.com>
Date: Sat, 31 Jul 2021 11:28:59 -0700
Subject: [Feature] Rename lv-config.lua to config.lua (#1193)

* Rename example config files

* Update user config path in installer

* Update user config path with a variable

* Update default user config file to config.lua

* Add fallback to lv-config if config.lua not found

* Add global variable USER_CONFIG_PATH
---
 init.lua | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'init.lua')

diff --git a/init.lua b/init.lua
index 92ec3d4b..a69fde44 100644
--- a/init.lua
+++ b/init.lua
@@ -11,12 +11,32 @@ vim.cmd [[
   set runtimepath^=~/.local/share/lunarvim/lvim/after
 ]]
 -- vim.opt.rtp:append() instead of vim.cmd ?
+
+local function file_exists(name)
+  local f = io.open(name, "r")
+  if f ~= nil then
+    io.close(f)
+    return true
+  else
+    return false
+  end
+end
+
+local lvim_path = os.getenv "HOME" .. "/.config/lvim/"
+USER_CONFIG_PATH = lvim_path .. "config.lua"
+local config_exist = file_exists(USER_CONFIG_PATH)
+if not config_exist then
+  USER_CONFIG_PATH = lvim_path .. "lv-config.lua"
+  print "Rename ~/.config/lvim/lv-config.lua to config.lua"
+end
+
 require "default-config"
 local autocmds = require "core.autocmds"
 require("settings").load_options()
-local status_ok, error = pcall(vim.cmd, "luafile ~/.config/lvim/lv-config.lua")
+
+local status_ok, error = pcall(vim.cmd, "luafile " .. USER_CONFIG_PATH)
 if not status_ok then
-  print "something is wrong with your lv-config"
+  print("something is wrong with your " .. USER_CONFIG_PATH)
   print(error)
 end
 require("settings").load_commands()
-- 
cgit v1.2.3


From 77e283bd9c33166937756250918b12e349caf050 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Mon, 2 Aug 2021 23:42:56 +0200
Subject: [Refactor] Allow editing default keymaps (#1213)

---
 init.lua | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'init.lua')

diff --git a/init.lua b/init.lua
index a69fde44..0224a383 100644
--- a/init.lua
+++ b/init.lua
@@ -42,11 +42,6 @@ end
 require("settings").load_commands()
 autocmds.define_augroups(lvim.autocommands)
 
-local keymap = require "utils.keymap"
-local default_keymaps = require "keymappings"
-keymap.load(default_keymaps.keymaps, default_keymaps.opts)
-keymap.load(lvim.keys, default_keymaps.opts)
-
 local plugins = require "plugins"
 local plugin_loader = require("plugin-loader").init()
 plugin_loader:load { plugins, lvim.plugins }
@@ -73,6 +68,8 @@ if lsp_settings_status_ok then
   }
 end
 
+require("keymappings").setup()
+
 -- TODO: these guys need to be in language files
 -- if lvim.lang.emmet.active then
 --   require "lsp.emmet-ls"
-- 
cgit v1.2.3