daniel/dotfiles
1
0
Fork 0
Code Activity Actions

nvim: Improved system clipboard handling

Browse source
This commit is contained in:
Daniel Kempkens 2022-08-03 18:04:23 +02:00
parent 9023e34a0a
commit 1251a81cfb
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
home/config/nvim/init.fnl
View file

@ -1,6 +1,5 @@
(let [o vim.opt (let [o vim.opt
g vim.g g vim.g]
uname (vim.loop.os_uname)]
;; Preamble ;; Preamble
(vim.cmd.filetype "plugin indent on") (vim.cmd.filetype "plugin indent on")
(set o.shell :/bin/sh) (set o.shell :/bin/sh)

17
home/config/nvim/plugins/osc52.fnl
View file

@ -1,4 +1,6 @@
(let [osc52 (require :osc52)] (let [osc52 (require :osc52)
uname (vim.loop.os_uname)
clip-name :nifocClipboard]
(fn copy [lines _] (fn copy [lines _]
(-> lines (-> lines
(table.concat "\n") (table.concat "\n")
@ -7,8 +9,15 @@
(fn paste [] (fn paste []
[(vim.fn.split (vim.fn.getreg "") "\n") (vim.fn.getregtype "")]) [(vim.fn.split (vim.fn.getreg "") "\n") (vim.fn.getregtype "")])
(set vim.g.clipboard {:name :osc52 (if (= uname.sysname :Darwin)
:copy {:+ copy :* copy} (set vim.g.clipboard {:name clip-name
:paste {:+ paste :* paste}}) :copy {:+ copy :* copy}
:paste {:+ :pbpaste :* :pbpaste}
:cache_enabled 0})
;; Other OS
(set vim.g.clipboard {:name clip-name
:copy {:+ copy :* copy}
:paste {:+ paste :* paste}
:cache_enabled 0}))
(vim.opt.clipboard:prepend :unnamedplus)) (vim.opt.clipboard:prepend :unnamedplus))

12
home/programs/nvim/plugins.nix
View file

@ -47,12 +47,12 @@
}; };
nvim-osc52 = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-osc52 = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-osc52"; pname = "nvim-osc52";
version = "2022-07-31"; version = "2022-08-03";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "ojroques"; owner = "ojroques";
repo = "nvim-osc52"; repo = "nvim-osc52";
rev = "0f25ebe9eb5050bb242e947c42134a851391a73e"; rev = "6428be94f9a10755bb797d1b2b3f2e41334d6908";
sha256 = "0csd7ymia5k9pqrq8fr12yykiw4ssm06gsbz63i6xsgpvgmwnpv7"; sha256 = "1h7v1licgaazk7hrql21p81vqk2gfw1pz2n37ma8sf6anmdp1mip";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -208,12 +208,12 @@
}; };
nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2022-08-01"; version = "2022-08-03";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "06744ba3783ce2d502838f988dec95378543f5d7"; rev = "4bec857a983f732009ad96ba4936d389a93fdc98";
sha256 = "1hlwxm97wri9w40m1d90j9spzs29mi5xjr7iw86dvhhs2pa8xln4"; sha256 = "0xa62xbj4zp9cswmx1ikwq0jw3glkn97ydd282vhl1r5fhjm06vw";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };