diff options
| -rw-r--r-- | lua/user/cmp.lua | 6 | ||||
| -rw-r--r-- | lua/user/colorscheme.lua | 10 | ||||
| -rw-r--r-- | lua/user/options.lua | 7 | ||||
| -rw-r--r-- | lua/user/plugins.lua | 4 |
4 files changed, 10 insertions, 17 deletions
diff --git a/lua/user/cmp.lua b/lua/user/cmp.lua index 0ba1fc7..2966f5f 100644 --- a/lua/user/cmp.lua +++ b/lua/user/cmp.lua @@ -121,8 +121,10 @@ cmp.setup { behavior = cmp.ConfirmBehavior.Replace, select = false, }, - documentation = { - border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, + window = { + documentation = { + border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, + } }, experimental = { ghost_text = false, diff --git a/lua/user/colorscheme.lua b/lua/user/colorscheme.lua index 4ccd3ff..5e3ec3c 100644 --- a/lua/user/colorscheme.lua +++ b/lua/user/colorscheme.lua @@ -1,12 +1,4 @@ -vim.cmd [[ -try - colorscheme darkplus -catch /^Vim\%((\a\+)\)\=:E185/ - colorscheme default - set background=dark -endtry -]] -local colorscheme = "default" +local colorscheme = "tokyodark" local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme) if not status_ok then diff --git a/lua/user/options.lua b/lua/user/options.lua index cf23784..38f6efd 100644 --- a/lua/user/options.lua +++ b/lua/user/options.lua @@ -20,7 +20,8 @@ local options = { timeoutlen = 1000, -- time to wait for a mapped sequence to complete (in milliseconds) undofile = true, -- enable persistent undo updatetime = 300, -- faster completion (4000ms default) - 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 expandtab = true, -- convert tabs to spaces shiftwidth = 2, -- the number of spaces inserted for each indentation tabstop = 2, -- insert 2 spaces for a tab @@ -37,10 +38,6 @@ local options = { vim.opt.shortmess:append "c" -for k, v in pairs(options) do - vim.opt[k] = v -end - vim.cmd "set whichwrap+=<,>,[,],h,l" vim.cmd [[set iskeyword+=-]] vim.cmd [[set formatoptions-=cro]] -- TODO: this doesn't seem to work diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 3497691..d16c0c4 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -46,8 +46,10 @@ return packer.startup(function(use) use "nvim-lua/plenary.nvim" -- Useful lua functions used ny lots of plugins -- Colorschemes - -- use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out + use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out use "lunarvim/darkplus.nvim" + use 'tiagovla/tokyodark.nvim' + -- cmp plugins use "hrsh7th/nvim-cmp" -- The completion plugin |