Compare commits

..

No commits in common. "da48a862a383026b1c7c9b0a09424af657550602" and "4242640c9801d6bcd9e72ae942eb92928093b0a5" have entirely different histories.

8 changed files with 8 additions and 101 deletions

View file

@ -175,7 +175,6 @@ isMaximal: {
icon-picker.enable = isMaximal;
surround.enable = isMaximal;
diffview-nvim.enable = true;
yanky-nvim.enable = false;
motion = {
hop.enable = true;
leap.enable = true;

View file

@ -4,7 +4,6 @@
[typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
[render-markdown.nvim]: https://github.com/MeanderingProgrammer/render-markdown.nvim
[yanky.nvim]: https://github.com/gbprod/yanky.nvim
- Add [typst-preview.nvim] under
`languages.typst.extensions.typst-preview-nvim`.
@ -34,13 +33,10 @@
- Add [](#opt-vim.lsp.lightbulb.autocmd.enable) for manually managing the
previously managed lightbulb autocommand.
- A warning will occur if [](#opt-vim.lsp.lightbulb.autocmd.enable) and
`vim.lsp.lightbulb.setupOpts.autocmd.enabled` are both set at the same time.
Pick only one.
- Add [yanky.nvim] to available plugins, under `vim.utility.yanky-nvim`.
[amadaluzia](https://github.com/amadaluzia):
[haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim

17
flake.lock generated
View file

@ -2761,22 +2761,6 @@
"type": "github"
}
},
"plugin-yanky-nvim": {
"flake": false,
"locked": {
"lastModified": 1737126873,
"narHash": "sha256-Gt8kb6sZoNIM2SDWUPyAF5Tw99qMZl+ltUCfyMXgJsU=",
"owner": "gbprod",
"repo": "yanky.nvim",
"rev": "d2696b30e389dced94d5acab728f524a25f308d2",
"type": "github"
},
"original": {
"owner": "gbprod",
"repo": "yanky.nvim",
"type": "github"
}
},
"root": {
"inputs": {
"flake-parts": "flake-parts",
@ -2950,7 +2934,6 @@
"plugin-vim-repeat": "plugin-vim-repeat",
"plugin-vim-startify": "plugin-vim-startify",
"plugin-which-key": "plugin-which-key",
"plugin-yanky-nvim": "plugin-yanky-nvim",
"systems": "systems_2"
}
},

View file

@ -590,11 +590,6 @@
flake = false;
};
plugin-yanky-nvim = {
url = "github:gbprod/yanky.nvim";
flake = false;
};
# Note-taking
plugin-obsidian-nvim = {
url = "github:epwalsh/obsidian.nvim";

View file

@ -1,19 +1,19 @@
{
imports = [
./outline
./binds
./ccc
./diffview
./fzf-lua
./gestures
./icon-picker
./images
./motion
./new-file-template
./outline
./preview
./surround
./telescope
./icon-picker
./images
./telescope
./diffview
./wakatime
./yanky-nvim
./surround
./preview
./fzf-lua
];
}

View file

@ -1,32 +0,0 @@
{
config,
pkgs,
lib,
...
}: let
inherit (lib.modules) mkIf;
inherit (lib.lists) optionals concatLists;
inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.dag) entryAnywhere;
cfg = config.vim.utility.yanky-nvim;
usingSqlite = cfg.setupOpts.ring.storage == "sqlite";
in {
config = mkIf cfg.enable {
vim = {
# TODO: this could probably be lazyloaded. I'm not yet sure which event is
# ideal, so it's loaded normally for now.
startPlugins = concatLists [
["yanky-nvim"]
# If using the sqlite backend, sqlite-lua must be loaded
# alongside yanky.
(optionals usingSqlite [pkgs.vimPlugins.sqlite-lua])
];
pluginRC.yanky-nvim = entryAnywhere ''
require("yanky").setup(${toLuaObject cfg.setupOpts});
'';
};
};
}

View file

@ -1,6 +0,0 @@
{
imports = [
./config.nix
./yanky-nvim.nix
];
}

View file

@ -1,28 +0,0 @@
{lib, ...}: let
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) enum;
in {
options.vim.utility.yanky-nvim = {
enable = mkEnableOption ''
improved Yank and Put functionalities for Neovim [yanky-nvim]
'';
setupOpts = {
ring.storage = mkOption {
type = enum ["shada" "sqlite" "memory"];
default = "shada";
example = "sqlite";
description = ''
storage mode for ring values.
- shada: this will save pesistantly using Neovim ShaDa feature.
This means that history will be persisted between each session of Neovim.
- memory: each Neovim instance will have his own history and it will be
lost between sessions.
- sqlite: more reliable than `shada`, requires `sqlite.lua` as a dependency.
nvf will add this dependency to `PATH` automatically.
'';
};
};
};
}