diff options
author | chaeing <[email protected]> | 2021-07-31 11:28:59 -0700 |
---|---|---|
committer | GitHub <[email protected]> | 2021-07-31 14:28:59 -0400 |
commit | 213e3961fa637e4dbe4ef1ea5fceadcb372e020e (patch) | |
tree | fb5f49fe23e03acef3509b0fe5c5cd906e5ca7aa /lua | |
parent | 2badb25f361ddeae32fcd482384cccdab96f8e68 (diff) |
[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
Diffstat (limited to 'lua')
-rw-r--r-- | lua/core/autocmds.lua | 2 | ||||
-rw-r--r-- | lua/core/dashboard.lua | 3 | ||||
-rw-r--r-- | lua/core/terminal.lua | 2 | ||||
-rw-r--r-- | lua/default-config.lua | 2 | ||||
-rw-r--r-- | lua/utils/init.lua | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/lua/core/autocmds.lua b/lua/core/autocmds.lua index 89590454..1bc49d37 100644 --- a/lua/core/autocmds.lua +++ b/lua/core/autocmds.lua @@ -27,7 +27,7 @@ lvim.autocommands = { "*", "setlocal formatoptions-=c formatoptions-=r formatoptions-=o", }, - { "BufWritePost", "lv-config.lua", "lua require('utils').reload_lv_config()" }, + { "BufWritePost", USER_CONFIG_PATH, "lua require('utils').reload_lv_config()" }, { "FileType", "qf", diff --git a/lua/core/dashboard.lua b/lua/core/dashboard.lua index 8d196458..2f14b9f1 100644 --- a/lua/core/dashboard.lua +++ b/lua/core/dashboard.lua @@ -43,8 +43,7 @@ M.config = function() }, d = { description = { " Settings " }, - -- command = ":e " .. CONFIG_PATH .. "/lv-config.lua", - command = ":e ~/.config/lvim/lv-config.lua", + command = ":e " .. USER_CONFIG_PATH, }, }, diff --git a/lua/core/terminal.lua b/lua/core/terminal.lua index 015341df..bd7815aa 100644 --- a/lua/core/terminal.lua +++ b/lua/core/terminal.lua @@ -32,7 +32,7 @@ M.config = function() background = "Normal", }, }, - -- Add executables on the lv-config file + -- Add executables on the config.lua -- { exec, keymap, name} -- lvim.builtin.terminal.execs = {{}} to overwrite -- lvim.builtin.terminal.execs[#lvim.builtin.terminal.execs+1] = {"gdb", "tg", "GNU Debugger"} diff --git a/lua/default-config.lua b/lua/default-config.lua index 6527ad77..d6063671 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -88,7 +88,7 @@ lvim = { }, plugins = { - -- use lv-config.lua for this not put here + -- use config.lua for this not put here }, autocommands = {}, diff --git a/lua/utils/init.lua b/lua/utils/init.lua index a404254b..b81ff4f4 100644 --- a/lua/utils/init.lua +++ b/lua/utils/init.lua @@ -81,7 +81,7 @@ end function utils.reload_lv_config() vim.cmd "source ~/.local/share/lunarvim/lvim/lua/settings.lua" - vim.cmd "source ~/.config/lvim/lv-config.lua" + vim.cmd("source " .. USER_CONFIG_PATH) vim.cmd "source ~/.local/share/lunarvim/lvim/lua/plugins.lua" local plugins = require "plugins" local plugin_loader = require("plugin-loader").init() |