mirror of
https://github.com/NotAShelf/neovim-flake.git
synced 2024-11-07 19:25:58 +01:00
Compare commits
No commits in common. "ff9a93d3edefda6e74552b916cf7da9e6be4684a" and "d88b1129e57dd00885b191aa94e126718b97cb98" have entirely different histories.
ff9a93d3ed
...
d88b1129e5
3 changed files with 12 additions and 51 deletions
|
@ -46,6 +46,8 @@ configuration formats.
|
||||||
- Fix [](#opt-vim.ui.smartcolumn.setupOpts.custom_colorcolumn) using the wrong
|
- Fix [](#opt-vim.ui.smartcolumn.setupOpts.custom_colorcolumn) using the wrong
|
||||||
type `int` instead of the expected type `string`.
|
type `int` instead of the expected type `string`.
|
||||||
|
|
||||||
|
- Fix unused src and version attributes in `buildPlug`.
|
||||||
|
|
||||||
[horriblename](https://github.com/horriblename):
|
[horriblename](https://github.com/horriblename):
|
||||||
|
|
||||||
- Fix broken treesitter-context keybinds in visual mode
|
- Fix broken treesitter-context keybinds in visual mode
|
||||||
|
@ -140,11 +142,3 @@ configuration formats.
|
||||||
|
|
||||||
- Add [neo-tree.nvim] as an alternative file-tree plugin. It will be available
|
- Add [neo-tree.nvim] as an alternative file-tree plugin. It will be available
|
||||||
under `vim.filetree.neo-tree`, similar to nvimtree.
|
under `vim.filetree.neo-tree`, similar to nvimtree.
|
||||||
|
|
||||||
- Add `print-nvf-config` & `print-nvf-config-path` helper scripts to Neovim
|
|
||||||
closure. Both of those scripts have been automatically added to your PATH upon
|
|
||||||
using neovimConfig or `programs.nvf.enable`.
|
|
||||||
- `print-nvf-config` will display your `init.lua`, in full.
|
|
||||||
- `print-nvf-config-path` will display the path to _a clone_ of your
|
|
||||||
`init.lua`. This is not the path used by the Neovim wrapper, but an
|
|
||||||
identical clone.
|
|
||||||
|
|
|
@ -69,11 +69,11 @@
|
||||||
},
|
},
|
||||||
"mnw": {
|
"mnw": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721440413,
|
"lastModified": 1720927281,
|
||||||
"narHash": "sha256-PF/FbgCUZ6mQrKp28G2YoVDlSThBy8AxIT9d2Ju3kTY=",
|
"narHash": "sha256-4Z2FtCuL0lT+sM2gb1JMcXOUkeYrWeYZjjs1HuVTlOs=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "mnw",
|
"repo": "mnw",
|
||||||
"rev": "4ea225024677e7c3a96080af8624fd3aa5dfa1b6",
|
"rev": "302b18ddb8498aa9a7e0c01f7026e49d545e6898",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -36,19 +36,11 @@ inputs: {
|
||||||
buildPlug = {pname, ...} @ attrs: let
|
buildPlug = {pname, ...} @ attrs: let
|
||||||
src = getAttr ("plugin-" + pname) inputs;
|
src = getAttr ("plugin-" + pname) inputs;
|
||||||
in
|
in
|
||||||
pkgs.stdenvNoCC.mkDerivation ({
|
pkgs.runCommand "${pname}-${src.shortRev or src.shortDirtyRev or "dirty"}" attrs
|
||||||
inherit src;
|
''
|
||||||
version = src.shortRev or src.shortDirtyRev or "dirty";
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
cp -r . $out
|
cp -r ${src}/. $out
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
'';
|
||||||
}
|
|
||||||
// attrs);
|
|
||||||
|
|
||||||
noBuildPlug = {pname, ...} @ attrs: let
|
noBuildPlug = {pname, ...} @ attrs: let
|
||||||
input = getAttr ("plugin-" + pname) inputs;
|
input = getAttr ("plugin-" + pname) inputs;
|
||||||
|
@ -113,35 +105,10 @@ inputs: {
|
||||||
inherit (vimOptions) viAlias vimAlias withRuby withNodeJs withPython3;
|
inherit (vimOptions) viAlias vimAlias withRuby withNodeJs withPython3;
|
||||||
inherit extraLuaPackages extraPython3Packages;
|
inherit extraLuaPackages extraPython3Packages;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Additional helper scripts for printing and displaying nvf configuration
|
|
||||||
# in your commandline.
|
|
||||||
printConfig = pkgs.writers.writeDashBin "print-nvf-config" ''
|
|
||||||
cat << EOF
|
|
||||||
${vimOptions.builtLuaConfigRC}
|
|
||||||
EOF
|
|
||||||
'';
|
|
||||||
|
|
||||||
printConfigPath = pkgs.writers.writeDashBin "print-nvf-config-path" ''
|
|
||||||
realpath ${pkgs.writeTextFile {
|
|
||||||
name = "nvf-init.lua";
|
|
||||||
text = vimOptions.builtLuaConfigRC;
|
|
||||||
}}
|
|
||||||
'';
|
|
||||||
in {
|
in {
|
||||||
inherit (module) options config;
|
inherit (module) options config;
|
||||||
inherit (module._module.args) pkgs;
|
inherit (module._module.args) pkgs;
|
||||||
|
|
||||||
# Expose wrapped neovim-package for userspace
|
# expose wrapped neovim-package
|
||||||
# or module consumption.
|
neovim = neovim-wrapped;
|
||||||
neovim = pkgs.symlinkJoin {
|
|
||||||
name = "nvf-with-helpers";
|
|
||||||
paths = [neovim-wrapped printConfig printConfigPath];
|
|
||||||
postBuild = "echo helpers added";
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Wrapped version of Neovim with additional helper scripts";
|
|
||||||
mainProgram = "nvim";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue