mirror of
https://github.com/LunarVim/LunarVim.git
synced 2024-09-21 02:55:09 +02:00
refactor(settings): add headless-mode settings (#2134)
This commit is contained in:
parent
678e3d9887
commit
5df1119365
6 changed files with 49 additions and 33 deletions
|
@ -1,7 +1,6 @@
|
||||||
return {
|
return {
|
||||||
leader = "space",
|
leader = "space",
|
||||||
colorscheme = "onedarker",
|
colorscheme = "onedarker",
|
||||||
line_wrap_cursor_movement = true,
|
|
||||||
transparent_window = false,
|
transparent_window = false,
|
||||||
format_on_save = {
|
format_on_save = {
|
||||||
---@usage pattern string pattern used for the autocommand (Default: '*')
|
---@usage pattern string pattern used for the autocommand (Default: '*')
|
||||||
|
|
|
@ -95,8 +95,9 @@ function M:load(config_path)
|
||||||
|
|
||||||
require("lvim.keymappings").load(lvim.keys)
|
require("lvim.keymappings").load(lvim.keys)
|
||||||
|
|
||||||
local settings = require "lvim.config.settings"
|
if lvim.transparent_window then
|
||||||
settings.load_commands()
|
autocmds.enable_transparent_mode()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Override the configuration with a user provided one
|
--- Override the configuration with a user provided one
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
local M = {}
|
local M = {}
|
||||||
local utils = require "lvim.utils"
|
local join_paths = require("lvim.utils").join_paths
|
||||||
M.load_options = function()
|
|
||||||
|
M.load_default_options = function()
|
||||||
local default_options = {
|
local default_options = {
|
||||||
backup = false, -- creates a backup file
|
backup = false, -- creates a backup file
|
||||||
clipboard = "unnamedplus", -- allows neovim to access the system clipboard
|
clipboard = "unnamedplus", -- allows neovim to access the system clipboard
|
||||||
|
@ -28,7 +29,7 @@ M.load_options = function()
|
||||||
timeoutlen = 100, -- time to wait for a mapped sequence to complete (in milliseconds)
|
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
|
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
|
-- opt.titlestring = "%<%F%=%l/%L - nvim" -- what the title of the window will be set to
|
||||||
undodir = utils.join_paths(get_cache_dir(), "undo"), -- set an undo directory
|
undodir = join_paths(get_cache_dir(), "undo"), -- set an undo directory
|
||||||
undofile = true, -- enable persistent undo
|
undofile = true, -- enable persistent undo
|
||||||
updatetime = 300, -- faster completion
|
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
|
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
|
||||||
|
@ -43,38 +44,35 @@ M.load_options = function()
|
||||||
wrap = false, -- display lines as one long line
|
wrap = false, -- display lines as one long line
|
||||||
spell = false,
|
spell = false,
|
||||||
spelllang = "en",
|
spelllang = "en",
|
||||||
spellfile = utils.join_paths(get_config_dir(), "spell", "en.utf-8.add"),
|
spellfile = join_paths(get_config_dir(), "spell", "en.utf-8.add"),
|
||||||
scrolloff = 8, -- is one of my fav
|
shadafile = join_paths(get_cache_dir(), "lvim.shada"),
|
||||||
sidescrolloff = 8,
|
scrolloff = 8, -- minimal number of screen lines to keep above and below the cursor.
|
||||||
|
sidescrolloff = 8, -- minimal number of screen lines to keep left and right of the cursor.
|
||||||
}
|
}
|
||||||
|
|
||||||
--- SETTINGS ---
|
--- SETTINGS ---
|
||||||
|
|
||||||
vim.opt.shortmess:append "c"
|
vim.opt.shortmess:append "c"
|
||||||
|
vim.opt.whichwrap:append "<,>,[,],h,l"
|
||||||
vim.opt.shadafile = utils.join_paths(get_cache_dir(), "lvim.shada")
|
|
||||||
|
|
||||||
for k, v in pairs(default_options) do
|
for k, v in pairs(default_options) do
|
||||||
vim.opt[k] = v
|
vim.opt[k] = v
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
M.load_commands = function()
|
M.load_headless_options = function()
|
||||||
local cmd = vim.cmd
|
vim.opt.shortmess = "" -- try to prevent echom from cutting messages off or prompting
|
||||||
if lvim.line_wrap_cursor_movement then
|
vim.opt.more = false -- don't pause listing when screen is filled
|
||||||
cmd "set whichwrap+=<,>,[,],h,l"
|
vim.opt.cmdheight = 9999 -- helps avoiding |hit-enter| prompts.
|
||||||
end
|
vim.opt.columns = 9999 -- set the widest screen possible
|
||||||
|
vim.opt.swapfile = false -- don't use a swap file
|
||||||
|
end
|
||||||
|
|
||||||
if lvim.transparent_window then
|
M.load_options = function()
|
||||||
cmd "au ColorScheme * hi Normal ctermbg=none guibg=none"
|
if #vim.api.nvim_list_uis() == 0 then
|
||||||
cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none"
|
M.load_headless_options()
|
||||||
cmd "au ColorScheme * hi NormalNC ctermbg=none guibg=none"
|
return
|
||||||
cmd "au ColorScheme * hi MsgArea ctermbg=none guibg=none"
|
|
||||||
cmd "au ColorScheme * hi TelescopeBorder ctermbg=none guibg=none"
|
|
||||||
cmd "au ColorScheme * hi NvimTreeNormal ctermbg=none guibg=none"
|
|
||||||
cmd "au ColorScheme * hi EndOfBuffer ctermbg=none guibg=none"
|
|
||||||
cmd "let &fcs='eob: '"
|
|
||||||
end
|
end
|
||||||
|
M.load_default_options()
|
||||||
end
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
|
@ -150,6 +150,17 @@ function M.disable_code_lens_refresh()
|
||||||
M.disable_augroup "lsp_code_lens_refresh"
|
M.disable_augroup "lsp_code_lens_refresh"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function M.enable_transparent_mode()
|
||||||
|
vim.cmd "au ColorScheme * hi Normal ctermbg=none guibg=none"
|
||||||
|
vim.cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none"
|
||||||
|
vim.cmd "au ColorScheme * hi NormalNC ctermbg=none guibg=none"
|
||||||
|
vim.cmd "au ColorScheme * hi MsgArea ctermbg=none guibg=none"
|
||||||
|
vim.cmd "au ColorScheme * hi TelescopeBorder ctermbg=none guibg=none"
|
||||||
|
vim.cmd "au ColorScheme * hi NvimTreeNormal ctermbg=none guibg=none"
|
||||||
|
vim.cmd "au ColorScheme * hi EndOfBuffer ctermbg=none guibg=none"
|
||||||
|
vim.cmd "let &fcs='eob: '"
|
||||||
|
end
|
||||||
|
|
||||||
--- Disable autocommand groups if it exists
|
--- Disable autocommand groups if it exists
|
||||||
--- This is more reliable than trying to delete the augroup itself
|
--- This is more reliable than trying to delete the augroup itself
|
||||||
---@param name string the augroup name
|
---@param name string the augroup name
|
||||||
|
|
|
@ -27,6 +27,7 @@ a.describe("initial start", function()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
a.it("should be able to pass basic checkhealth without errors", function()
|
a.it("should be able to pass basic checkhealth without errors", function()
|
||||||
|
vim.cmd "set cmdheight&"
|
||||||
vim.cmd "checkhealth nvim"
|
vim.cmd "checkhealth nvim"
|
||||||
local errmsg = vim.fn.eval "v:errmsg"
|
local errmsg = vim.fn.eval "v:errmsg"
|
||||||
local exception = vim.fn.eval "v:exception"
|
local exception = vim.fn.eval "v:exception"
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
local a = require "plenary.async_lib.tests"
|
local a = require "plenary.async_lib.tests"
|
||||||
local config = require "lvim.config"
|
local config = require "lvim.config"
|
||||||
local utils = require "lvim.utils"
|
|
||||||
|
|
||||||
a.describe("config-loader", function()
|
a.describe("config-loader", function()
|
||||||
local user_config_path = config:get_user_config_path()
|
local user_config_path = config:get_user_config_path()
|
||||||
|
@ -18,22 +17,29 @@ a.describe("config-loader", function()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
a.it("should be able to reload user-config without errors", function()
|
a.it("should be able to reload user-config without errors", function()
|
||||||
vim.opt.undodir = "/tmp"
|
config:load(user_config_path)
|
||||||
assert.equal(vim.opt.undodir:get()[1], "/tmp")
|
local test_path = "/tmp/lvim"
|
||||||
|
os.execute(string.format([[echo "vim.opt.undodir = '%s'" >> %s]], test_path, user_config_path))
|
||||||
config:reload()
|
config:reload()
|
||||||
assert.equal(vim.opt.undodir:get()[1], utils.join_paths(get_cache_dir(), "undo"))
|
assert.equal(vim.opt.undodir:get()[1], test_path)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
a.it("should not get interrupted by errors in user-config", function()
|
a.it("should not get interrupted by errors in user-config", function()
|
||||||
vim.opt.undodir = "/tmp"
|
local test_path = "/tmp/lunarvim"
|
||||||
assert.equal(vim.opt.undodir:get()[1], "/tmp")
|
os.execute(string.format([[echo "vim.opt.undodir = '%s'" >> %s]], test_path, user_config_path))
|
||||||
|
config:reload()
|
||||||
|
assert.equal(vim.opt.undodir:get()[1], test_path)
|
||||||
os.execute(string.format("echo 'bad_string_test' >> %s", user_config_path))
|
os.execute(string.format("echo 'bad_string_test' >> %s", user_config_path))
|
||||||
local error_handler = function(msg)
|
local error_handler = function(msg)
|
||||||
return msg
|
return msg
|
||||||
end
|
end
|
||||||
local err = xpcall(config:reload(), error_handler)
|
local err = xpcall(config:reload(), error_handler)
|
||||||
assert.falsy(err)
|
assert.falsy(err)
|
||||||
assert.equal(vim.opt.undodir:get()[1], utils.join_paths(get_cache_dir(), "undo"))
|
assert.equal(vim.opt.undodir:get()[1], test_path)
|
||||||
|
local errmsg = vim.fn.eval "v:errmsg"
|
||||||
|
local exception = vim.fn.eval "v:exception"
|
||||||
|
assert.equal("", errmsg) -- v:errmsg was not updated.
|
||||||
|
assert.equal("", exception)
|
||||||
os.execute(string.format("echo '' > %s", user_config_path))
|
os.execute(string.format("echo '' > %s", user_config_path))
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
Loading…
Reference in a new issue