fix: merge

This commit is contained in:
əlemi 2022-09-19 11:56:31 +02:00
parent d74484058b
commit 32ddb0a0ae
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 3 additions and 1 deletions

View file

@ -37,6 +37,7 @@ vim.opt.sessionoptions = "buffers,curdir,localoptions,tabpages,winsize"
vim.opt.foldlevelstart = 50 vim.opt.foldlevelstart = 50
vim.opt.termguicolors = true vim.opt.termguicolors = true
vim.opt.scrolloff = 4 vim.opt.scrolloff = 4
vim.opt.sidescrolloff = 8
-- vim.opt.signcolumn = "yes" -- vim.opt.signcolumn = "yes"
vim.opt.switchbuf = "usetab" vim.opt.switchbuf = "usetab"
vim.g.mapleader = "\\" vim.g.mapleader = "\\"
@ -68,7 +69,7 @@ vim.g.netrw_browse_split = 2
vim.g.netrw_winsize = 12 vim.g.netrw_winsize = 12
-- Neovide settings -- Neovide settings
vim.g.neovide_transparency = 0.8 vim.g.neovide_transparency = 0.9
vim.g.neovide_cursor_vfx_mode = "wireframe" vim.g.neovide_cursor_vfx_mode = "wireframe"
vim.opt.guifont = { "Fira Code", ":h10" } vim.opt.guifont = { "Fira Code", ":h10" }

View file

@ -91,6 +91,7 @@ function KEYBINDS:set_lsp_keys(opts)
vim.keymap.set('n', '<M-x>', vim.diagnostic.open_float, opts) -- fallback for windows vim.keymap.set('n', '<M-x>', vim.diagnostic.open_float, opts) -- fallback for windows
-- It's not really a keybind but whatever -- It's not really a keybind but whatever
vim.api.nvim_create_user_command('Format', ':lua vim.lsp.buf.formatting()<CR>', {}) -- TODO if function is passed directly, it doesn't work! vim.api.nvim_create_user_command('Format', ':lua vim.lsp.buf.formatting()<CR>', {}) -- TODO if function is passed directly, it doesn't work!
vim.keymap.set('n', '<M-p>', ':ClangdSwitchSourceHeader<CR>', {})
end end
function KEYBINDS:set_telescope_keys(opts) function KEYBINDS:set_telescope_keys(opts)