diff --git a/init.lua b/init.lua index ea86b792..7a4efb1c 100644 --- a/init.lua +++ b/init.lua @@ -100,6 +100,7 @@ vim.g.have_nerd_font = false -- Make line numbers default vim.opt.number = true +vim.wo.relativenumber = true -- You can also add relative line numbers, to help with jumping. -- Experiment for yourself to see if you like it! -- vim.opt.relativenumber = true @@ -114,9 +115,9 @@ vim.opt.showmode = false -- Schedule the setting after `UiEnter` because it can increase startup-time. -- Remove this option if you want your OS clipboard to remain independent. -- See `:help 'clipboard'` -vim.schedule(function() - vim.opt.clipboard = 'unnamedplus' -end) +-- vim.schedule(function() +-- vim.opt.clipboard = 'unnamedplus' +-- end) -- Enable break indent vim.opt.breakindent = true @@ -230,6 +231,9 @@ vim.opt.rtp:prepend(lazypath) require('lazy').setup({ -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically + -- 'phha/zenburn.nvim', -- not great + 'tomasiser/vim-code-dark', + 'ribru17/bamboo.nvim', -- NOTE: Plugins can also be added by using a table, -- with the first argument being the link and the following @@ -256,6 +260,20 @@ require('lazy').setup({ }, }, + { + 'NeogitOrg/neogit', + dependencies = { + 'nvim-lua/plenary.nvim', -- required + 'sindrets/diffview.nvim', -- optional - Diff integration + + -- Only one of these is needed. + 'nvim-telescope/telescope.nvim', -- optional + 'ibhagwan/fzf-lua', -- optional + 'echasnovski/mini.pick', -- optional + }, + config = true, + }, + -- NOTE: Plugins can also be configured to run Lua code when they are loaded. -- -- This is often very useful to both group configuration, as well as handle @@ -617,6 +635,8 @@ require('lazy').setup({ -- But for many setups, the LSP (`ts_ls`) will work just fine -- ts_ls = {}, -- + -- kotlin_language_server = {}, + vacuum = {}, lua_ls = { -- cmd = {...}, diff --git a/load-oapi.lua b/load-oapi.lua new file mode 100644 index 00000000..dece5b5e --- /dev/null +++ b/load-oapi.lua @@ -0,0 +1,5 @@ +vim.lsp.start { + cmd = { 'openapi-language-server', '-testdata', '/tmp/xyz.txt' }, + filetypes = { 'yaml.openapi', 'yaml.oa', 'yaml' }, + root_dir = vim.fn.getcwd(), +}