mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-01-16 07:27:47 +00:00
Compare commits
No commits in common. "b248b5af59ffdfaf9f6fdd400a114f60718f0b31" and "5fbc72d697e53c8d4ff3cb8b7bbc60b6c96ffd02" have entirely different histories.
b248b5af59
...
5fbc72d697
10 changed files with 3 additions and 256 deletions
|
|
@ -173,18 +173,17 @@ isMaximal: {
|
||||||
utility = {
|
utility = {
|
||||||
ccc.enable = false;
|
ccc.enable = false;
|
||||||
vim-wakatime.enable = false;
|
vim-wakatime.enable = false;
|
||||||
diffview-nvim.enable = true;
|
|
||||||
yanky-nvim.enable = false;
|
|
||||||
icon-picker.enable = isMaximal;
|
icon-picker.enable = isMaximal;
|
||||||
surround.enable = isMaximal;
|
surround.enable = isMaximal;
|
||||||
|
diffview-nvim.enable = true;
|
||||||
|
yanky-nvim.enable = false;
|
||||||
leetcode-nvim.enable = isMaximal;
|
leetcode-nvim.enable = isMaximal;
|
||||||
multicursors.enable = isMaximal;
|
|
||||||
|
|
||||||
motion = {
|
motion = {
|
||||||
hop.enable = true;
|
hop.enable = true;
|
||||||
leap.enable = true;
|
leap.enable = true;
|
||||||
precognition.enable = isMaximal;
|
precognition.enable = isMaximal;
|
||||||
};
|
};
|
||||||
|
|
||||||
images = {
|
images = {
|
||||||
image-nvim.enable = false;
|
image-nvim.enable = false;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -159,12 +159,6 @@
|
||||||
|
|
||||||
- Add support for [nixd](https://github.com/nix-community/nixd) language server.
|
- Add support for [nixd](https://github.com/nix-community/nixd) language server.
|
||||||
|
|
||||||
[jahanson](https://github.com/jahanson):
|
|
||||||
|
|
||||||
- Add [multicursors.nvim](https://github.com/smoka7/multicursors.nvim) to
|
|
||||||
available plugins, under `vim.utility.multicursors`.
|
|
||||||
- Add [hydra.nvim](https://github.com/nvimtools/hydra.nvim) as dependency for
|
|
||||||
`multicursors.nvim` and lazy loads by default.
|
|
||||||
[folospior](https://github.com/folospior)
|
[folospior](https://github.com/folospior)
|
||||||
|
|
||||||
- Fix plugin name for lsp/lspkind.
|
- Fix plugin name for lsp/lspkind.
|
||||||
|
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib.modules) mkIf;
|
|
||||||
cfg = config.vim.hydra;
|
|
||||||
in {
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
vim = {
|
|
||||||
startPlugins = [];
|
|
||||||
lazy.plugins.hydra = {
|
|
||||||
package = "hydra.nvim";
|
|
||||||
setupModule = "hydra";
|
|
||||||
inherit (cfg) setupOpts;
|
|
||||||
|
|
||||||
event = ["DeferredUIEnter"];
|
|
||||||
cmd = ["MCstart" "MCvisual" "MCclear" "MCpattern" "MCvisualPattern" "MCunderCursor"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./hydra.nix
|
|
||||||
./config.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{lib, ...}: let
|
|
||||||
inherit (lib.options) mkEnableOption;
|
|
||||||
in {
|
|
||||||
options.vim.utility.hydra = {
|
|
||||||
enable = mkEnableOption "utility for creating custom submodes and menus [nvimtools/hydra.nvim]";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
./icon-picker
|
./icon-picker
|
||||||
./images
|
./images
|
||||||
./motion
|
./motion
|
||||||
./multicursors
|
|
||||||
./new-file-template
|
./new-file-template
|
||||||
./outline
|
./outline
|
||||||
./preview
|
./preview
|
||||||
|
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib.modules) mkIf;
|
|
||||||
cfg = config.vim.utility.multicursors;
|
|
||||||
in {
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
vim = {
|
|
||||||
startPlugins = ["hydra-nvim"];
|
|
||||||
lazy.plugins."multicursors-nvim" = {
|
|
||||||
package = "multicursors-nvim";
|
|
||||||
setupModule = "multicursors";
|
|
||||||
inherit (cfg) setupOpts;
|
|
||||||
|
|
||||||
event = ["DeferredUIEnter"];
|
|
||||||
cmd = ["MCstart" "MCvisual" "MCclear" "MCpattern" "MCvisualPattern" "MCunderCursor"];
|
|
||||||
keys = [
|
|
||||||
{
|
|
||||||
mode = ["v" "n"];
|
|
||||||
key = "<leader>mcs";
|
|
||||||
action = ":MCstart<cr>";
|
|
||||||
desc = "Create a selection for selected text or word under the cursor [multicursors.nvim]";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
mode = ["v" "n"];
|
|
||||||
key = "<leader>mcp";
|
|
||||||
action = ":MCpattern<cr>";
|
|
||||||
desc = "Create a selection for pattern entered [multicursors.nvim]";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./multicursors.nix
|
|
||||||
./config.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -1,138 +0,0 @@
|
||||||
{lib, ...}: let
|
|
||||||
inherit (lib.options) mkOption mkEnableOption;
|
|
||||||
inherit (lib.types) attrsOf nullOr bool int str submodule;
|
|
||||||
inherit (lib.nvim.types) mkPluginSetupOption;
|
|
||||||
|
|
||||||
hintConfig = {
|
|
||||||
options = {
|
|
||||||
float_opts = mkOption {
|
|
||||||
description = "The options for the floating hint window";
|
|
||||||
type = submodule {
|
|
||||||
options = {
|
|
||||||
border = mkOption {
|
|
||||||
type = str;
|
|
||||||
default = "none";
|
|
||||||
description = "The border style for the hint window";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
position = mkOption {
|
|
||||||
type = str;
|
|
||||||
default = "bottom";
|
|
||||||
description = "The position of the hint window";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
generateHints = {
|
|
||||||
options = {
|
|
||||||
normal = mkOption {
|
|
||||||
type = bool;
|
|
||||||
default = true;
|
|
||||||
description = "Generate hints for the normal mode";
|
|
||||||
};
|
|
||||||
|
|
||||||
insert = mkOption {
|
|
||||||
type = bool;
|
|
||||||
default = true;
|
|
||||||
description = "Generate hints for the insert mode";
|
|
||||||
};
|
|
||||||
|
|
||||||
extend = mkOption {
|
|
||||||
type = bool;
|
|
||||||
default = true;
|
|
||||||
description = "Generate hints for the extend mode";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkOption {
|
|
||||||
description = "The configuration for generating hints for multicursors.nvim";
|
|
||||||
type = submodule {
|
|
||||||
options = {
|
|
||||||
column_count = mkOption {
|
|
||||||
type = nullOr int;
|
|
||||||
default = null;
|
|
||||||
description = "The number of columns to use for the hint window";
|
|
||||||
};
|
|
||||||
|
|
||||||
max_hint_length = mkOption {
|
|
||||||
type = int;
|
|
||||||
default = 25;
|
|
||||||
description = "The maximum length of the hint";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
default = {
|
|
||||||
column_count = null;
|
|
||||||
max_hint_length = 25;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
options.vim.utility.multicursors = {
|
|
||||||
enable = mkEnableOption "vscode like multiple cursors [multicursor.nvim]";
|
|
||||||
|
|
||||||
setupOpts = mkPluginSetupOption "multicursors" {
|
|
||||||
DEBUG_MODE = mkOption {
|
|
||||||
type = bool;
|
|
||||||
default = false;
|
|
||||||
description = "Enable debug mode.";
|
|
||||||
};
|
|
||||||
|
|
||||||
create_commands = mkOption {
|
|
||||||
type = bool;
|
|
||||||
default = true;
|
|
||||||
description = "Create Multicursor user commands";
|
|
||||||
};
|
|
||||||
|
|
||||||
updatetime = mkOption {
|
|
||||||
type = int;
|
|
||||||
default = 50;
|
|
||||||
description = "The time in milliseconds to wait before updating the cursor in insert mode";
|
|
||||||
};
|
|
||||||
|
|
||||||
nowait = mkOption {
|
|
||||||
type = bool;
|
|
||||||
default = true;
|
|
||||||
description = "Don't wait for the cursor to move before updating the cursor";
|
|
||||||
};
|
|
||||||
|
|
||||||
mode_keys = mkOption {
|
|
||||||
type = attrsOf str;
|
|
||||||
default = {
|
|
||||||
insert = "i";
|
|
||||||
append = "a";
|
|
||||||
change = "c";
|
|
||||||
extend = "e";
|
|
||||||
};
|
|
||||||
description = "The keys to use for each mode";
|
|
||||||
};
|
|
||||||
|
|
||||||
hint_config = mkOption {
|
|
||||||
type = submodule hintConfig;
|
|
||||||
default = {
|
|
||||||
float_opts.border = "none";
|
|
||||||
position = "bottom";
|
|
||||||
};
|
|
||||||
description = "The configuration for the hint window";
|
|
||||||
};
|
|
||||||
|
|
||||||
generate_hints = mkOption {
|
|
||||||
type = submodule generateHints;
|
|
||||||
default = {
|
|
||||||
normal = true;
|
|
||||||
insert = true;
|
|
||||||
extend = true;
|
|
||||||
config = {
|
|
||||||
column_count = null;
|
|
||||||
max_hint_length = 25;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
description = "The configuration for generating hints";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -507,21 +507,6 @@
|
||||||
"url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz",
|
"url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz",
|
||||||
"hash": "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa"
|
"hash": "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa"
|
||||||
},
|
},
|
||||||
"hydra-nvim": {
|
|
||||||
"type": "GitRelease",
|
|
||||||
"repository": {
|
|
||||||
"type": "GitHub",
|
|
||||||
"owner": "nvimtools",
|
|
||||||
"repo": "hydra.nvim"
|
|
||||||
},
|
|
||||||
"pre_releases": false,
|
|
||||||
"version_upper_bound": null,
|
|
||||||
"release_prefix": null,
|
|
||||||
"version": "v1.0.2",
|
|
||||||
"revision": "8578056a2226ed49fc608167edc143a87f75d809",
|
|
||||||
"url": "https://api.github.com/repos/nvimtools/hydra.nvim/tarball/v1.0.2",
|
|
||||||
"hash": "13f04pmqrfl65xx9bfkdak6ll57s94anaw7nqd0fm5hp50b7c6j3"
|
|
||||||
},
|
|
||||||
"icon-picker-nvim": {
|
"icon-picker-nvim": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
@ -1217,21 +1202,6 @@
|
||||||
"url": "https://github.com/mvllow/modes.nvim/archive/c7a4b1b383606832aab150902719bd5eb5cdb2b0.tar.gz",
|
"url": "https://github.com/mvllow/modes.nvim/archive/c7a4b1b383606832aab150902719bd5eb5cdb2b0.tar.gz",
|
||||||
"hash": "1hy3ghscf8hfmg487p9b8cwd0y8nsi8j24kq2ir3vhd82gqhl4ja"
|
"hash": "1hy3ghscf8hfmg487p9b8cwd0y8nsi8j24kq2ir3vhd82gqhl4ja"
|
||||||
},
|
},
|
||||||
"multicursors-nvim": {
|
|
||||||
"type": "GitRelease",
|
|
||||||
"repository": {
|
|
||||||
"type": "GitHub",
|
|
||||||
"owner": "smoka7",
|
|
||||||
"repo": "multicursors.nvim"
|
|
||||||
},
|
|
||||||
"pre_releases": false,
|
|
||||||
"version_upper_bound": null,
|
|
||||||
"release_prefix": null,
|
|
||||||
"version": "v2.0.0",
|
|
||||||
"revision": "782820896b1691ed664e4c24f1cd9793dcb33dfb",
|
|
||||||
"url": "https://api.github.com/repos/smoka7/multicursors.nvim/tarball/v2.0.0",
|
|
||||||
"hash": "171aysqsyapw434xkibxv69p5fkwha4addkqfdssdm0wq9n9cm4q"
|
|
||||||
},
|
|
||||||
"neo-tree-nvim": {
|
"neo-tree-nvim": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue