Merge remote-tracking branch 'refs/remotes/origin/nvim' into nvim

init.lua

@@ -19,13 +19,15 @@ vim.opt.list = true
 vim.opt.listchars:append 'space:·'
 vim.opt.wildmenu = true
 vim.opt.wrap = false
-vim.opt.clipboard = 'unnamedplus'
 vim.opt.ignorecase = true
 vim.opt.smartcase = true
 vim.opt.inccommand = 'split'
 vim.opt.foldmethod = 'marker'
 -- }}}
 
+-- Setup Clipboard for OSC 52
+vim.g.clipboard = 'osc52'
+
 -- Setup (Disable) Netrw {{{
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
@@ -97,4 +99,8 @@ vim.keymap.set('n', '<leader>b', ':Pick buffers<CR>', { noremap = true })
 vim.keymap.set('n', '<leader>t', ToggleTerminal)
 vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>')
 vim.keymap.set('n', 'x', '"_x')
+vim.keymap.set('n', '<leader>y', '"+y')
+vim.keymap.set('n', '<leader>Y', '"+y$')
+vim.keymap.set('n', '<leader>p', '"+p')
+vim.keymap.set('n', '<leader>P', '"+P')
 -- }}}