From 4d86c9e1d9707eeb0120977bbba404cbebe26a0b Mon Sep 17 00:00:00 2001 From: Soliprem Date: Fri, 27 Sep 2024 11:35:39 +0200 Subject: [PATCH] committing flake.lock merge --- modules/plugins/lsp/otter/otter.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/modules/plugins/lsp/otter/otter.nix b/modules/plugins/lsp/otter/otter.nix index db512a23..5ab5782c 100644 --- a/modules/plugins/lsp/otter/otter.nix +++ b/modules/plugins/lsp/otter/otter.nix @@ -1,5 +1,4 @@ {lib, ...}: let -<<<<<<< HEAD inherit (lib.options) mkOption mkEnableOption; inherit (lib.nvim.binds) mkMappingOption; inherit (lib.types) bool str listOf; @@ -59,16 +58,7 @@ in { (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]" "oa"; ->>>>>>> d61aba1 (created otter file) + toggle = mkMappingOption "Activate LSP on Cursor Position [otter]" "lo"; }; }; };