NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-02-24 04:18:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removing artifacts from merge

Browse source
This commit is contained in:
Soliprem 2024-09-30 14:36:40 +02:00
parent b12e24a564
commit fc08c34b9d
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/plugins/lsp/otter/otter.nix
View file

@ -1,5 +1,4 @@
{lib, ...}: let {lib, ...}: let
<<<<<<< HEAD
inherit (lib.options) mkOption mkEnableOption; inherit (lib.options) mkOption mkEnableOption;
inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.binds) mkMappingOption;
inherit (lib.types) bool str listOf; inherit (lib.types) bool str listOf;
@ -59,16 +58,6 @@ in {
(eg. in Org files) When true, otter handles these cases fully. (eg. in Org files) When true, otter handles these cases fully.
''; '';
}; };
=======
inherit (lib.options) mkEnableOption;
inherit (lib.nvim.binds) mkMappingOption;
in {
options.vim.lsp = {
otter = {
enable = mkEnableOption "Otter LSP Injector";
mappings = {
toggle = mkMappingOption "Activate LSP on Cursor Position [otter]" "<leader>lo";
>>>>>>> 7b46366e53493c2843f9524e2e80916ea9cea99b
}; };
}; };
}; };