improve clipboard support

init.lua

@@ -14,11 +14,15 @@ vim.opt.scrolloff = 10
 vim.opt.colorcolumn = '120'
 -- vim.opt.breakindent = true
 
--- Sync clipboard between OS and Neovim.
+-- TODO: replace with osc52 provider once iTerm2 supports it better
-vim.schedule(function()
+if vim.env.DISPLAY then
-  vim.opt.clipboard = 'unnamedplus'
+  if vim.fn.executable 'xclip' == 1 then
-end)
+    vim.schedule(function()
-vim.opt.mouse = 'nvi'
+      vim.opt.clipboard:append { 'unnamed', 'unnamedplus' }
+    end)
+  end
+  vim.opt.mouse = 'nvi'
+end
 
 -- File related
 vim.opt.autochdir = false