mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-02-28 14:04:29 +00:00
Merge branch 'main' into feature/php-cs
This commit is contained in:
commit
c6957c5c33
8 changed files with 63 additions and 10 deletions
|
|
@ -205,6 +205,7 @@ isMaximal: {
|
||||||
smart-splits.enable = isMaximal;
|
smart-splits.enable = isMaximal;
|
||||||
undotree.enable = isMaximal;
|
undotree.enable = isMaximal;
|
||||||
nvim-biscuits.enable = isMaximal;
|
nvim-biscuits.enable = isMaximal;
|
||||||
|
grug-far-nvim.enable = isMaximal;
|
||||||
|
|
||||||
motion = {
|
motion = {
|
||||||
hop.enable = true;
|
hop.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -194,4 +194,13 @@ https://github.com/gorbit99/codewindow.nvim
|
||||||
- Fix non-functional `vim.keymaps.*.noremap`. Now, setting it to false is
|
- Fix non-functional `vim.keymaps.*.noremap`. Now, setting it to false is
|
||||||
equivalent to `:lua vim.keymap.set(..., { remap = true })`
|
equivalent to `:lua vim.keymap.set(..., { remap = true })`
|
||||||
|
|
||||||
|
[kazimazi](https://github.com/kazimazi):
|
||||||
|
|
||||||
|
- Added [`grug-far.nvim`](https://github.com/MagicDuck/grug-far.nvim) the find
|
||||||
|
and replace tool for neovim.
|
||||||
|
|
||||||
|
[Ladas552](https://github.com/Ladas552)
|
||||||
|
|
||||||
|
- Changed `withRuby` to not be enabled by default
|
||||||
|
|
||||||
<!-- vim: set textwidth=80: -->
|
<!-- vim: set textwidth=80: -->
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@
|
||||||
./harpoon
|
./harpoon
|
||||||
./icon-picker
|
./icon-picker
|
||||||
./images
|
./images
|
||||||
|
./grug-far-nvim
|
||||||
./leetcode-nvim
|
./leetcode-nvim
|
||||||
./mkdir
|
./mkdir
|
||||||
./motion
|
./motion
|
||||||
|
|
|
||||||
21
modules/plugins/utility/grug-far-nvim/config.nix
Normal file
21
modules/plugins/utility/grug-far-nvim/config.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (lib.modules) mkIf;
|
||||||
|
|
||||||
|
cfg = config.vim.utility.grug-far-nvim;
|
||||||
|
in {
|
||||||
|
config = {
|
||||||
|
vim.lazy.plugins.grug-far-nvim = mkIf cfg.enable {
|
||||||
|
package = "grug-far-nvim";
|
||||||
|
cmd = [
|
||||||
|
"GrugFar"
|
||||||
|
"GrugFarWithin"
|
||||||
|
];
|
||||||
|
setupModule = "grug-far";
|
||||||
|
setupOpts = cfg.setupOpts;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
6
modules/plugins/utility/grug-far-nvim/default.nix
Normal file
6
modules/plugins/utility/grug-far-nvim/default.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./grug-far-nvim.nix
|
||||||
|
./config.nix
|
||||||
|
];
|
||||||
|
}
|
||||||
9
modules/plugins/utility/grug-far-nvim/grug-far-nvim.nix
Normal file
9
modules/plugins/utility/grug-far-nvim/grug-far-nvim.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
{lib, ...}: let
|
||||||
|
inherit (lib.options) mkEnableOption;
|
||||||
|
inherit (lib.nvim.types) mkPluginSetupOption;
|
||||||
|
in {
|
||||||
|
options.vim.utility.grug-far-nvim = {
|
||||||
|
enable = mkEnableOption "grug-far";
|
||||||
|
setupOpts = mkPluginSetupOption "grug-far" {};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -106,16 +106,9 @@ in {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
# This defaults to `true` in the wrapper
|
withRuby = mkEnableOption ''
|
||||||
# and since we pass this value to the wrapper
|
Ruby support in the Neovim wrapper
|
||||||
# with an inherit, it should be `true` here as well
|
'';
|
||||||
withRuby =
|
|
||||||
mkEnableOption ''
|
|
||||||
Ruby support in the Neovim wrapper.
|
|
||||||
''
|
|
||||||
// {
|
|
||||||
default = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
withNodeJs = mkEnableOption ''
|
withNodeJs = mkEnableOption ''
|
||||||
NodeJS support in the Neovim wrapper
|
NodeJS support in the Neovim wrapper
|
||||||
|
|
|
||||||
|
|
@ -643,6 +643,19 @@
|
||||||
"url": "https://github.com/ellisonleao/glow.nvim/archive/5d5954b2f22e109d4a6eba8b2618c5b96e4ee7a2.tar.gz",
|
"url": "https://github.com/ellisonleao/glow.nvim/archive/5d5954b2f22e109d4a6eba8b2618c5b96e4ee7a2.tar.gz",
|
||||||
"hash": "sha256-CvBcmVWBgI+m+PS7p7PmsiPtTEfqx2kpIzz4mImONIc="
|
"hash": "sha256-CvBcmVWBgI+m+PS7p7PmsiPtTEfqx2kpIzz4mImONIc="
|
||||||
},
|
},
|
||||||
|
"grug-far-nvim": {
|
||||||
|
"type": "Git",
|
||||||
|
"repository": {
|
||||||
|
"type": "GitHub",
|
||||||
|
"owner": "MagicDuck",
|
||||||
|
"repo": "grug-far.nvim"
|
||||||
|
},
|
||||||
|
"branch": "main",
|
||||||
|
"submodules": false,
|
||||||
|
"revision": "275dbedc96e61a6b8d1dfb28ba51586ddd233dcf",
|
||||||
|
"url": "https://github.com/MagicDuck/grug-far.nvim/archive/275dbedc96e61a6b8d1dfb28ba51586ddd233dcf.tar.gz",
|
||||||
|
"hash": "sha256-qn1BTNCX0Sm158Lv5JfHThqlJX9ualCIlc+RCjWa+t8="
|
||||||
|
},
|
||||||
"gruvbox": {
|
"gruvbox": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue