From 4f372bb3b77f5bc60aa14fdaf2b9687414fc981a Mon Sep 17 00:00:00 2001 From: rebuilt Date: Thu, 8 Jul 2021 23:12:48 +0200 Subject: call colorschemes only after they get installed (#798) --- init.lua | 3 ++- lua/settings.lua | 10 +++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index 74010cdc..4494e4c2 100644 --- a/init.lua +++ b/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" diff --git a/lua/settings.lua b/lua/settings.lua index 044708b9..78e9e777 100644 --- a/lua/settings.lua +++ b/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 -- cgit v1.2.3