[PR PATCH] fzf: install fzf.vim to Neovim plugin directory

[PR PATCH] fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

There is a new pull request by gbrlsnchs against master on the void-packages repository

https://github.com/gbrlsnchs/void-packages fix-fzf-nvim
https://github.com/void-linux/void-packages/pull/21733

fzf: install fzf.vim to Neovim plugin directory
For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.

A patch file from https://github.com/void-linux/void-packages/pull/21733.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-fzf-nvim-21733.patch --]
[-- Type: text/x-diff, Size: 1184 bytes --]

From 478839dece86958a40df057a28671a1bf8e44477 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Thu, 7 May 2020 21:04:47 -0300
Subject: [PATCH] fzf: install fzf.vim to Neovim plugin directory

For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.
---
 srcpkgs/fzf/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 7945d569eb1..54080cb48ce 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.21.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/junegunn/fzf
 hostmakedepends="git"
@@ -22,6 +22,7 @@ post_install() {
 
 	sed -i -e 's#source ~/\.fzf\.bash; ##' shell/key-bindings.bash
 	vinstall plugin/fzf.vim 644 usr/share/vim/vimfiles/plugin
+	vinstall plugin/fzf.vim 644 usr/share/nvim/runtime/plugin
 	vinstall shell/completion.bash 644 usr/share/bash-completion/completions fzf
 	vinstall shell/completion.zsh 644 usr/share/doc/fzf
 	vinstall shell/key-bindings.zsh 644 usr/share/doc/fzf

Re: fzf: install fzf.vim to Neovim plugin directory

[Anachron]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New comment by Anachron on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-625615136

Comment:
True, this creates not needed files for vim users though. Not sure how to solve this.

Re: fzf: install fzf.vim to Neovim plugin directory

[daniel-eys]

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

New comment by daniel-eys on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-625768109

Comment:
You don't have to copy vimfiles around, just add `/usr/share/vim/vimfiles` to your neovim runtimepath, so neovim can load plugins etc. from there, too.
`set rtp+=/usr/share/vim/vimfiles`

Re: fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-625779289

Comment:
> You don't have to copy vimfiles around, just add `/usr/share/vim/vimfiles` to your neovim runtimepath, so neovim can load plugins etc. from there, too.
> `set rtp+=/usr/share/vim/vimfiles`
> 
> 
> 

If I only use FZF without Vim, it'll create the files anyway... this way at least it's consistent.

Also, Neovim reads `/usr/share/nvim/runtime` by default, so why add vimfiles to it? It has its own files.

Re: fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 696 bytes --]

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-625779289

Comment:
> You don't have to copy vimfiles around, just add `/usr/share/vim/vimfiles` to your neovim runtimepath, so neovim can load plugins etc. from there, too.
> `set rtp+=/usr/share/vim/vimfiles`
> 
> 
> 

If I only use FZF without Vim, it'll create the files anyway... this way at least it's consistent.

Also, Neovim reads `/usr/share/nvim/runtime` by default, so why add vimfiles to it? It has its own files.

This is more a design issue with FZF... we have to install those files, what if I want to install Vim/Neovim after FZF, it won't have the file...

Re: fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 739 bytes --]

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-625779289

Comment:
> You don't have to copy vimfiles around, just add `/usr/share/vim/vimfiles` to your neovim runtimepath, so neovim can load plugins etc. from there, too.
> `set rtp+=/usr/share/vim/vimfiles`
> 
> 
> 

If I only use FZF without Vim, it'll create the files anyway... this way at least it's consistent.

Also, Neovim reads `/usr/share/nvim/runtime` by default, so why add vimfiles to it? It has its own files.

This is more a design issue with FZF... we have to install those files, what if I want to install Vim/Neovim after I have already installed FZF, I won't have the file instaled...

Re: [PR PATCH] [Updated] fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

There is an updated pull request by gbrlsnchs against master on the void-packages repository

https://github.com/gbrlsnchs/void-packages fix-fzf-nvim
https://github.com/void-linux/void-packages/pull/21733

fzf: install fzf.vim to Neovim plugin directory
For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.

A patch file from https://github.com/void-linux/void-packages/pull/21733.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-fzf-nvim-21733.patch --]
[-- Type: text/x-diff, Size: 1184 bytes --]

From 44f44e6ed873e2b3b916ac94f23c521647644289 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Thu, 7 May 2020 21:04:47 -0300
Subject: [PATCH] fzf: install fzf.vim to Neovim plugin directory

For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.
---
 srcpkgs/fzf/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 109f5d44028..d67a722709b 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.22.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/junegunn/fzf
 hostmakedepends="git"
@@ -22,6 +22,7 @@ post_install() {
 
 	sed -i -e 's#source ~/\.fzf\.bash; ##' shell/key-bindings.bash
 	vinstall plugin/fzf.vim 644 usr/share/vim/vimfiles/plugin
+	vinstall plugin/fzf.vim 644 usr/share/nvim/runtime/plugin
 	vinstall shell/completion.bash 644 usr/share/bash-completion/completions fzf
 	vinstall shell/completion.zsh 644 usr/share/doc/fzf
 	vinstall shell/key-bindings.zsh 644 usr/share/doc/fzf

Re: fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 508 bytes --]

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-671686897

Comment:
This PR is important for Neovim users that have FZF installed via XBPS. Vim support already existed and the files for it were installed regardless whether the user was a Vim user, so I just added support for Neovim. Unfortunately the flaw lies within FZF itself, since it is also home for the Vim plugin, when actually the plugin should be in a separate repository.

Re: [PR PATCH] [Closed]: fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There's a closed pull request on the void-packages repository

fzf: install fzf.vim to Neovim plugin directory
https://github.com/void-linux/void-packages/pull/21733

Description:
For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.

Re: [PR PATCH] [Updated] fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

There is an updated pull request by gbrlsnchs against master on the void-packages repository

https://github.com/gbrlsnchs/void-packages fix-fzf-nvim
https://github.com/void-linux/void-packages/pull/21733

fzf: install fzf.vim to Neovim plugin directory
For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.

A patch file from https://github.com/void-linux/void-packages/pull/21733.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-fzf-nvim-21733.patch --]
[-- Type: text/x-diff, Size: 11368 bytes --]

From e56b4f031013c07d63d3095d210c1a12e9f8abef Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Mon, 21 Sep 2020 11:31:30 -0300
Subject: [PATCH 1/5] New package: btrfs_map_physical-git.0

---
 srcpkgs/btrfs_map_physical/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/btrfs_map_physical/template

diff --git a/srcpkgs/btrfs_map_physical/template b/srcpkgs/btrfs_map_physical/template
new file mode 100644
index 00000000000..668fe49538a
--- /dev/null
+++ b/srcpkgs/btrfs_map_physical/template
@@ -0,0 +1,22 @@
+# Template file for 'btrfs_map_physical'
+pkgname=btrfs_map_physical
+version=git.0
+revision=1
+build_style=fetch
+hostmakedepends=""
+makedepends=""
+depends=""
+short_desc="Program to get physical offset of a file under btrfs"
+maintainer="Gabriel Sanches <gabriel@gsr.dev>"
+license="custom:unlicensed"
+homepage="https://github.com/osandov/osandov-linux"
+distfiles="https://raw.githubusercontent.com/osandov/osandov-linux/1e49d070bc01db1f2c32df4fc678f08a1c2392d5/scripts/btrfs_map_physical.c"
+checksum=9f55c0c4f020e194c0fa2716f40ac3bc8e8a92c085cd634684e014b36f3b02b7
+
+do_build() {
+	gcc -O2 -o ${pkgname} ${pkgname}.c
+}
+
+do_install() {
+	vbin ${pkgname}
+}

From 17cfc5e4a4c2257925188eb3b27f7b577f6a878d Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Sun, 20 Sep 2020 00:13:15 -0300
Subject: [PATCH 2/5] New package: lua-language-server-git.0

---
 srcpkgs/lua-language-server/files/wrapper     |   4 +
 .../patches/0001-Fix-paths.patch              | 126 ++++++++++++++++++
 srcpkgs/lua-language-server/template          |  45 +++++++
 3 files changed, 175 insertions(+)
 create mode 100644 srcpkgs/lua-language-server/files/wrapper
 create mode 100644 srcpkgs/lua-language-server/patches/0001-Fix-paths.patch
 create mode 100644 srcpkgs/lua-language-server/template

diff --git a/srcpkgs/lua-language-server/files/wrapper b/srcpkgs/lua-language-server/files/wrapper
new file mode 100644
index 00000000000..d61d05d05d4
--- /dev/null
+++ b/srcpkgs/lua-language-server/files/wrapper
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /usr/share/@PKGNAME@
+exec /usr/lib/@PKGNAME@/@PKGNAME@ -E ./main.lua
diff --git a/srcpkgs/lua-language-server/patches/0001-Fix-paths.patch b/srcpkgs/lua-language-server/patches/0001-Fix-paths.patch
new file mode 100644
index 00000000000..ef7c35a1eea
--- /dev/null
+++ b/srcpkgs/lua-language-server/patches/0001-Fix-paths.patch
@@ -0,0 +1,126 @@
+diff --git a/main-beta.lua b/main-beta.lua
+index 1d1eecae..6a2a3e30 100644
+--- a/main-beta.lua
++++ b/main-beta.lua
+@@ -1,7 +1,11 @@
+ local currentPath = debug.getinfo(1, 'S').source:sub(2)
+ local rootPath = currentPath:gsub('[/\\]*[^/\\]-$', '')
+-loadfile(rootPath .. '/platform.lua')('script-beta')
++
++loadfile(rootPath .. '/platform.lua')(rootPath, 'script-beta')
++
++local math = require 'math'
+ local fs = require 'bee.filesystem'
++
+ ROOT = fs.path(rootPath)
+ LANG = LANG or 'en-US'
+ 
+@@ -9,7 +13,7 @@ collectgarbage('generational', 10, 50)
+ --collectgarbage('incremental', 120, 120, 0)
+ 
+ log = require 'log'
+-log.init(ROOT, ROOT / 'log' / 'service.log')
++log.init(ROOT, fs.path('/tmp/lua-language-server' .. math.random(1000, 9000)) / 'log' / 'service.log')
+ log.info('Lua Lsp startup, root: ', ROOT)
+ log.debug('ROOT:', ROOT:string())
+ 
+diff --git a/main.lua b/main.lua
+index b7c10ed5..6d3e4035 100644
+--- a/main.lua
++++ b/main.lua
+@@ -1,21 +1,27 @@
+ local currentPath = debug.getinfo(1, 'S').source:sub(2)
+ local rootPath = currentPath:gsub('[/\\]*[^/\\]-$', '')
+-loadfile(rootPath .. '/platform.lua')('script')
++
++loadfile(rootPath .. '/platform.lua')(rootPath, 'script')
++
++local math = require 'math'
+ local fs = require 'bee.filesystem'
++
++rootPath = fs.path(rootPath)
+ ROOT = fs.current_path() / rootPath
+ LANG = LANG or 'en-US'
++LOG_PATH = fs.path('/tmp/lua-lua-language-server' .. math.random(1000, 9000)) / 'log'
+ 
+ --collectgarbage('generational')
+ collectgarbage("setpause", 100)
+ collectgarbage("setstepmul", 1000)
+ 
+ log = require 'log'
+-log.init(ROOT, ROOT / 'log' / 'service.log')
++log.init(ROOT, LOG_PATH / 'service.log')
+ log.info('Lua Lsp startup, root: ', ROOT)
+ log.debug('ROOT:', ROOT:string())
+ ac = {}
+ 
+-xpcall(dofile, log.debug, rootPath .. '/debugger.lua')
++xpcall(dofile, log.debug, tostring(rootPath / 'debugger.lua'))
+ require 'utility'
+ local service = require 'service'
+ local session = service()
+diff --git a/platform.lua b/platform.lua
+index 46656fda..a1c1989c 100644
+--- a/platform.lua
++++ b/platform.lua
+@@ -1,4 +1,4 @@
+-local script = ...
++local rootPath, script = ...
+ 
+ local function findExePath()
+     local n = 0
+@@ -30,13 +30,7 @@ cpath:    %s
+ end
+ 
+ local fs = require 'bee.filesystem'
+-local rootPath = fs.path(exePath):parent_path():parent_path():remove_filename():string()
+-if dll == '.dll' then
+-    rootPath = rootPath:gsub('/', '\\')
+-    package.path  = rootPath .. script .. '\\?.lua'
+-          .. ';' .. rootPath .. script .. '\\?\\init.lua'
+-else
+-    rootPath = rootPath:gsub('\\', '/')
+-    package.path  = rootPath .. script .. '/?.lua'
+-          .. ';' .. rootPath .. script .. '/?/init.lua'
+-end
++rootPath = fs.absolute(fs.path(rootPath))
++
++package.path  = tostring(rootPath / script / '?.lua')
++      .. ';' .. tostring(rootPath / script / '?' / 'init.lua')
+diff --git a/script/workspace.lua b/script/workspace.lua
+index 75bc27a0..ba855700 100644
+--- a/script/workspace.lua
++++ b/script/workspace.lua
+@@ -187,7 +187,7 @@ function mt:init(rootUri)
+     end
+     log.info('Workspace inited, root: ', self.root)
+     log.info('Workspace inited, uri: ', rootUri)
+-    local logPath = ROOT / 'log' / (rootUri:gsub('[/:]+', '_') .. '.log')
++    local logPath = LOG_PATH / (rootUri:gsub('[/:]+', '_') .. '.log')
+     log.info('Log path: ', logPath)
+     log.init(ROOT, logPath)
+ end
+diff --git a/test.lua b/test.lua
+index 72178860..da8f46dc 100644
+--- a/test.lua
++++ b/test.lua
+@@ -3,16 +3,17 @@ local rootPath = currentPath:gsub('[^/\\]-$', '')
+ if rootPath == '' then
+     rootPath = './'
+ end
+-loadfile(rootPath .. 'platform.lua')('script')
++loadfile(rootPath .. 'platform.lua')(rootPath, 'script')
+ package.path  = package.path
+       .. ';' .. rootPath .. 'test/?.lua'
+       .. ';' .. rootPath .. 'test/?/init.lua'
+ local fs = require 'bee.filesystem'
+ ROOT = fs.absolute(fs.path(rootPath):parent_path())
+ LANG = 'en-US'
++LOG_PATH = ROOT / 'log'
+ 
+ log = require 'log'
+-log.init(ROOT, ROOT / 'log' / 'test.log')
++log.init(ROOT, LOG_PATH / 'test.log')
+ log.debug('测试开始')
+ ac = {}
+ 
diff --git a/srcpkgs/lua-language-server/template b/srcpkgs/lua-language-server/template
new file mode 100644
index 00000000000..df2e6802945
--- /dev/null
+++ b/srcpkgs/lua-language-server/template
@@ -0,0 +1,45 @@
+# Template file for 'lua-language-server'
+pkgname=lua-language-server
+version=git.0
+revision=1
+wrksrc=${pkgname}
+hostmakedepends="ninja git"
+depends="lua"
+short_desc="Lua Language Server coded by Lua"
+maintainer="Gabriel Sanches <gabriel@gsr.dev>"
+license="MIT"
+homepage="https://github.com/sumneko/lua-language-server"
+patch_args=-Np1
+
+do_fetch() {
+	git clone https://github.com/sumneko/${pkgname}.git ${wrksrc}
+	cd ${wrksrc}
+	git submodule update --init --recursive
+}
+
+do_build() {
+	cd ${wrksrc}/3rd/luamake
+	ninja -f ninja/linux.ninja
+	cd ../..
+	./3rd/luamake/luamake rebuild
+}
+
+do_install() {
+	vlicense LICENSE
+
+	# main script
+	vmkdir usr/lib/${pkgname}
+	vcopy "${wrksrc}/bin/Linux/*" usr/lib/${pkgname}
+
+	# entrypoint and files
+	vmkdir usr/share/${pkgname}
+	for script in main.lua script libs locale platform.lua; do
+		vcopy "${wrksrc}/${script}" usr/share/${pkgname}
+	done
+
+	vmkdir usr/bin
+	sed ${FILESDIR}/wrapper \
+		-e "s;@PKGNAME@;$pkgname;g" \
+		> ${DESTDIR}/usr/bin/${pkgname}
+	chmod 755 ${DESTDIR}/usr/bin/${pkgname}
+}

From cee4cac44b1be05a737e9472f1fa51ad477b6738 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Fri, 17 Jul 2020 15:50:57 -0300
Subject: [PATCH 3/5] New package: rust-analyzer-2020.09.14

---
 srcpkgs/rust-analyzer/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/rust-analyzer/template

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
new file mode 100644
index 00000000000..1361ce39766
--- /dev/null
+++ b/srcpkgs/rust-analyzer/template
@@ -0,0 +1,20 @@
+# Template file for 'rust-analyzer'
+pkgname=rust-analyzer
+version=2020.09.14
+revision=1
+_ver=${version//./-}
+wrksrc="${pkgname}-${_ver}"
+build_style=cargo
+make_install_args="--path=crates/${pkgname}"
+short_desc="Rust compiler front-end for IDEs"
+maintainer="Gabriel Sanches <gabriel@gsr.dev>"
+license="Apache-2.0, MIT"
+homepage="https://rust-analyzer.github.io/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${_ver}.tar.gz"
+checksum=162c0acac4c025e287deab7974340bf6147343495697ac72101cb8d56caab01e
+
+post_install() {
+	vlicense LICENSE-APACHE
+	vlicense LICENSE-MIT
+	vdoc README.md
+}

From 0e6dff508bfb22cb35398f37cefd6e861f5c8091 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Mon, 4 May 2020 20:45:04 -0300
Subject: [PATCH 4/5] New package: pilgo-0.5.0

---
 srcpkgs/pilgo/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/pilgo/template

diff --git a/srcpkgs/pilgo/template b/srcpkgs/pilgo/template
new file mode 100644
index 00000000000..c70540dba9e
--- /dev/null
+++ b/srcpkgs/pilgo/template
@@ -0,0 +1,17 @@
+# Template file for 'pilgo'
+pkgname=pilgo
+version=0.5.0
+revision=1
+build_style=go
+go_import_path="github.com/gbrlsnchs/pilgo/cmd/plg"
+go_ldflags="-X github.com/gbrlsnchs/pilgo/cmd/internal.version=${version}"
+short_desc="Configuration-based dotfiles manager"
+maintainer="Gabriel Sanches <gabriel@gsr.dev>"
+license="MIT"
+homepage="https://gsr.dev/pilgo"
+distfiles="https://github.com/gbrlsnchs/pilgo/archive/v${version}.tar.gz"
+checksum=4fefbc30e8d2568c04687613a611ac9f9864028add28b82b3912b9e267c20635
+
+post_install() {
+	vlicense LICENSE
+}

From baa6767bc808e5316bb3c530511222f946289356 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Thu, 7 May 2020 21:04:47 -0300
Subject: [PATCH 5/5] fzf: install fzf.vim to Neovim plugin directory

For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.
---
 srcpkgs/fzf/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 109f5d44028..d67a722709b 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.22.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/junegunn/fzf
 hostmakedepends="git"
@@ -22,6 +22,7 @@ post_install() {
 
 	sed -i -e 's#source ~/\.fzf\.bash; ##' shell/key-bindings.bash
 	vinstall plugin/fzf.vim 644 usr/share/vim/vimfiles/plugin
+	vinstall plugin/fzf.vim 644 usr/share/nvim/runtime/plugin
 	vinstall shell/completion.bash 644 usr/share/bash-completion/completions fzf
 	vinstall shell/completion.zsh 644 usr/share/doc/fzf
 	vinstall shell/key-bindings.zsh 644 usr/share/doc/fzf

Re: fzf: install fzf.vim to Neovim plugin directory

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-696200644

Comment:
You still have 4 unrelated commits in this PR.

Re: fzf: install fzf.vim to Neovim plugin directory

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-696200644

Comment:
You still have 4 unrelated commits in this PR.

Also, anyone not wanting to have neovim files can just `noextract=` the directory in a `xbps.d(5)` file. It's better for the package to ship complete functionality, if it's available from upstream.

Re: fzf: install fzf.vim to Neovim plugin directory

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-696200644

Comment:
You still have 4 unrelated commits in this PR.

Also, anyone not wanting to have neovim files can just `noextract=` the directory in a `xbps.d(5)` file. It's better for the package to ship complete functionality if it's available from upstream.

Re: fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-696209868

Comment:
> You still have 4 unrelated commits in this PR.
> 
> Also, anyone not wanting to have neovim files can just `noextract=` the directory in a `xbps.d(5)` file. It's better for the package to ship complete functionality if it's available from upstream.

Lol, sorry, just messed up the branch with my custom repository. Gonna fix that.

Re: fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 275 bytes --]

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-696209868

Comment:
> You still have 4 unrelated commits in this PR.

Lol, sorry, just messed up the branch with my custom repository. Gonna fix that.

Re: [PR PATCH] [Updated] fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

There is an updated pull request by gbrlsnchs against master on the void-packages repository

https://github.com/gbrlsnchs/void-packages fix-fzf-nvim
https://github.com/void-linux/void-packages/pull/21733

fzf: install fzf.vim to Neovim plugin directory
For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.

A patch file from https://github.com/void-linux/void-packages/pull/21733.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-fzf-nvim-21733.patch --]
[-- Type: text/x-diff, Size: 1184 bytes --]

From bd246e88edcd7a9f838c339b6cb99d7950737c41 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Thu, 7 May 2020 21:04:47 -0300
Subject: [PATCH] fzf: install fzf.vim to Neovim plugin directory

For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.
---
 srcpkgs/fzf/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 109f5d44028..d67a722709b 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.22.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/junegunn/fzf
 hostmakedepends="git"
@@ -22,6 +22,7 @@ post_install() {
 
 	sed -i -e 's#source ~/\.fzf\.bash; ##' shell/key-bindings.bash
 	vinstall plugin/fzf.vim 644 usr/share/vim/vimfiles/plugin
+	vinstall plugin/fzf.vim 644 usr/share/nvim/runtime/plugin
 	vinstall shell/completion.bash 644 usr/share/bash-completion/completions fzf
 	vinstall shell/completion.zsh 644 usr/share/doc/fzf
 	vinstall shell/key-bindings.zsh 644 usr/share/doc/fzf

Re: [PR REVIEW] fzf: install fzf.vim to Neovim plugin directory

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#discussion_r492207758

Comment:
If you want you can replace these `vinstall` with the `vcompletion` helper, it's a bit simpler.

Re: [PR REVIEW] fzf: install fzf.vim to Neovim plugin directory

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#discussion_r492208092

Comment:
Could this be a symlink to the `fzf.vim` file in the vim folder?

Re: [PR PATCH] [Updated] fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

There is an updated pull request by gbrlsnchs against master on the void-packages repository

https://github.com/gbrlsnchs/void-packages fix-fzf-nvim
https://github.com/void-linux/void-packages/pull/21733

fzf: install fzf.vim to Neovim plugin directory
For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.

A patch file from https://github.com/void-linux/void-packages/pull/21733.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-fzf-nvim-21733.patch --]
[-- Type: text/x-diff, Size: 2264 bytes --]

From f5833252910837dfddda21be3e78d272148b1cbd Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Mon, 21 Sep 2020 14:23:50 -0300
Subject: [PATCH 1/2] fzf: move completion functionality to correct path

`shell/completion.bash` is not argument completion, it's a completion
functionality for FZF (integration with `kill`, etc). Like the one for
ZSH, it should go to `/usr/share/doc/fzf`.
---
 srcpkgs/fzf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 109f5d44028..b4f43eba470 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -22,7 +22,7 @@ post_install() {
 
 	sed -i -e 's#source ~/\.fzf\.bash; ##' shell/key-bindings.bash
 	vinstall plugin/fzf.vim 644 usr/share/vim/vimfiles/plugin
-	vinstall shell/completion.bash 644 usr/share/bash-completion/completions fzf
+	vinstall shell/completion.bash 644 usr/share/doc/fzf
 	vinstall shell/completion.zsh 644 usr/share/doc/fzf
 	vinstall shell/key-bindings.zsh 644 usr/share/doc/fzf
 	vinstall shell/key-bindings.bash 644 usr/share/doc/fzf

From 33d5c8501b7bdd1f24cddb20997f6634e627bc17 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Thu, 7 May 2020 21:04:47 -0300
Subject: [PATCH 2/2] fzf: install fzf.vim to Neovim plugin directory

For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.
---
 srcpkgs/fzf/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index b4f43eba470..948d4b58a16 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.22.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/junegunn/fzf
 hostmakedepends="git"
@@ -22,6 +22,7 @@ post_install() {
 
 	sed -i -e 's#source ~/\.fzf\.bash; ##' shell/key-bindings.bash
 	vinstall plugin/fzf.vim 644 usr/share/vim/vimfiles/plugin
+	vinstall plugin/fzf.vim 644 usr/share/nvim/runtime/plugin
 	vinstall shell/completion.bash 644 usr/share/doc/fzf
 	vinstall shell/completion.zsh 644 usr/share/doc/fzf
 	vinstall shell/key-bindings.zsh 644 usr/share/doc/fzf

Re: [PR REVIEW] fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 344 bytes --]

New review comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#discussion_r492229804

Comment:
I just added a commit to actually fix the bash one, they're not completions for FZF arguments, they're a functionality of FZF that must be sourced (they complete the `kill` command, for example).

Re: [PR REVIEW] fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

New review comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#discussion_r492230176

Comment:
It could, but then how `noextract=` would work in this case?

Re: [PR REVIEW] fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New review comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#discussion_r492230176

Comment:
It could, but then would `noextract=` would work in this case?

Re: [PR REVIEW] fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

New review comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#discussion_r492230176

Comment:
It could, but then would `noextract=` work in this case if, for example, I exclude the target from being extracted?

Re: [PR REVIEW] fzf: install fzf.vim to Neovim plugin directory

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#discussion_r492257181

Comment:
Honestly I don't expect anyone to `noextract` it :P 

But I'm indeed not sure what the best way of doing it, feel free to do it how you prefer.i

Re: [PR REVIEW] fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New review comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#discussion_r492280128

Comment:
Sincerely, I prefer to just install it alongside the Vim one, it's less prone to error, I think.

Re: fzf: install fzf.vim to Neovim plugin directory

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-696316636

Comment:
Squash the commits ;)

Re: [PR PATCH] [Updated] fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

There is an updated pull request by gbrlsnchs against master on the void-packages repository

https://github.com/gbrlsnchs/void-packages fix-fzf-nvim
https://github.com/void-linux/void-packages/pull/21733

fzf: install fzf.vim to Neovim plugin directory
For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.

A patch file from https://github.com/void-linux/void-packages/pull/21733.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-fzf-nvim-21733.patch --]
[-- Type: text/x-diff, Size: 1537 bytes --]

From 71932df5a7d15c7712dc1ba3620e923c207e55cc Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Mon, 21 Sep 2020 14:23:50 -0300
Subject: [PATCH] fzf: install fzf.vim to Neovim plugin directory

For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.

fzf: move completion functionality to correct path

`shell/completion.bash` is not argument completion, it's a completion
functionality for FZF (integration with `kill`, etc). Like the one for
ZSH, it should go to `/usr/share/doc/fzf`.
---
 srcpkgs/fzf/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 109f5d44028..948d4b58a16 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.22.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/junegunn/fzf
 hostmakedepends="git"
@@ -22,7 +22,8 @@ post_install() {
 
 	sed -i -e 's#source ~/\.fzf\.bash; ##' shell/key-bindings.bash
 	vinstall plugin/fzf.vim 644 usr/share/vim/vimfiles/plugin
-	vinstall shell/completion.bash 644 usr/share/bash-completion/completions fzf
+	vinstall plugin/fzf.vim 644 usr/share/nvim/runtime/plugin
+	vinstall shell/completion.bash 644 usr/share/doc/fzf
 	vinstall shell/completion.zsh 644 usr/share/doc/fzf
 	vinstall shell/key-bindings.zsh 644 usr/share/doc/fzf
 	vinstall shell/key-bindings.bash 644 usr/share/doc/fzf

Re: fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-696341125

Comment:
I have squashed the commits, however CI is timing out. :confounded: 

Re: fzf: install fzf.vim to Neovim plugin directory

[sgn]

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697676576

Comment:
Sorry, I tempted to tell you to bug neovim people to read those files explicitly instead. (Which, in fact, I did just now)

Re: fzf: install fzf.vim to Neovim plugin directory

[sgn]

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697679421

Comment:
> True, this creates not needed files for vim users though. Not sure how to solve this.

Ask neovim's developers to read those files by default?

Re: fzf: install fzf.vim to Neovim plugin directory

[sgn]

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697676576

Comment:
Sorry, I tempted to tell you to bug neovim people to read those files explicitly instead. (Which, in fact, I did just now)

Re: fzf: install fzf.vim to Neovim plugin directory

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697687024

Comment:
Is this possible? I think certain vim plugins might not be compatible with neovim.

Re: fzf: install fzf.vim to Neovim plugin directory

[sgn]

[-- Attachment #1: Type: text/plain, Size: 386 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697697141

Comment:

> Is this possible? I think certain vim plugins might not be compatible with neovim.

Honestly, I don't know. `neovim` advertises itself as new (neo) vim, and provides `vim` alternatives, it should compatible.
Like vim in `set compatible` mode?

Re: fzf: install fzf.vim to Neovim plugin directory

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 502 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697720797

Comment:
I agree with @sgn. We have a number of packages that install various vim plugins and making two copies of the same plugin file to appease another editor seems foolish. We install the vim plugin because upstream provides a vim plugin. If you're not using vim, manage the mapping manually. You can even `noextract` vim directories if it bothers you to have them.

Re: fzf: install fzf.vim to Neovim plugin directory

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 837 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697728065

Comment:
> If you're not using vim, manage the mapping manually. You can even noextract vim directories if it bothers you to have them.

Vim plugins "taking up space" isn't the issue, it's not having neovim ones.

We are already treating the vim plugin specially, by installing it manually in the template. By https://github.com/junegunn/fzf/blob/master/README-VIM.md#fzf-inside-terminal-buffer, `fzf` upstream expects the plugin to also work for neovim, so IMO it's our responsibility as packagers to ship it for all our vim alternatives.

`neovim` upstream should ideally have a way of importing plugins from vim directories, but I don't think waiting for a resolution on that should be a blocker.

Re: fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 448 bytes --]

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697733781

Comment:
> You can even noextract vim directories if it bothers you to have them.

The same applies for Neovim files then. Using `noextract` for it seems to be a solution.

Neovim is big enough to be taken into account. FZF on Arch Linux works out of the box with Neovim because files get installed for it too.

Re: fzf: install fzf.vim to Neovim plugin directory

[sgn]

[-- Attachment #1: Type: text/plain, Size: 427 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697747358

Comment:
Hey, my fork of `vim` which hasn't been published read the plugin from `/usr/share/svim/vimfiles`, would you mind to update the PR to support my fork as well?

Anyway, my fork of Void Linux works out of the box, too, but it's heavily customised, so I couldn't merge it into void-packages.

Re: fzf: install fzf.vim to Neovim plugin directory

[sgn]

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697747358

Comment:
Hey, my fork of `vim` which hasn't been published read the plugin from `/usr/share/svim/vimfiles`, would you mind to update the PR to support my fork as well?

Anyway, my fork of Void Linux works out of the box, too, but it's heavily customised, so I couldn't merge it into void-packages.

---
This comment is a joke ;)

Re: fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697756762

Comment:
I don't really see a reason to make fun of my concern. I'm even spending my work time patching this in order to make FZF installation a better experience for others that won't probably have time or expertise patching this same issue.

I still use my own patch for it, so for me particularly it's fine, my intention here is to help others only.

Re: fzf: install fzf.vim to Neovim plugin directory

[sgn]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697763452

Comment:
Let's chill my friends :-p

Re: fzf: install fzf.vim to Neovim plugin directory

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697794561

Comment:
Yes, it is unfortunate that VIM alternatives don't deal with plugins installed for the others. As it stands, I feel comfortable shipping this, `neovim` is a reasonably big `vim` fork.

Re: [PR PATCH] [Merged]: fzf: install fzf.vim to Neovim plugin directory

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There's a merged pull request on the void-packages repository

fzf: install fzf.vim to Neovim plugin directory
https://github.com/void-linux/void-packages/pull/21733

Description:
For Vim users, FZF works out of the box, but Neovim users have to
manually copy /usr/share/vim/vimfiles/plugin/fzf.vim to the proper
Neovim equivalent.

Re: fzf: install fzf.vim to Neovim plugin directory

[maybe-one-day-ubermensch]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

New comment by maybe-one-day-ubermensch on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697946708

Comment:
I think this discussion is relevant to the [pr](https://github.com/void-linux/void-packages/pull/25054) I opened earlier today. Should I re-open it or keep it closed?

Re: fzf: install fzf.vim to Neovim plugin directory

[gbrlsnchs]

[-- Attachment #1: Type: text/plain, Size: 472 bytes --]

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/21733#issuecomment-697986336

Comment:
> I think this discussion is relevant to the [pr](https://github.com/void-linux/void-packages/pull/25054) I opened earlier today. Should I re-open it or keep it closed?

As a user of both Void and Neovim, my opinion is to reopen and have it merged. `noextract` seems to be a good way to avoid Neovim files, if that's a problem.