Prechádzať zdrojové kódy

call colorschemes only after they get installed (#798)

rebuilt 4 rokov pred
rodič
commit
4f372bb3b7
2 zmenil súbory, kde vykonal 5 pridanie a 8 odobranie
  1. 2 1
      init.lua
  2. 3 7
      lua/settings.lua

+ 2 - 1
init.lua

@@ -3,10 +3,11 @@ require "keymappings"
 vim.cmd("luafile " .. CONFIG_PATH .. "/lv-config.lua")
 require "settings"
 require "plugins"
+vim.g.colors_name = O.colorscheme -- Colorscheme must get called after plugins are loaded or it will break new installs.
 require "lv-utils"
 require "lv-treesitter"
 if O.plugin.dashboard.active then
-  require("lv-dashboard").config()
+    require("lv-dashboard").config()
 end
 -- TODO these gues need to be in language files
 -- require "lsp"

+ 3 - 7
lua/settings.lua

@@ -11,21 +11,17 @@ cmd "set inccommand=split"
 cmd "set iskeyword+=-"
 cmd "set whichwrap+=<,>,[,],h,l"
 if O.transparent_window then
-  cmd "au ColorScheme * hi Normal ctermbg=none guibg=none"
-  cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none"
+    cmd "au ColorScheme * hi Normal ctermbg=none guibg=none"
+    cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none"
 end
 
---- COLORSCHEME ---
-
-vim.g.colors_name = O.colorscheme
-
 ---  SETTINGS  ---
 
 opt.backup = false -- creates a backup file
 opt.clipboard = O.clipboard -- allows neovim to access the system clipboard
 opt.cmdheight = O.cmdheight -- more space in the neovim command line for displaying messages
 opt.colorcolumn = "99999" -- fix indentline for now
-opt.completeopt = { "menuone", "noselect" }
+opt.completeopt = {"menuone", "noselect"}
 opt.conceallevel = 0 -- so that `` is visible in markdown files
 opt.fileencoding = "utf-8" -- the encoding written to a file
 opt.guifont = "monospace:h17" -- the font used in graphical neovim applications