diff --git a/nvim/.config/nvim/after/plugin/misc.lua b/nvim/.config/nvim/after/plugin/misc.lua index 31cdda7..4ecac7b 100644 --- a/nvim/.config/nvim/after/plugin/misc.lua +++ b/nvim/.config/nvim/after/plugin/misc.lua @@ -77,25 +77,18 @@ vim.api.nvim_create_autocmd('WinEnter', { vim.notify = require('notify') -- osc52 -local function copy(lines, _) - require('osc52').copy(table.concat(lines, '\n')) -end - -local function paste() - return { vim.fn.split(vim.fn.getreg(''), '\n'), vim.fn.getregtype('') } -end - vim.g.clipboard = { - name = 'osc52', - copy = { ['+'] = copy, ['*'] = copy }, - paste = { ['+'] = paste, ['*'] = paste }, + name = 'OSC 52', + copy = { + ['+'] = require('vim.ui.clipboard.osc52').copy('+'), + ['*'] = require('vim.ui.clipboard.osc52').copy('*'), + }, + paste = { + ['+'] = require('vim.ui.clipboard.osc52').paste('+'), + ['*'] = require('vim.ui.clipboard.osc52').paste('*'), + }, } --- Now the '+' register will copy to system clipboard using OSC52 -vim.keymap.set('n', 'c', require('osc52').copy_operator, { expr = true }) -vim.keymap.set('n', 'cc', 'c_', { remap = true }) -vim.keymap.set('x', 'c', require('osc52').copy_visual) - m.keys { { 'n', 't', require('tardis-nvim').tardis } } diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 91321de..25fce89 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -56,7 +56,6 @@ require('lazy').setup { { 'neogitorg/neogit' }, -- misc { 'rcarriga/nvim-notify' }, - { 'ojroques/nvim-osc52' }, { 'olimorris/persisted.nvim' }, { 'windwp/nvim-autopairs', config = true }, { 'numToStr/Comment.nvim', config = true },