summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Stubblefield <[email protected]>2021-05-18 08:36:33 -0700
committerGitHub <[email protected]>2021-05-18 11:36:33 -0400
commit946dc0c1dd65746195bafc2a61ea9dfe7fd2505e (patch)
treeb2fb2e4a787c92d57ad6c9e63e24ab3268002e65
parent22ffb0eb03b947c6cce30d9836568e8af7565c33 (diff)
moved the including of lv-settings to above the settings so local settings configured in lv-settings can override the globals that get loaded in settings, 0.relative_number for example (#396)
-rw-r--r--init.lua4
-rw-r--r--lv-settings.lua5
2 files changed, 6 insertions, 3 deletions
diff --git a/init.lua b/init.lua
index 46861c6d..97f4bd28 100644
--- a/init.lua
+++ b/init.lua
@@ -1,12 +1,12 @@
require('lv-globals')
+vim.cmd('luafile ~/.config/nvim/lv-settings.lua')
require('settings')
require('plugins')
require('lv-utils')
require('lv-autocommands')
-vim.cmd('luafile ~/.config/nvim/lv-settings.lua')
require('keymappings')
require('lv-nvimtree') -- This plugin must be required somewhere before colorscheme. Placing it after will break navigation keymappings
-require('colorscheme') -- This plugin must be required somewhere after nvimtree. Placing it before will break navigation keymappings
+require('colorscheme') -- This plugin must be required somewhere after nvimtree. Placing it before will break navigation keymappings
require('lv-galaxyline')
require('lv-comment')
require('lv-compe')
diff --git a/lv-settings.lua b/lv-settings.lua
index d9754471..826b95ea 100644
--- a/lv-settings.lua
+++ b/lv-settings.lua
@@ -14,7 +14,7 @@ O.auto_close_tree = 0
O.wrap_lines = false
O.timeoutlen = 100
--- dashboard
+-- dashboard
-- O.dashboard.custom_header = {""}
-- O.dashboard.footer = {""}
@@ -60,3 +60,6 @@ O.json.autoformat = true
-- ruby
O.ruby.autoformat = true
-- create custom autocommand field (This would be easy with lua)
+
+-- Turn off relative_numbers
+-- O.relative_number = false