mirror of
https://github.com/LunarVim/LunarVim.git
synced 2024-09-20 18:45:08 +02:00
refactor settings for hotswap
This commit is contained in:
parent
77749ed2fa
commit
619709eb2f
4 changed files with 54 additions and 51 deletions
8
init.lua
8
init.lua
|
@ -1,11 +1,15 @@
|
||||||
require "default-config"
|
require "default-config"
|
||||||
require "keymappings"
|
require "keymappings"
|
||||||
vim.cmd("luafile " .. CONFIG_PATH .. "/lv-config.lua")
|
local status_ok, _ = pcall(vim.cmd, "luafile " .. CONFIG_PATH .. "/lv-config.lua")
|
||||||
require "settings"
|
if not status_ok then
|
||||||
|
print "something is wrong with your lv-config"
|
||||||
|
end
|
||||||
require "plugins"
|
require "plugins"
|
||||||
vim.g.colors_name = O.colorscheme -- Colorscheme must get called after plugins are loaded or it will break new installs.
|
vim.g.colors_name = O.colorscheme -- Colorscheme must get called after plugins are loaded or it will break new installs.
|
||||||
|
require "settings"
|
||||||
require "lv-utils"
|
require "lv-utils"
|
||||||
require "lv-treesitter"
|
require "lv-treesitter"
|
||||||
|
|
||||||
-- TODO these guys need to be in language files
|
-- TODO these guys need to be in language files
|
||||||
-- require "lsp"
|
-- require "lsp"
|
||||||
-- if O.lang.emmet.active then
|
-- if O.lang.emmet.active then
|
||||||
|
|
|
@ -11,6 +11,49 @@ O = {
|
||||||
format_on_save = true,
|
format_on_save = true,
|
||||||
vnsip_dir = vim.fn.stdpath "config" .. "/snippets",
|
vnsip_dir = vim.fn.stdpath "config" .. "/snippets",
|
||||||
|
|
||||||
|
default_options = {
|
||||||
|
backup = false, -- creates a backup file
|
||||||
|
clipboard = "unnamedplus", -- allows neovim to access the system clipboard
|
||||||
|
cmdheight = 2, -- more space in the neovim command line for displaying messages
|
||||||
|
colorcolumn = "99999", -- fixes indentline for now
|
||||||
|
completeopt = { "menuone", "noselect" },
|
||||||
|
conceallevel = 0, -- so that `` is visible in markdown files
|
||||||
|
fileencoding = "utf-8", -- the encoding written to a file
|
||||||
|
guifont = "monospace:h17", -- the font used in graphical neovim applications
|
||||||
|
hidden = true, -- required to keep multiple buffers and open multiple buffers
|
||||||
|
hlsearch = false, -- highlight all matches on previous search pattern
|
||||||
|
ignorecase = true, -- ignore case in search patterns
|
||||||
|
mouse = "a", -- allow the mouse to be used in neovim
|
||||||
|
pumheight = 10, -- pop up menu height
|
||||||
|
showmode = false, -- we don't need to see things like -- INSERT -- anymore
|
||||||
|
showtabline = 2, -- always show tabs
|
||||||
|
smartcase = true, -- smart case
|
||||||
|
smartindent = true, -- make indenting smarter again
|
||||||
|
splitbelow = true, -- force all horizontal splits to go below current window
|
||||||
|
splitright = true, -- force all vertical splits to go to the right of current window
|
||||||
|
swapfile = false, -- creates a swapfile
|
||||||
|
termguicolors = true, -- set term gui colors (most terminals support this)
|
||||||
|
timeoutlen = 100, -- time to wait for a mapped sequence to complete (in milliseconds)
|
||||||
|
title = true, -- set the title of window to the value of the titlestring
|
||||||
|
-- opt.titlestring = "%<%F%=%l/%L - nvim" -- what the title of the window will be set to
|
||||||
|
undodir = CACHE_PATH .. "/undo", -- set an undo directory
|
||||||
|
undofile = true, -- enable persisten undo
|
||||||
|
updatetime = 300, -- faster completion
|
||||||
|
writebackup = false, -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited
|
||||||
|
expandtab = true, -- convert tabs to spaces
|
||||||
|
shiftwidth = 2, -- the number of spaces inserted for each indentation
|
||||||
|
tabstop = 2, -- insert 2 spaces for a tab
|
||||||
|
cursorline = true, -- highlight the current line
|
||||||
|
number = true, -- set numbered lines
|
||||||
|
relativenumber = false, -- set relative numbered lines
|
||||||
|
numberwidth = 4, -- set number column width to 2 {default 4}
|
||||||
|
signcolumn = "yes", -- always show the sign column, otherwise it would shift the text each time
|
||||||
|
wrap = false, -- display lines as one long line
|
||||||
|
spell = false,
|
||||||
|
spelllang = "en",
|
||||||
|
scrolloff = 8, -- is one of my fav
|
||||||
|
},
|
||||||
|
|
||||||
-- TODO refactor for tree
|
-- TODO refactor for tree
|
||||||
auto_close_tree = 0,
|
auto_close_tree = 0,
|
||||||
nvim_tree_disable_netrw = 0,
|
nvim_tree_disable_netrw = 0,
|
||||||
|
@ -58,11 +101,8 @@ O = {
|
||||||
diffview = { active = false },
|
diffview = { active = false },
|
||||||
ts_context_commentstring = { active = false },
|
ts_context_commentstring = { active = false },
|
||||||
ts_hintobjects = { active = false },
|
ts_hintobjects = { active = false },
|
||||||
ts_autotag = { active = false },
|
|
||||||
ts_rainbow = { active = false },
|
|
||||||
ts_textobjects = { active = false },
|
ts_textobjects = { active = false },
|
||||||
ts_textsubjects = { active = false },
|
ts_textsubjects = { active = false },
|
||||||
telescope_fzy = { active = false },
|
|
||||||
telescope_project = { active = false },
|
telescope_project = { active = false },
|
||||||
indent_line = { active = false },
|
indent_line = { active = false },
|
||||||
lush = { active = false },
|
lush = { active = false },
|
||||||
|
|
|
@ -3,6 +3,7 @@ local lv_utils = {}
|
||||||
function lv_utils.reload_lv_config()
|
function lv_utils.reload_lv_config()
|
||||||
vim.cmd "source ~/.config/nvim/lv-config.lua"
|
vim.cmd "source ~/.config/nvim/lv-config.lua"
|
||||||
vim.cmd "source ~/.config/nvim/lua/plugins.lua"
|
vim.cmd "source ~/.config/nvim/lua/plugins.lua"
|
||||||
|
vim.cmd "source ~/.config/nvim/lua/settings.lua"
|
||||||
vim.cmd "source ~/.config/nvim/lua/lv-neoformat/init.lua"
|
vim.cmd "source ~/.config/nvim/lua/lv-neoformat/init.lua"
|
||||||
vim.cmd ":PackerCompile"
|
vim.cmd ":PackerCompile"
|
||||||
vim.cmd ":PackerInstall"
|
vim.cmd ":PackerInstall"
|
||||||
|
|
|
@ -18,52 +18,6 @@ end
|
||||||
--- SETTINGS ---
|
--- SETTINGS ---
|
||||||
|
|
||||||
opt.shortmess:append "c"
|
opt.shortmess:append "c"
|
||||||
O.default_options = {
|
|
||||||
backup = false, -- creates a backup file
|
|
||||||
clipboard = "unnamedplus", -- allows neovim to access the system clipboard
|
|
||||||
cmdheight = 2, -- more space in the neovim command line for displaying messages
|
|
||||||
colorcolumn = "99999", -- fixes indentline for now
|
|
||||||
completeopt = { "menuone", "noselect" },
|
|
||||||
conceallevel = 0, -- so that `` is visible in markdown files
|
|
||||||
fileencoding = "utf-8", -- the encoding written to a file
|
|
||||||
guifont = "monospace:h17", -- the font used in graphical neovim applications
|
|
||||||
hidden = true, -- required to keep multiple buffers and open multiple buffers
|
|
||||||
hlsearch = false, -- highlight all matches on previous search pattern
|
|
||||||
ignorecase = true, -- ignore case in search patterns
|
|
||||||
mouse = "a", -- allow the mouse to be used in neovim
|
|
||||||
pumheight = 10, -- pop up menu height
|
|
||||||
showmode = false, -- we don't need to see things like -- INSERT -- anymore
|
|
||||||
showtabline = 2, -- always show tabs
|
|
||||||
smartcase = true, -- smart case
|
|
||||||
smartindent = true, -- make indenting smarter again
|
|
||||||
splitbelow = true, -- force all horizontal splits to go below current window
|
|
||||||
splitright = true, -- force all vertical splits to go to the right of current window
|
|
||||||
swapfile = false, -- creates a swapfile
|
|
||||||
termguicolors = true, -- set term gui colors (most terminals support this)
|
|
||||||
timeoutlen = 100, -- time to wait for a mapped sequence to complete (in milliseconds)
|
|
||||||
title = true, -- set the title of window to the value of the titlestring
|
|
||||||
-- opt.titlestring = "%<%F%=%l/%L - nvim" -- what the title of the window will be set to
|
|
||||||
undodir = CACHE_PATH .. "/undo", -- set an undo directory
|
|
||||||
undofile = true, -- enable persisten undo
|
|
||||||
updatetime = 300, -- faster completion
|
|
||||||
writebackup = false, -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited
|
|
||||||
expandtab = true, -- convert tabs to spaces
|
|
||||||
shiftwidth = 2, -- the number of spaces inserted for each indentation
|
|
||||||
tabstop = 2, -- insert 2 spaces for a tab
|
|
||||||
cursorline = true, -- highlight the current line
|
|
||||||
number = true, -- set numbered lines
|
|
||||||
relativenumber = false, -- set relative numbered lines
|
|
||||||
numberwidth = 4, -- set number column width to 2 {default 4}
|
|
||||||
signcolumn = "yes", -- always show the sign column, otherwise it would shift the text each time
|
|
||||||
wrap = false, -- display lines as one long line
|
|
||||||
spell = false,
|
|
||||||
spelllang = "en",
|
|
||||||
scrolloff = 8, -- is one of my fav
|
|
||||||
}
|
|
||||||
|
|
||||||
for k, v in pairs(O.default_options) do
|
|
||||||
opt[k] = v
|
|
||||||
end
|
|
||||||
|
|
||||||
local disabled_built_ins = {
|
local disabled_built_ins = {
|
||||||
"netrw",
|
"netrw",
|
||||||
|
@ -88,3 +42,7 @@ local disabled_built_ins = {
|
||||||
for _, plugin in pairs(disabled_built_ins) do
|
for _, plugin in pairs(disabled_built_ins) do
|
||||||
vim.g["loaded_" .. plugin] = 1
|
vim.g["loaded_" .. plugin] = 1
|
||||||
end
|
end
|
||||||
|
|
||||||
|
for k, v in pairs(O.default_options) do
|
||||||
|
vim.opt[k] = v
|
||||||
|
end
|
||||||
|
|
Loading…
Reference in a new issue