Prechádzať zdrojové kódy

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)

Kyle Stubblefield 4 rokov pred
rodič
commit
946dc0c1dd
2 zmenil súbory, kde vykonal 6 pridanie a 3 odobranie
  1. 2 2
      init.lua
  2. 4 1
      lv-settings.lua

+ 2 - 2
init.lua

@@ -1,12 +1,12 @@
 require('lv-globals')
 require('lv-globals')
+vim.cmd('luafile ~/.config/nvim/lv-settings.lua')
 require('settings')
 require('settings')
 require('plugins')
 require('plugins')
 require('lv-utils')
 require('lv-utils')
 require('lv-autocommands')
 require('lv-autocommands')
-vim.cmd('luafile ~/.config/nvim/lv-settings.lua')
 require('keymappings')
 require('keymappings')
 require('lv-nvimtree') -- This plugin must be required somewhere before colorscheme.  Placing it after will break navigation 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-galaxyline')
 require('lv-comment')
 require('lv-comment')
 require('lv-compe')
 require('lv-compe')

+ 4 - 1
lv-settings.lua

@@ -14,7 +14,7 @@ O.auto_close_tree = 0
 O.wrap_lines = false
 O.wrap_lines = false
 O.timeoutlen = 100
 O.timeoutlen = 100
 
 
--- dashboard 
+-- dashboard
 -- O.dashboard.custom_header = {""}
 -- O.dashboard.custom_header = {""}
 -- O.dashboard.footer = {""}
 -- O.dashboard.footer = {""}
 
 
@@ -60,3 +60,6 @@ O.json.autoformat = true
 -- ruby
 -- ruby
 O.ruby.autoformat = true
 O.ruby.autoformat = true
 -- create custom autocommand field (This would be easy with lua)
 -- create custom autocommand field (This would be easy with lua)
+
+-- Turn off relative_numbers
+-- O.relative_number = false